summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-tv/congruity/ChangeLog7
-rw-r--r--media-tv/congruity/Manifest8
-rw-r--r--media-tv/congruity/congruity-18.ebuild (renamed from media-tv/congruity/congruity-17.ebuild)12
-rw-r--r--media-tv/congruity/files/17-mhgui-debug.patch29
-rw-r--r--media-tv/congruity/files/17-mhgui-parse.patch43
-rw-r--r--metadata/md5-cache/media-tv/congruity-1713
-rw-r--r--metadata/md5-cache/media-tv/congruity-1813
7 files changed, 27 insertions, 98 deletions
diff --git a/media-tv/congruity/ChangeLog b/media-tv/congruity/ChangeLog
index 0ed2e4f8..00003149 100644
--- a/media-tv/congruity/ChangeLog
+++ b/media-tv/congruity/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*congruity-18 (12 Apr 2014)
+
+ 12 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> +congruity-18.ebuild,
+ -congruity-17.ebuild, -files/17-mhgui-debug.patch,
+ -files/17-mhgui-parse.patch:
+ media-tv/congruity: Version bump
+
*congruity-17 (10 Jan 2014)
10 Jan 2014; Bertrand Jacquin <beber@meleeweb.net> +congruity-17.ebuild,
diff --git a/media-tv/congruity/Manifest b/media-tv/congruity/Manifest
index 23a87c77..de2aca3f 100644
--- a/media-tv/congruity/Manifest
+++ b/media-tv/congruity/Manifest
@@ -1,6 +1,4 @@
-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
+DIST congruity-18.tar.bz2 199393 SHA256 16cee522b3e0b2c76ae4527110cb517af015aa8d56b1e72b7cbfa9df06739878 WHIRLPOOL 8d00db8c54094c6686cdde69008077526e4a2d0c1998b9cecebb43006cd8f053a0f0742de2c364bee56817ecbb4c3820d43484c7a44847afeb31140f56f7274c
+EBUILD congruity-18.ebuild 836 SHA256 642bc328d60852ef13fc55b5d78031e9de401ce47e6d9ef8734af0762346fc12 WHIRLPOOL 386e12bb4ecad9a117ba7fbaedc3687bbeed69b18227c89ac821ee01f6dc9c128c4802d8295b7c6e8f4642e60b9ceac313d496aef4eee636b99f53060d6a02c0
+MISC ChangeLog 1790 SHA256 e3c15758a5a90d943958a67feba9a8bdc149ecee6329fce265df965700c2fbc3 WHIRLPOOL dbb020f22548e013d53b87c6739815e4c5c46920288bd12f7d994c6456980162814b7c5669bc55967b53338fe419cc59e49e5ff8cfb59e92c57140de3fdf4bd3
MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/media-tv/congruity/congruity-17.ebuild b/media-tv/congruity/congruity-18.ebuild
index 54e22c12..d00e2a37 100644
--- a/media-tv/congruity/congruity-17.ebuild
+++ b/media-tv/congruity/congruity-18.ebuild
@@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 fdo-mime eutils
+inherit python-single-r1 fdo-mime
DESCRIPTION="GUI application for programming Logitech Harmony"
HOMEPAGE="http://sourceforge.net/projects/congruity"
@@ -15,15 +15,11 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-DEPEND=">=dev-libs/libconcord-1.0[python]
- dev-python/wxpython:2.8
- >=dev-python/suds-0.4"
+DEPEND=">=dev-libs/libconcord-1.1[python,${PYTHON_USEDEP}]
+ dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+ >=dev-python/suds-0.4[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}/${PV}-mhgui-debug.patch"
-}
-
src_install() {
emake DESTDIR="${ED}" PREFIX="/usr" \
RUN_UPDATE_DESKTOP_DB=0 \
diff --git a/media-tv/congruity/files/17-mhgui-debug.patch b/media-tv/congruity/files/17-mhgui-debug.patch
deleted file mode 100644
index 739e7542..00000000
--- a/media-tv/congruity/files/17-mhgui-debug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 2cae5c46541ec3ed637600e58de564fed16b46a1
-Author: Scott Talbert <swt@techie.net>
-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
deleted file mode 100644
index 95cd8e7e..00000000
--- a/media-tv/congruity/files/17-mhgui-parse.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 9b3e0e6198368ed4cb11c229e7faf986a053bdfc
-Author: Scott Talbert <swt@techie.net>
-Date: Wed Jun 5 20:57:31 2013 -0400
-
- Made updates to Account XSD to match Logitech changes.
-
- Signed-off-by: Scott Talbert <swt@techie.net>
-
-diff --git a/account.xsd b/account.xsd
-index 9b9680c..46e4dba 100644
---- a/account.xsd
-+++ b/account.xsd
-@@ -55,6 +55,7 @@
-
- <complexType name="Remote">
- <sequence>
-+ <element name="ComputedProductSerial" type="xsd:string"/>
- <element name="DateCreated" type="xsd:string"/>
- <element name="FirstConnectDate" type="xsd:string"/>
- <element name="FirstSyncDate" type="xsd:string"/>
-@@ -112,6 +113,14 @@
- </sequence>
- </complexType>
-
-+ <complexType name="SetupSession">
-+ <sequence>
-+ <element name="Client" type="xsd:string" nillable="true"/>
-+ <element name="IsStale" type="xsd:string"/>
-+ <element name="Type" type="xsd:string"/>
-+ </sequence>
-+ </complexType>
-+
- <complexType name="Account">
- <sequence>
- <element name="AccountTypeId" type="xsd:string"/>
-@@ -124,6 +133,7 @@
- <element name="LastSetupRating" type="xsd:string"/>
- <element name="Properties" type="ns6:Properties"/>
- <element name="Remotes" type="ns6:Remotes"/>
-+ <element name="SetupSession" type="ns6:SetupSession"/>
- <element name="Surfaces" type="ns6:Surfaces" nillable="true"/>
- </sequence>
- </complexType>
diff --git a/metadata/md5-cache/media-tv/congruity-17 b/metadata/md5-cache/media-tv/congruity-17
deleted file mode 100644
index d94884cb..00000000
--- a/metadata/md5-cache/media-tv/congruity-17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=dev-libs/libconcord-1.0[python] dev-python/wxpython:2.8 >=dev-python/suds-0.4
-DESCRIPTION=GUI application for programming Logitech Harmony
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/congruity
-IUSE=python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libconcord-1.0[python] dev-python/wxpython:2.8 >=dev-python/suds-0.4
-SLOT=0
-SRC_URI=mirror://sourceforge/congruity/congruity-17.tar.bz2
-_eclasses_=eutils af81d52c25ec93fbdff71e0efb0de7b7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib fac675dcccf94392371a6abee62d909f python-single-r1 82a55861314bbcedaf1e08ed4dd651b3 python-utils-r1 30d5d7986d3f80d0f2c2726366426859 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=d0f641a8cdc310401dac7eb2bc9c04b2
diff --git a/metadata/md5-cache/media-tv/congruity-18 b/metadata/md5-cache/media-tv/congruity-18
new file mode 100644
index 00000000..34f6fbad
--- /dev/null
+++ b/metadata/md5-cache/media-tv/congruity-18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst setup
+DEPEND=>=dev-libs/libconcord-1.1[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/wxpython:2.8[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/suds-0.4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+DESCRIPTION=GUI application for programming Logitech Harmony
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/congruity
+IUSE=python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libconcord-1.1[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/wxpython:2.8[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-python/suds-0.4[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+SLOT=0
+SRC_URI=mirror://sourceforge/congruity/congruity-18.tar.bz2
+_eclasses_=eutils af81d52c25ec93fbdff71e0efb0de7b7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib fac675dcccf94392371a6abee62d909f python-single-r1 82a55861314bbcedaf1e08ed4dd651b3 python-utils-r1 30d5d7986d3f80d0f2c2726366426859 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
+_md5_=4d70932819f8c08525f56023c084104b