Fix python issues (bug 313987) and version bump (bug 349476).

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 62 insertions, 7 deletions

diff --git a/media-video/coherence/ChangeLog b/media-video/coherence/ChangeLog
index 8d0ae9e9bf39..5d91155f8ed4 100644
--- a/media-video/coherence/ChangeLog
+++ b/media-video/coherence/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/coherence
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coherence/ChangeLog,v 1.5 2011/01/07 09:37:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coherence/ChangeLog,v 1.6 2011/01/11 20:25:04 xmw Exp $
+
+*coherence-0.6.6.2 (11 Jan 2011)
+
+  11 Jan 2011; Michael Weber <xmw@gentoo.org> coherence-0.6.6.1.ebuild,
+  +coherence-0.6.6.2.ebuild:
+  Fix python issues (bug 313987) and version bump (bug 349476).
 
   07 Jan 2011; Michael Weber <xmw@gentoo.org> coherence-0.6.6.1.ebuild:
   added ~sparc keyword (bug 311825)
diff --git a/media-video/coherence/Manifest b/media-video/coherence/Manifest
index 9684992be0aa..75daab7fcd1e 100644
--- a/media-video/coherence/Manifest
+++ b/media-video/coherence/Manifest
@@ -1,5 +1,7 @@
 AUX coherence-init 402 RMD160 7bbe54a57fc1b06469ab640b1c488a74028ada4b SHA1 b5a72cccfb7d35cbcc794e85de812e1ae7c98f7f SHA256 6f8eae69c20139682cf792988dd6fdaa210d30d2592be975d08d0f99524dff21
 DIST Coherence-0.6.6.1.tar.gz 358885 RMD160 5228b526476852d93f0c5f6bc475b06d6665c5ce SHA1 92675de94e83e36a38dc4c7cf74dadf06369ac8e SHA256 9d83db36d2cf5a3ec0c0430819fe97091249de9f3d38e55d249ded59cfccfb4f
-EBUILD coherence-0.6.6.1.ebuild 956 RMD160 9ac8d1fd34dd5e6157c1829512e8c5692a2ea9a3 SHA1 b93a6809ca3f7cb58440ebb3aaca811f236105a2 SHA256 57a72b283d8a62a2ba3da2fef87aa1a9b943327bac5ee60201faab88ade45df8
-MISC ChangeLog 994 RMD160 ce41a6ef8d21750f9dfd79786942010516d81fce SHA1 25c858a2f789c76f71373af7ea2d235edfed796b SHA256 4c0b38c342faaa619629692efafe9fb22ead5b694635d3ad1601d6c5937f1489
+DIST Coherence-0.6.6.2.tar.gz 364908 RMD160 f3cea9a846059723c846cb2254aae73ff1a6a5e9 SHA1 c8f3aedf6f393e400b012b9b79a45faf6bc3c809 SHA256 0b54a6ba88c1ff6274aadb68ff37b8a3961b4c6acf5ded291c5dea936a311ba4
+EBUILD coherence-0.6.6.1.ebuild 1033 RMD160 33fffe9fc6464d10912b0d6f7c9ea9e2cfd7f088 SHA1 24620cb25b3b29ec51dc414ddb7418239a80bd44 SHA256 f23eb94dab006b3580ef68abbdd51d629bfb368b8054fbc32685639ed84e851f
+EBUILD coherence-0.6.6.2.ebuild 1035 RMD160 e3a57ce4f79b2e7c920a373a66e681fa1ba51a03 SHA1 d5e6702f96e6438127ac490a0c7e41e364566fe2 SHA256 2129e74e45d29819d469912f07a9ca06a8b765fa90fc5f31e2fbf0fb305e54ee
+MISC ChangeLog 1194 RMD160 fee1c3383f6992242f8c0d3688a1aa9ef3a07238 SHA1 8821674eb71ee8aa4b27977d29f17f25a4ab583e SHA256 4ad2e5143f6377af4a41ccf887b1229eb81ad9517e38c4ee28dd7a57a8452587
 MISC metadata.xml 228 RMD160 5c121e13aa465efbf8baa6fb52b3f4346dd2fda4 SHA1 303cd4cacbc70bbbab60a3495bf78c9553e5caf2 SHA256 92af75b93fcd94e9e63ea8d591b20ca729b879a816dc3c8c4544c2839f6230e3
diff --git a/media-video/coherence/coherence-0.6.6.1.ebuild b/media-video/coherence/coherence-0.6.6.1.ebuild
index 79c94ef5de9f..9ac2ae45603e 100644
--- a/media-video/coherence/coherence-0.6.6.1.ebuild
+++ b/media-video/coherence/coherence-0.6.6.1.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coherence/coherence-0.6.6.1.ebuild,v 1.5 2011/01/07 09:37:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coherence/coherence-0.6.6.1.ebuild,v 1.6 2011/01/11 20:25:04 xmw Exp $
 
 EAPI=2
-inherit distutils
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+
+inherit distutils python
 
 MY_P="Coherence-${PV}"
 
-DESCRIPTION="Coherence is a framework written in Python for DLNA/UPnP components"
+DESCRIPTION="A framework written in Python for DLNA/UPnP components"
 HOMEPAGE="https://coherence.beebits.net/"
 SRC_URI="http://coherence.beebits.net/download/${MY_P}.tar.gz"
 
@@ -27,7 +32,6 @@ RDEPEND="${DEPEND}
 	dev-python/axiom
 	dev-python/gdata
 	dev-python/feedparser
-	dev-lang/python[sqlite]
 	dev-python/tagpy"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/coherence/coherence-0.6.6.2.ebuild b/media-video/coherence/coherence-0.6.6.2.ebuild
new file mode 100644
index 000000000000..abee6536a86e
--- /dev/null
+++ b/media-video/coherence/coherence-0.6.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/coherence/coherence-0.6.6.2.ebuild,v 1.1 2011/01/11 20:25:04 xmw Exp $
+
+EAPI=2
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+
+inherit distutils python
+
+MY_P="Coherence-${PV}"
+
+DESCRIPTION="A framework written in Python for DLNA/UPnP components"
+HOMEPAGE="https://coherence.beebits.net/"
+SRC_URI="http://coherence.beebits.net/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# deps are not exact and need some work
+DEPEND="dev-python/louie
+	dev-python/twisted
+	dev-python/twisted-web
+	dev-python/configobj
+	dev-python/gst-python
+	dev-python/nevow"
+RDEPEND="${DEPEND}
+	dev-python/axiom
+	dev-python/gdata
+	dev-python/feedparser
+	dev-python/tagpy"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	DOCS="docs/*"
+	distutils_src_install
+	newinitd "${FILESDIR}"/coherence-init coherence
+}