Use REQUIRED_USE instead of dieing on invalid use-flag combination, bug 547022

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

3 files changed, 27 insertions, 26 deletions

diff --git a/sci-biology/bioperl/ChangeLog b/sci-biology/bioperl/ChangeLog
index cd1990b8497d..bf33f84f1b19 100644
--- a/sci-biology/bioperl/ChangeLog
+++ b/sci-biology/bioperl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/bioperl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/bioperl/ChangeLog,v 1.55 2015/04/08 08:03:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/bioperl/ChangeLog,v 1.56 2015/04/18 18:29:09 dilfridge Exp $
+
+  18 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org> bioperl-1.6.9.ebuild:
+  Use REQUIRED_USE instead of dieing on invalid use-flag combination, bug
+  547022
 
   08 Apr 2015; Justin Lecher <jlec@gentoo.org> bioperl-1.6.9.ebuild,
   bioperl-9999-r1.ebuild, metadata.xml:
diff --git a/sci-biology/bioperl/Manifest b/sci-biology/bioperl/Manifest
index ede9af39bef2..9c2c886c9927 100644
--- a/sci-biology/bioperl/Manifest
+++ b/sci-biology/bioperl/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST BioPerl-1.6.0.tar.bz2 5640786 SHA256 50a35b1b2552c8f54c83f2bbba7b36264e94443374b86b389208437c8cae3bf6
+DIST BioPerl-1.6.0.tar.bz2 5640786 SHA256 50a35b1b2552c8f54c83f2bbba7b36264e94443374b86b389208437c8cae3bf6 SHA512 eb784459e0c735a5864fdb9301148a88e111ed73aa6f01f74711f2414a3341b9bc5d4187a327b5a5f10de7c92cbdfe9654c63dcc5dc3b70f5936a10f1a8e308b WHIRLPOOL 058bc7eacf6b850fed75c32336b1bb7e0fdccf93339533cf13c60047facc3219783a68304b84397ad643efea0d25333dc66aeca6cfbfe051c760025262234f3d
 DIST BioPerl-1.6.901.tar.gz 12284856 SHA256 8c74bde900222ce3926491ee103997c841c8755148c8dcaf0be1abfd61c5ac01 SHA512 227387437c940da1435ed83fad6ec2168ca12a729c90dc557e84750c6474213874c23a8f23e50db4027909469627baee581faa11be6208c8e0a5453a01c7eca4 WHIRLPOOL feb1f93a617e0135ab84b0eeb36ac986e817ce76ada0f40518090f6a480fbb1047339b33fcd11ccff444f89c4a06c41b5abaab66b662a50f17ae34f9b22d66fd
 EBUILD bioperl-1.6.0-r2.ebuild 1814 SHA256 c389353b17a201cff52c738ed3a944d162aab931c53ced4d05f56f24dfd98bf2 SHA512 0d30c36568344bf096b88e2e4ce94f59a6d0d978255c3b038be65caf84d7a44457f620b232115e642b53a4ff322065fb107c0ef4fe06305792f42f1b90688a79 WHIRLPOOL 4c81acd8a0b3a08f757e77f64ff6b10b4a6a8959d394c9a8be5f310af8d9e0de4b6613ce039f7fdc7830a477574f2e21b0e849d7f3fae992c3bf44dbc80e9e8d
-EBUILD bioperl-1.6.9.ebuild 1775 SHA256 26ea5bfe827dab9f184499b47f4ee36a9471ecd26bcc4260248be909e5f87224 SHA512 4fbbbf2aa873d88bb5e0ce0da6f021b04728eabb8bd787a8af88011ff99bf7da1f3822fed5107cb9758acc479053ab57f6beffedd899a9856714d7eda9fe8847 WHIRLPOOL 9504ce249dd0fa188e56602fc3b15a538f186b82345f108d02a72ed913bb1ed1add2de0d6d180cec922a5fb1d50788ddfad33ade78bc824bb2a44b72392cd407
+EBUILD bioperl-1.6.9.ebuild 1668 SHA256 cd31ddf56509d4f941e72a0e0402cb103cb19449acb0271d8b02a20b42514076 SHA512 a3514d023e963f10beda29cd81cbca52143a09d4f81e6c682e56d33821fde281355842a7422019c378d73549477ce5673f9cde1683bc3bbaee1757d849842881 WHIRLPOOL cb2491bdb4c1764011fa440cd8a5524faca4c93e978fd956faa12decba456707bf535c4d794ea2506115105b344e6f56f9fd1b855b527913aea5d82b6640f707
 EBUILD bioperl-9999-r1.ebuild 1951 SHA256 846d6fc690a4b8b980ee2e76e731fd9947c746f9460ac5aae7403ec3959deaac SHA512 76e96ed370775d52c0046e1d1d5e4bcbadc83baee8c053e93cda243aed85e41b8fe5b0a9ccfb11cacea5ba359d8b4928ea2a3dc7d415511d4c45605887a53ab0 WHIRLPOOL 2ac566fbf3d3ea585ba7a26ede6231bbbd4031d9663c134eebdcc40bb39733766f7cc391cb18dde3b82971bfe291d7abfd12a5fb3691abd12f3cb30f7cd494a2
-MISC ChangeLog 9449 SHA256 08edcb670d62476aa28049ba4fd1973d734f485d25cab72e1ff371f12f7241a7 SHA512 39c09a4eea0830f506e65fc124fc95e10b8c45a9f37185f9f810e27a1023ea41d70e079e8053df38a46c24dbb282b29761d8c48547047f0526df08b1e8c93c40 WHIRLPOOL 8bfe0de75e0bb056a598c8794f44d76f43957fe0da60992d259567f34f29b0e1e48299a604890ff195efc5bff17586ca9e69f1bfd9371477815c3ac29b6dd335
+MISC ChangeLog 9617 SHA256 7283adba4d5b36b5cef367dc155033333d9f981cb5a127a84d361de14c05d9f5 SHA512 0a2bd424fee9642b0dcdb17932ba4fdac7eebc4415014fb0a00f92a4229c46250d735dd82439e70e6b4888c6f05d6a89bef54c8eefdd3419c46e053ab8458674 WHIRLPOOL 01d34c1c8831aa392b1d72c5a5b3af40b792b42dd98365d072ef24866751341ad1f7a1ce16591b7032fb8ed4decb8b67177cf997814c87771c52479c0a6525fb
 MISC metadata.xml 440 SHA256 5360673bcd3c5b31e60fc54f1865790aae76e299e82b5e6a41c5e37d026cccaf SHA512 d691277d3ddf5d944c2898440a4ff4ac6649366d81265599f9e0d23ea1db6745f7578112a73f04d1cfb705789ddec754c82b0a9590989f6ef41124e87d57d260 WHIRLPOOL e3a8031ab9b2ab901ce5e3371e6af05d85fced36582f61491a0a7f24e256888bf5a065189a6dba4d7e5f6dbf28d88b7b050a4fe29ae3d5716d15ac4cc74be86b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVJODKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN6oP/3MmpmUAcTJ4jmLX4GB51ffU
-TYrsfBmnGD5hrWZQTSgiMZ1tJ4WG+mlZm+5TzvtFz4wvkp3GzR8X/p3+PsuFq8oK
-2OBHG2rxiIi+zryPyPY7Io6OMmkQZBLa/OpsJ32pzOUWUumumPjyMTtOJKxG784P
-qEdlPbFrpXwpkD7cRsQfVrIsyHwGu+cq3cxEtZYs23VSQt9ots2n+IwSvAam8ZvJ
-5d6NSOjkfhLfbOUoYaEJJyPzSV68+3mXZSDj/aRGCeqMVTqvlFgcFabC3ZPrcuti
-wcHACtNeTl2KqrZ/q8DgvPCbKWd0j6WwVzLsfczEOTW11Xh5dTNspi3uwwwAygHv
-rdd6d6FQQim7JyrCTqBLp5W4jWfzpB5TKDXYFxwXpxkX6U67J+QuENOtESxW5Hmj
-ob2dPT6cLUIutvrZSSGBbQzCpkNG3dhFMKXrlb1vxe9gvXHewWDthhRJ05yO/zwv
-nULCXPZ1SFFAK8lT3K1WfBrFUayFjCop27TT7Dgoj2TeG/MZktW9KqK+wY+ynkEJ
-odzt1583wkPdfAqVaXhvH//BFyuaYXGN0oyTaEiEeD9TkkgcU5/Is61e+gC0BD71
-98X2ODPJkqzY5EoGKp7cZzvNu3lM34HbP47+1RyKiz90dNWuSOps67kFefj0HU/E
-tl2RJrexFYEozZILUFYI
-=eI2W
+iQJ8BAEBCABmBQJVMqJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5PmYP/jm6lVH355xp1VdPgFqPKgof
+pL24OBopJZCBGo/0GhKC707fY8fod/ZuNS2PFMG76BUtT0d1SqUP9wC/qfeZltId
+xGaaOx9Jdj9zl14UCbgLUTT8fTWdWftj2uxJ2THMNASoD1iJC3d9DpavUObvmEh3
+EBzGaPn/AmoE9ZU5qY3Fxae+pSh7pCmrtXD9Pa8iaQkS5ociJkC54N/Xhmp0x1hL
+GVbdPc5qJq0Y1gN3IXlSsN3YI+J4cfWwC8g1Rd1JcLtjpR/jCWmkEn86Z/ikro5h
+MjCQplZdUBoe4an9A18sDZXpJqUomjjqfReMwTtt8XtfxrYOXfH0WJaSeTvYdkTi
+P7XnNx4QAmJa9T2D6+zNwWcrs2VSH9fmRqImpDubc4rfLpYs5UkzFCf/V930QYSN
+hlxog4yDGlblZgidWF3UY3xmAtHpyZSkj9cZpqveJ+K1qK3BoIFMaDykWJA8C662
+rDGVLR19BEZ6sxCnaVJ0zZz99hO4Om1I/XWmgrQRjUFzu4xHLky2hbN/yJyvAhED
+OR2ovo+Gu8xpLUmzkz/ZYs67w9OuT0WXDGSdpU/LofKB9L3HxpbBpmXUK9/qXo86
+o3TZ+yZ0xEvLht2IIIXnqm06r62BPM6wnC55sgWY8tYLeSCn0hCbLB0voqbULZ7A
+zs+ShSqQZeo0tv4C8/5f
+=uSBl
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/bioperl/bioperl-1.6.9.ebuild b/sci-biology/bioperl/bioperl-1.6.9.ebuild
index 954e6b3ddbac..18b353afca0e 100644
--- a/sci-biology/bioperl/bioperl-1.6.9.ebuild
+++ b/sci-biology/bioperl/bioperl-1.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/bioperl/bioperl-1.6.9.ebuild,v 1.4 2015/04/08 08:03:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/bioperl/bioperl-1.6.9.ebuild,v 1.5 2015/04/18 18:29:09 dilfridge Exp $
 
 EAPI="5"
 
@@ -18,6 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="-minimal graphviz sqlite ${SUBPROJECTS}"
 
+REQUIRED_USE="minimal? ( !graphviz )"
+
 CDEPEND="
 	dev-perl/libwww-perl
 	!minimal? (
@@ -60,11 +62,6 @@ PDEPEND="db? ( >=sci-biology/bioperl-db-${MIN_PV} )
 	network? ( >=sci-biology/bioperl-network-${MIN_PV} )
 	run? ( >=sci-biology/bioperl-run-${MIN_PV} )"
 
-src_configure() {
-	if use minimal && use graphviz; then die "USE flags minimal and graphviz cannot be used together"; fi
-	perl-module_src_configure
-}
-
 src_install() {
 	mydoc="AUTHORS BUGS FAQ"
 	perl-module_src_install