Improve python support - enforce USE dependencies, allow the package to work with all supported python implementations, and do not fail when an unsupported implementation is selected.

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 28 insertions, 25 deletions

diff --git a/kde-misc/kanyremote/ChangeLog b/kde-misc/kanyremote/ChangeLog
index 87b014cf6385..f822cc741b24 100644
--- a/kde-misc/kanyremote/ChangeLog
+++ b/kde-misc/kanyremote/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kanyremote
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/ChangeLog,v 1.36 2013/09/05 18:45:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/ChangeLog,v 1.37 2013/09/11 15:21:14 kensington Exp $
+
+  11 Sep 2013; Michael Palimaka <kensington@gentoo.org> kanyremote-6.2.ebuild:
+  Improve python support - enforce USE dependencies, allow the package to work
+  with all supported python implementations, and do not fail when an unsupported
+  implementation is selected.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> kanyremote-6.2.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/kde-misc/kanyremote/Manifest b/kde-misc/kanyremote/Manifest
index 8e5c60620e54..dbbc3cc81621 100644
--- a/kde-misc/kanyremote/Manifest
+++ b/kde-misc/kanyremote/Manifest
@@ -5,25 +5,17 @@ AUX disable_bluetooth.patch 575 SHA256 33259b431e49aeef96b3941d1bd3506da69bea7c9
 DIST kanyremote-6.1.tar.gz 285638 SHA256 e35dc0a8d2b83d8011e850195c491b1e32bae5d8519784e62fd4320f052c9fe9 SHA512 e71b5dc33ee74c88b9cbf6663bda9162850e21f85a600d523a60cce99dd0b531cca5fee928eb654eac6f3adc3702b5b6a85f2a04b53cb969bfa8f980622a9240 WHIRLPOOL 42d7a83a4d62fbc89407c3b80a00bb9e2fe0b30afc08347b6e232a8fbc30f2c60b29dcd0caf26c98ba8c1101d0f50a7878229b0ef9e5c791e07f993bfaf07582
 DIST kanyremote-6.2.tar.gz 291205 SHA256 22a532d74b07c4c2ae45d3cf366c990e972d04bb5f6bc535dff3e45c29d98c3b SHA512 f3bd0cc2bb5aa49b2d07f90423ffdd474ff86f7efee18c38df86df79bac85d590b23ef58aa61f77686845c09c6e26a679e05cb88b1740bbe6f1e5b8d525fd7bd WHIRLPOOL 5e8a8f2416e82bad3ad68672080bc52bc9cccdeb66eca446001255aa0fd9ad427156136a353f736e42d0a4323605234b45dc42d4bf905460ec8a58dbb76147b6
 EBUILD kanyremote-6.1.ebuild 1258 SHA256 933fcc755d4889ad1cff5319e195ae0b9d16f1b39d959a6803b342a06027b378 SHA512 31b54af21c904b1eec277221e2db31778b88423dd7df955c9a34ad0785361f252ab7952a736f150f9646c4a1728651e125aac9cac867cefdf0cceac2bc8858b3 WHIRLPOOL baab4389b4cf5ad458d207fc3fb24a7753e04bda4b1391120eac8febcfd0efe65e96595f0be53804938ea49892f678f925c38833d09b088669589c01df638f01
-EBUILD kanyremote-6.2.ebuild 1295 SHA256 b369bcffc74d18f0a74341e1490165fe7bf520f2b85b182e10724935872207c5 SHA512 b90ce04b9faf31bdc5cd4a33c9a8c37af63f86d35b9d53f076adfc50938ea187c00fea876d5e563ea51aa92db3ff4467848e2a9eff55952a730ce30a36c0618e WHIRLPOOL 3ca87d4e35284e40ff72d6ac302abe97484c7eb66a92905ecba42c09874cb710d471105c3518f5c95b4201e9e163385607e1d0d7c63aca0496120b4f39a8d4a8
-MISC ChangeLog 4605 SHA256 a6a5ec6923e1472f8253a2cfd2ff8bf394ab21f323eb40e00ad5f274d83e4e9a SHA512 a70e32a71e072496720775421e7e04204c5752bf7b762393e1d1935ddd64cab38f7122b33cabf47a71109de74161c8334e46ce95876706549b7037183d8e079d WHIRLPOOL 5fbc999196400067834bd785056faa12f36df9e57d64a3467dd0bff1844f038ef8d1f107ad94ea5fedff4ba6eb72d6cb3c6824f02ad54255213c7c7a2a9154bd
+EBUILD kanyremote-6.2.ebuild 1429 SHA256 32792d5f0c17756c284b51effc9e8d78b66db60f28bbcf6c55071bc97ee477c6 SHA512 57ed6ef9ca68b7d9a462dbf22c4aac3f9fbddd4da1ace4c748697d4826141da76add61395b1231468a4fbdbf256a5dd6a3b1c8bb117267cfdf3f2143f4d83223 WHIRLPOOL cef432ec135b6b30bfcba47904753157f17ed5fa87937bb6c82fe7fa341e5338c992e50109d9c633f8f0c96a4ca151ea15ffc77364150b5ce8ee1ce197571f9f
+MISC ChangeLog 4879 SHA256 da46bef4bef356769267b4c9fc1618775dfc5042e505c88da6578e441e67f7e2 SHA512 6fdcf2359425f14cdaf262c057e5487e6e3c0dc2180e96698316613a8bc4f63591b43325b65b57ccdd3fb6acd9bdc6983ed1b4f70604e75dcaadd62e52e7bcae WHIRLPOOL 2ebc48751a6bcf12f9d55263f2bc2914c2e2d4bd7c3b276b367e001cd1fcacfb036a618db6e731d9a3ace9497d6212f4afdf35483f202e4a292fc32093465e4d
 MISC metadata.xml 295 SHA256 63e5e4364ccd54e92f7be18c5ec8734c3f4e6d7392cb48f445be97660e95f1fb SHA512 95769f0aae8c2459de1346732089a8002c4717c157d61061629780bc75d2312b81afe386e936feea3e105c27169daa2975fadbc1fce7eafe0e283b99e31ace8e WHIRLPOOL 34ee4032cdabf20126d0bd863b330d88ff39dcd59e7a0e84c51f41f6b0ce167727ec9f0a3fc48652f39ec148f4a383ac80a0fbfdd982ea461488319c90da81c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNFNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5RAP/iS4PLuTVZyJyzUv88P/91bz
-bqlZrVCN399Gsc4zC/Rmf3g44o5HFkG1VXcrwNx65O6o2c7HQh703zxlCJgmAzxw
-B6M35vhtQLG6vMgPrssviaVoAZuVc/M5ndQ0f5bsPDISbZtZh6wuwD6kKUYG+0Uq
-ygYrOPAX1HKqZdxpoAV1B+Jne9QYF6dweAUQ57ArEsorSnQXE04IUhbwLIvAWbrG
-obamff/4L5V+3Dej9EXCYFtn6Kvzv9H5r6Cdycdt+RPIhj0/6OzAJLOc8z1UZS2S
-sPs3wD2kJVvD754RnVlgvJ/QjMrT+DL2xNfFts2FtBPWZa5eQJXV1Te1kErQdRc2
-/iwGfXQawbAHelFw5FWcdI7Y6Trcx4FXbnhHDFOy0m8u//JwPOjOA4j6V6THMq/C
-Z1+FZ40zG4nKvML5aWR+WsT2A/uHCEGD2czv5keAwUvOoCGkxWosVXE40iLVp8TW
-2vR8LgYNnskScibRPBYNKyj6O+OoqOB5N0X7DwxTgcm/lGWZdixtp4acTIoT3jBt
-b8RUb9uGzrDm6LGy0oV6cL2eogdiWYvk49YuVkIMBEIv2JV5PWL49/0QugF4cZya
-dGNlhznSUKVHwmbqzHduQc3xUIzeJuAG/Ah7juYon2awLwYhKlnanOnKimVnK0j3
-Ou5CPTDq8qiUjbag0++2
-=XukI
+iQEcBAEBCAAGBQJSMInPAAoJEMbwO6tnXQ0spcYIAJOQEofBf00/rCLwXfiblViq
+llafNmYGkqLFc8aAPP/61VRqun3uUVd4yn+UXNj41bl18ImPujm6hSWw74ehP0TB
+lIctMLdzFLHWleAwPg2XXWPvMDE9reE34W7XgnCpjOngmnWwO/Mcwv7s5xxQYpG0
+lu4555/QSML3CAi4bsuUZb/uz1U+baAarUlmZN4LZB0wp55Pj5He8f8iW1dko3pO
+ZeNsxs8J9F1jxr0BBLY9OYeX3qcBYO9RP3Fy9a81uxdidAH9wHO97DP8iWlhRDxf
+4RldQVmbrD+YmkiKcEvj900k1n87N5braFknHLuqrhc9HK/heqV1PUKDHY6cuIw=
+=HJFM
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kanyremote/kanyremote-6.2.ebuild b/kde-misc/kanyremote/kanyremote-6.2.ebuild
index ae4087f6547e..5211c7b08e5b 100644
--- a/kde-misc/kanyremote/kanyremote-6.2.ebuild
+++ b/kde-misc/kanyremote/kanyremote-6.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.2.ebuild,v 1.2 2013/09/05 18:45:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.2.ebuild,v 1.3 2013/09/11 15:21:14 kensington Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools python-single-r1 base
+inherit autotools python-r1 base
 
 DESCRIPTION="KDE frontend to Anyremote"
 HOMEPAGE="http://anyremote.sourceforge.net/"
@@ -16,18 +16,18 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="${PYTHON_DEPS}
 	>=app-mobilephone/anyremote-6.0[bluetooth?]
-	dev-python/PyQt4[X]
-	kde-base/pykde4
-	bluetooth? ( dev-python/pybluez )
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	kde-base/pykde4:4[${PYTHON_USEDEP}]
+	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 src_prepare() {
 	# using gettextize no-interactive example from dev-util/bless package
 	cp $(type -p gettextize) "${T}"/
@@ -41,3 +41,9 @@ src_prepare() {
 	# workaround to bluetooth check when bluetooth use flag is disabled
 	! use bluetooth && epatch "${FILESDIR}/disable_bluetooth.patch"
 }
+
+src_install() {
+	default
+
+	python_replicate_script "${D}"/usr/bin/kanyremote
+}