Fix REQUIRED_USE problems.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 12 insertions, 23 deletions

diff --git a/net-libs/gupnp/ChangeLog b/net-libs/gupnp/ChangeLog
index cea1cb3d299b..cdf2392e1fd7 100644
--- a/net-libs/gupnp/ChangeLog
+++ b/net-libs/gupnp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gupnp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.85 2014/06/10 18:01:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.86 2014/06/15 16:59:18 floppym Exp $
+
+  15 Jun 2014; Mike Gilbert <floppym@gentoo.org> gupnp-0.20.12-r1.ebuild:
+  Fix REQUIRED_USE problems.
 
 *gupnp-0.20.12-r1 (10 Jun 2014)
 
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index f1c75e184e30..2b251f80e82a 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -4,26 +4,14 @@ Hash: SHA256
 DIST gupnp-0.20.10.tar.xz 382264 SHA256 5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4 SHA512 3c9a4e1335507fbddd898baee6783765b6a4c012fc1f97e5a997c6a90b8ce9807f62b127d8a22f3b0fc3e806d22f73dbee4690dbfe62ab02572993a3f34bb864 WHIRLPOOL faca7982f484d13544265557d642e9d530e9e17aeddf7073ef6611f7b10b3b71e73ce4ca82984be92d0d55e9ab93b33004f1ef78be1de1c8b0b1a3a0b5070d70
 DIST gupnp-0.20.12.tar.xz 394316 SHA256 205d47b950a1b7190df1115f454cb38a44d71aacfec75d4287299e400e139b69 SHA512 87b74f550e5b1f18a984fce2d955bc43a8931aae4ca6d4bfe19842fd5f6028590e4cb2b6e0fc245dfda7099b7913b5855cbe6a324b5b4cba780cc35b73e6cc33 WHIRLPOOL 1b60c28ba8346b90270e4363e25755bcd81045755adb913516ab7824a0b7e8d71021d106408f8dadee731692e56e0c3a87519470394521593c5a70a02fcd8053
 EBUILD gupnp-0.20.10.ebuild 1743 SHA256 f0e44f549b1d8148ed8082907217ed41a12001b7e117b9db72d64a89bf4c485a SHA512 fe5f25f01126f1acbf0ddf62f30fc06b75348f0f441ad72385c1433255d1c00bc317a6b18192fa5f31f3c2a9f9ed4525cea858674ba9d106ab7410dbe5b526f6 WHIRLPOOL 8eefaaad1ef2aca81daeff2e12af251331e400fd20f259f6001d2e94df9b9fd7f962f25ff91880d607b1de1545d58e3fcd69687db5c2bec14161db70b110c6c4
-EBUILD gupnp-0.20.12-r1.ebuild 2409 SHA256 a8c25e7225aff7a061664f701a751f7187b32efc2c0242d5a6cdfa2485cee01b SHA512 7c74b3827819f096454ecdb92c7af1309fe1b4a7d16b4e771fdf3f0de07da951c234441e4e9bba64e3b19edf5c180cafdc204201806e9ae20e97baf7c23a4818 WHIRLPOOL 513e5af2f216bb5c4b91715793338a7409284bd991cb03f8cf8d62e225faeb31fe902f329c5fee8b99fa25c878e456a3e9529f3218193deef1a02a4d641dbb00
+EBUILD gupnp-0.20.12-r1.ebuild 2353 SHA256 dc0cd3b82354fced1076984cb15c46e1f5cd0ab37b91340868290fb0766420f3 SHA512 fe1e37c896faf84a96c229e0d46ce03f2fb5a475683dab0d9381a7413d567de09ac8f197b2363810a63afac098836b48f7adf1250aeb9e948f093fb169a28b4c WHIRLPOOL c504a92924369f07e8ef56fa6e85d4343144c35e7eb64136f0382f9789471c16ff2c6087ce13c8fd691d018b41f3abadec1b25ed0c7e82527d63817eddff6585
 EBUILD gupnp-0.20.12.ebuild 1770 SHA256 76d31fa3578b216dce9b895ce9256d2e9d6b59203a62a85b703dae6fc17aec0a SHA512 4e2f5e0bb4a585493448d6e36112bed070f6cd00aadff5f3a1c9d8296883cc34f77fbdeea6db7bd06e02b6cba9079bce54d3741457cfeb2ed2c4e9d44cbf1836 WHIRLPOOL b9e1f9951e7c6bf27c64ab2e35acfb55b04fdf86c0982f9d3afaa30b3ca41a133ae1ad4715ffb6a3ec6dc7b35f1de035de3d0ff595336ff29c9e38da763ae134
-MISC ChangeLog 10586 SHA256 351c2dda0d82f93a060378988541c1a405b4fab4525711b500abcd53cc8cdecc SHA512 ab9c2110e077fd2e48ba98c8297a57a67d75aa7405477ae346ce537f4f96dfbb8a4361358cc2b2b117bf8b0171b2b2fc066e16739abe5b1cfb8c9711e86daf14 WHIRLPOOL c7341d1f0c717f526c083001b44930cb808606f6d3fccfe69b07b3fca17b6591bb58500b5abb2c42b3fb22e2e62d3407eb08d96a014e5b7018bb5e18f8b2cf1e
+MISC ChangeLog 10691 SHA256 e4cab2294d658c7f7cbc17d9f0e8579a4237cf7a0f646c3536a11a80d414ddf8 SHA512 21d9ac9feb67a04cf8f9227561d6a32870c0cb97267f608b0a6e7398dd826eb33781bc1d520de60b873eabe6163c7b3a7942722d090d1c91e0f1cd64148d75cc WHIRLPOOL 1483759f94039b88003c083286f0455b9fea65c8ce8beabd516d93600feabbb844f0e18c9bace194d92541a1ab057a0c41f12a73a9d7939d05974ad180645ab6
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTl0gKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwgcQAL/CAKHmxDc9sOE7uQtbkgH+
-gFzkltf870/2iOlt/Q2fIeSD/yD3r+1WI49mZc2F4D51Ylpc6VLMkZ9UKmJO/Tzm
-0fotft0HQUbGwsmH5JqAhh2Gc/8SCEt2OiKqMBjsC4idLDGpmQsqUiVqxWvjdKRM
-tj13wKterrCMVHrR/Dd+1GbPsMa+N7lUS1yIHqWxzjoVkMQLseM3kYg2NdhGQfJM
-SsCsMXiJb4KJrw6Xdqb0Sp5Qdgr4PgvEEyOGt9emOCmDW9wRhp+Ipnja7z1cHpsg
-YDQ5f3MOOIja06xMbXR+lsegG1/hHBc3rj73R1uDJv3XpJKaO0YE8Zch2G1S64D1
-dSArNiu38SDE/b1j3D3bvRBW+24ox2I8U1DYGURa1K2pGxMqXaJl0phov/0tp3FW
-mWBy2nfL1V1UJXzrCHmqcKQ/2kbYUdevunylR8QRKWyqRw1wsMN3waio7rOO7Ato
-1kdHfnf3rgkNZNbramydc+qcx3h54jn5jieQR20/PRqVHSeZ1Ur8NIH2GFpU/jRq
-TO8LdnayDv5lvN8jcRT/NjybWPYFCOfWqCNeHvMau9/Sg35Dt/An21wKGxqk2AVq
-HsW0CpwXvQFNpw+qx+yTFac1E2PDn29DzS8yU82SglE0Q9J5mIP656WaEdH91mVu
-Grd4GydmHQODRLqNQine
-=gfYw
+iF4EAREIAAYFAlOd0OkACgkQC77qH+pIQ6S8jAEAt5psL+hszvNE/NPZM6VQSwmZ
+9mlj8dVUUPz9hNGWJ5EA/iHyj2Wr6q4bJmN1B5opAoE8XOI1WZHrgTo53hT4rvPo
+=ZWea
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp/gupnp-0.20.12-r1.ebuild b/net-libs/gupnp/gupnp-0.20.12-r1.ebuild
index 97d3ede4b81c..da734fcdd33f 100644
--- a/net-libs/gupnp/gupnp-0.20.12-r1.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.12-r1.ebuild,v 1.1 2014/06/10 18:01:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.12-r1.ebuild,v 1.2 2014/06/15 16:59:18 floppym Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,8 @@ SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="connman +introspection kernel_linux networkmanager"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -44,9 +45,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
-# either of the two backends will be used
-REQUIRED_USE="^^ ( connman networkmanager )"
-
 src_prepare() {
 	use introspection && vala_src_prepare
 	gnome2_src_prepare