From 64cdffefac5e4ec601a559739312e66312a36a5a Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 10 Jan 2014 23:44:30 +0100 Subject: media-tv/congruity: Version bump Package-Manager: portage-2.2.8 --- media-tv/congruity/ChangeLog | 10 ++++- media-tv/congruity/Manifest | 10 ++--- media-tv/congruity/congruity-16.ebuild | 41 --------------------- media-tv/congruity/congruity-17.ebuild | 40 ++++++++++++++++++++ media-tv/congruity/files/17-mhgui-debug.patch | 29 +++++++++++++++ media-tv/congruity/files/17-mhgui-parse.patch | 43 ++++++++++++++++++++++ .../congruity/files/congruity-16-mhgui-debug.patch | 29 --------------- .../congruity/files/congruity-16-mhgui-parse.patch | 43 ---------------------- 8 files changed, 126 insertions(+), 119 deletions(-) delete mode 100644 media-tv/congruity/congruity-16.ebuild create mode 100644 media-tv/congruity/congruity-17.ebuild create mode 100644 media-tv/congruity/files/17-mhgui-debug.patch create mode 100644 media-tv/congruity/files/17-mhgui-parse.patch delete mode 100644 media-tv/congruity/files/congruity-16-mhgui-debug.patch delete mode 100644 media-tv/congruity/files/congruity-16-mhgui-parse.patch (limited to 'media-tv') diff --git a/media-tv/congruity/ChangeLog b/media-tv/congruity/ChangeLog index fc36131f..0ed2e4f8 100644 --- a/media-tv/congruity/ChangeLog +++ b/media-tv/congruity/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for media-tv/congruity -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*congruity-17 (10 Jan 2014) + + 10 Jan 2014; Bertrand Jacquin +congruity-17.ebuild, + +files/17-mhgui-debug.patch, +files/17-mhgui-parse.patch, + -congruity-16.ebuild, -files/congruity-16-mhgui-debug.patch, + -files/congruity-16-mhgui-parse.patch: + media-tv/congruity: Version bump + 10 Jun 2013; Bertrand Jacquin metadata.xml: Fix manifest diff --git a/media-tv/congruity/Manifest b/media-tv/congruity/Manifest index a773455a..23a87c77 100644 --- a/media-tv/congruity/Manifest +++ b/media-tv/congruity/Manifest @@ -1,6 +1,6 @@ -AUX congruity-16-mhgui-debug.patch 1133 SHA256 b20383f6b828f6493406028a6cf6e5cdc7908876718a6df9de13eb3b88978791 WHIRLPOOL 7a5306c84c082768e1118e12a1ac31cf1c8a744edb6e9c12ed4fd63535b5068fd7d76ec69fcb231a8c9a7823955baa98179c56af7f02eb16ff3523122bb2d67a -AUX congruity-16-mhgui-parse.patch 1424 SHA256 1de685d99cdcf0e93d2f568b2670cedb251fa6b087f2c6e637a0b6032f10016a WHIRLPOOL 0e62e056a544ea7c5d82a59764e578cbea80ee2c3e2b288653f6d58427dee9e650458fce55035569fc1674a6c53e14fcd957a98a72050f9be27ad4ebf8103a92 -DIST congruity-16.tar.bz2 174981 SHA256 46915b23b13f3a2aaa3f5c766a639859fb7c42f99e44904b8cb88c263d193032 WHIRLPOOL 5d686570f81081176af26b5ebded513cd4c55caf875e462d42652b848298a18c8b609ee9bd98148f8a44853a42de5bef765b10cf03a4b788950ca4d78417d4b2 -EBUILD congruity-16.ebuild 899 SHA256 cb6591fcd0e4b2f956facf4bb2d268c2a6a74236542759ea90289aac43418e66 WHIRLPOOL 55a4c20dfd48f7e531385f06322de204a6b78539f7b0c243d0079447e0a59ca1697509f2a4993f727e7ef1c7527a6049906b9bfe887ca6bd2cd3dbf48fbb4b1c -MISC ChangeLog 1262 SHA256 ebc581d04cd9bf723eebfa8501722e11de2c89b05713084af9c519e85d0eac5a WHIRLPOOL b01404373f81bc6f57e544a0ea3197dc2d9200cc234a822dcac1785285d66ef7010699a9fa156abe7eabc3417e569cf36063ef3c0d771dbe2a2f2ad1c4c7836c +AUX 17-mhgui-debug.patch 1133 SHA256 b20383f6b828f6493406028a6cf6e5cdc7908876718a6df9de13eb3b88978791 WHIRLPOOL 7a5306c84c082768e1118e12a1ac31cf1c8a744edb6e9c12ed4fd63535b5068fd7d76ec69fcb231a8c9a7823955baa98179c56af7f02eb16ff3523122bb2d67a +AUX 17-mhgui-parse.patch 1424 SHA256 1de685d99cdcf0e93d2f568b2670cedb251fa6b087f2c6e637a0b6032f10016a WHIRLPOOL 0e62e056a544ea7c5d82a59764e578cbea80ee2c3e2b288653f6d58427dee9e650458fce55035569fc1674a6c53e14fcd957a98a72050f9be27ad4ebf8103a92 +DIST congruity-17.tar.bz2 175425 SHA256 a4cff576245f86141eb371cafcee11af37c096c463ca147e9f3eac0debb19b63 WHIRLPOOL 1128a050b0d431443feddae40edf94f926a34c3e950f8466c9bcaf9eba22f18ef5fea1846b12ffd270374dee29994f57822e0331ef0427da946c59bd073cb5fb +EBUILD congruity-17.ebuild 855 SHA256 4dde34bc9ebcfb1b693265722cdf3d5dac8e300063d93f70f3d21377b0fbfcd9 WHIRLPOOL f2dfa9e7817b86689e16f186d46cc8bce908a090864b7d506cb9e9a3898f8e0da85ab077cd6eea6de4bfbe7f5482ef33c47c3894cfa47b04c8283f902d9d4f01 +MISC ChangeLog 1566 SHA256 59b889d0ac77c2bef72f4b2c8e4111be5c0933fb7ff1d9e37504b86eccdb76b1 WHIRLPOOL 8677ee011a901807de11036b605e2794def8c9b6d07b28c33b066870180d87500e9f7929c29fee2a29ab52127f47095c20b3d584d967e618c432da284fee7480 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/media-tv/congruity/congruity-16.ebuild b/media-tv/congruity/congruity-16.ebuild deleted file mode 100644 index 33e958cc..00000000 --- a/media-tv/congruity/congruity-16.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 fdo-mime eutils - -DESCRIPTION="GUI application for programming Logitech Harmony" -HOMEPAGE="http://sourceforge.net/projects/congruity" -SRC_URI="mirror://sourceforge/congruity/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=dev-libs/libconcord-1.0[python] - dev-python/wxpython:2.8 - >=dev-python/suds-0.4" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-mhgui-parse.patch" - epatch "${FILESDIR}/${P}-mhgui-debug.patch" -} - -src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" \ - RUN_UPDATE_DESKTOP_DB=0 \ - install - - python_doscript "${ED}/usr/bin/${PN}" - python_doscript "${ED}/usr/bin/mhgui" - - dodoc Changelog README.txt -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} diff --git a/media-tv/congruity/congruity-17.ebuild b/media-tv/congruity/congruity-17.ebuild new file mode 100644 index 00000000..54e22c12 --- /dev/null +++ b/media-tv/congruity/congruity-17.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit python-single-r1 fdo-mime eutils + +DESCRIPTION="GUI application for programming Logitech Harmony" +HOMEPAGE="http://sourceforge.net/projects/congruity" +SRC_URI="mirror://sourceforge/congruity/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-libs/libconcord-1.0[python] + dev-python/wxpython:2.8 + >=dev-python/suds-0.4" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PV}-mhgui-debug.patch" +} + +src_install() { + emake DESTDIR="${ED}" PREFIX="/usr" \ + RUN_UPDATE_DESKTOP_DB=0 \ + install + + python_doscript "${ED}/usr/bin/${PN}" + python_doscript "${ED}/usr/bin/mhgui" + + dodoc Changelog README.txt +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} diff --git a/media-tv/congruity/files/17-mhgui-debug.patch b/media-tv/congruity/files/17-mhgui-debug.patch new file mode 100644 index 00000000..739e7542 --- /dev/null +++ b/media-tv/congruity/files/17-mhgui-debug.patch @@ -0,0 +1,29 @@ +commit 2cae5c46541ec3ed637600e58de564fed16b46a1 +Author: Scott Talbert +Date: Thu Jun 6 19:42:49 2013 -0400 + + Enable debug for Harmony 650 debugging. Try setting the ProductId. + +diff --git a/mhmanager.py b/mhmanager.py +index 597e826..8c69569 100644 +--- a/mhmanager.py ++++ b/mhmanager.py +@@ -85,8 +85,8 @@ class MHPlugin(MessagePlugin): + self.fix_elements(None, operation.getChildren()) + + +-#logging.basicConfig(level=logging.INFO) +-#logging.getLogger('suds.client').setLevel(logging.DEBUG) ++logging.basicConfig(level=logging.INFO) ++logging.getLogger('suds.client').setLevel(logging.DEBUG) + #logging.getLogger('suds.transport').setLevel(logging.DEBUG) + #logging.getLogger('suds.xsd.schema').setLevel(logging.DEBUG) + #logging.getLogger('suds.wsdl').setLevel(logging.DEBUG) +@@ -428,6 +428,7 @@ class MHManager(): + '{' + ACCOUNT_NS + '}remoteInfo') + remoteInfo.AccountId = accountId + remoteInfo.KeyPadLayout = "Undefined" ++ remoteInfo.ProductId = "10" + remoteInfo.SerialNumber = serialNumber + remoteInfo.SkinId = skinId + remoteInfo.UsbPid = usbPid diff --git a/media-tv/congruity/files/17-mhgui-parse.patch b/media-tv/congruity/files/17-mhgui-parse.patch new file mode 100644 index 00000000..95cd8e7e --- /dev/null +++ b/media-tv/congruity/files/17-mhgui-parse.patch @@ -0,0 +1,43 @@ +commit 9b3e0e6198368ed4cb11c229e7faf986a053bdfc +Author: Scott Talbert +Date: Wed Jun 5 20:57:31 2013 -0400 + + Made updates to Account XSD to match Logitech changes. + + Signed-off-by: Scott Talbert + +diff --git a/account.xsd b/account.xsd +index 9b9680c..46e4dba 100644 +--- a/account.xsd ++++ b/account.xsd +@@ -55,6 +55,7 @@ + + + ++ + + + +@@ -112,6 +113,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -124,6 +133,7 @@ + + + ++ + + + diff --git a/media-tv/congruity/files/congruity-16-mhgui-debug.patch b/media-tv/congruity/files/congruity-16-mhgui-debug.patch deleted file mode 100644 index 739e7542..00000000 --- a/media-tv/congruity/files/congruity-16-mhgui-debug.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 2cae5c46541ec3ed637600e58de564fed16b46a1 -Author: Scott Talbert -Date: Thu Jun 6 19:42:49 2013 -0400 - - Enable debug for Harmony 650 debugging. Try setting the ProductId. - -diff --git a/mhmanager.py b/mhmanager.py -index 597e826..8c69569 100644 ---- a/mhmanager.py -+++ b/mhmanager.py -@@ -85,8 +85,8 @@ class MHPlugin(MessagePlugin): - self.fix_elements(None, operation.getChildren()) - - --#logging.basicConfig(level=logging.INFO) --#logging.getLogger('suds.client').setLevel(logging.DEBUG) -+logging.basicConfig(level=logging.INFO) -+logging.getLogger('suds.client').setLevel(logging.DEBUG) - #logging.getLogger('suds.transport').setLevel(logging.DEBUG) - #logging.getLogger('suds.xsd.schema').setLevel(logging.DEBUG) - #logging.getLogger('suds.wsdl').setLevel(logging.DEBUG) -@@ -428,6 +428,7 @@ class MHManager(): - '{' + ACCOUNT_NS + '}remoteInfo') - remoteInfo.AccountId = accountId - remoteInfo.KeyPadLayout = "Undefined" -+ remoteInfo.ProductId = "10" - remoteInfo.SerialNumber = serialNumber - remoteInfo.SkinId = skinId - remoteInfo.UsbPid = usbPid diff --git a/media-tv/congruity/files/congruity-16-mhgui-parse.patch b/media-tv/congruity/files/congruity-16-mhgui-parse.patch deleted file mode 100644 index 95cd8e7e..00000000 --- a/media-tv/congruity/files/congruity-16-mhgui-parse.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 9b3e0e6198368ed4cb11c229e7faf986a053bdfc -Author: Scott Talbert -Date: Wed Jun 5 20:57:31 2013 -0400 - - Made updates to Account XSD to match Logitech changes. - - Signed-off-by: Scott Talbert - -diff --git a/account.xsd b/account.xsd -index 9b9680c..46e4dba 100644 ---- a/account.xsd -+++ b/account.xsd -@@ -55,6 +55,7 @@ - - - -+ - - - -@@ -112,6 +113,14 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -124,6 +133,7 @@ - - - -+ - - - -- cgit v1.2.3