Add conditional bindist restriction and remove bindist USE flag, bug 541452.

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

5 files changed, 28 insertions, 23 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 78a411c61290..c2e60a2dd08b 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.130 2014/12/28 16:14:40 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.131 2015/03/15 17:56:04 ulm Exp $
+
+  15 Mar 2015; Ulrich Müller <ulm@gentoo.org> freeradius-2.2.5.ebuild,
+  freeradius-3.0.3.ebuild, metadata.xml:
+  Add conditional bindist restriction and remove bindist USE flag, bug 541452.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
   freeradius-2.2.5.ebuild, freeradius-3.0.3.ebuild:
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index ec22825d75ce..08628e394277 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -7,14 +7,21 @@ AUX radius.init-r3 733 SHA256 fd4435217237f828a89315d5a184ee0f4b0b19b4166a42097c
 DIST freeradius-2.2.0-patches-4.tar.xz 3140 SHA256 9fd7b6f7e1501d63a073e6279b20eb6d8154e7898d81c85a5c548543ab33c1af SHA512 38ebd65d9ad8ce8f513f2f5c7fd9ff43b81cf468038a49f9eb7f4a54d13783e88866c3031e7abc0fc8b65d2aec4f347efa358b9e7e2aadb2d15567ce7e125d1d WHIRLPOOL a532444f6bfebe260a6b4bf43157fa1624ce9920a86635172ac94e0f757263904bac6ca6a472e12df73e32a8d25d6f7b094272bd743d13c566f23bfcbff6df27
 DIST freeradius-server-2.2.5.tar.gz 4415950 SHA256 8c4c2a0b600a8d85d2235589a5e80d4fefd1f52317e9daf8193731566fa9d012 SHA512 511599b4f4f5906441d0cda61946341f2226b9aae69b6f68b03a19898b6385499a8221933c191232d50f736cab93f0f6f271e4defe4552e7738cb21e2415f053 WHIRLPOOL 629ac42749b736a7cd606c97fb149ea6f3b11d0e77bc5fc69785e4c7956f073131eb16420f276de5664e977a37a6784d0bbff08a15c1c23389f5369320a4cb12
 DIST freeradius-server-3.0.3.tar.gz 4387083 SHA256 57e9932e5401670d0f0000080b942aee2cd6ca80422f76acd21f13a4be46335e SHA512 a4fbb0a19f5946182c0cac6d62270db378674e48350c7c3b8f7d8a2a1b16c95c9b205af8d7ed22009b6392d4ab7cb251694d2593a39d9e4efc8eec9ff736bd01 WHIRLPOOL 2f263e096e3ace00feb39f68662d5f3346ce35dfd7a451b23ebfffd5abef4a881ca2e7115eb274a8c10fef965c4e82a3d3144595c226307995703875d7133ef5
-EBUILD freeradius-2.2.5.ebuild 5126 SHA256 9fd99f52be64f78c8c920d26964ececd8524f39e4e72ce979ace68e597161b55 SHA512 79408ff6a94e4fe0158ef9f339c388226d07abe97034ad09a8bce107b1ed1d4638f11a976cad022121e516d6b0daa4122a97124ad3af6d4c3385b4b466bb78e5 WHIRLPOOL a204be64d94821069e63a28ba18b3fa767e501948af70abbc71143af7523d2a01d497198eacf9ac9b2adfcee01f7b9c4bdf708f95c07b25b49895f25e1a5f7a3
-EBUILD freeradius-3.0.3.ebuild 5516 SHA256 f77a1db43304e84413d79cabd5ff5d60c2ffb7361005ebddd118c70666e6e03d SHA512 e2c6cf274fdefa8912018725ab4a280ec7fa3fd55fbe3d6cdf40d22d7d6ad326f689c38d907ced425453ffc787e662ce7334ac27ffd0c9dbe036a45a64e26a3e WHIRLPOOL 21ee2a1e14acf9a4800282cc8e82f3ea77dc5c8ab48b1f7019988d3540d8bd991e1ef05f88daa73369269dd41eeae1b839dbc36f78bef456d3b942e2051efff2
-MISC ChangeLog 27983 SHA256 9bc7d5987d085cd5f6d1f2b36ee6536d1ebbf22914cccbec0185930f8b64ec20 SHA512 68007ea2345878557c89c185956fc59792085f4cebd2c582686bca4a441a15be295175a32fc2e3082d90a835b373fc97130a00ddd1c8a27a3c4eaaddaad1ec64 WHIRLPOOL e62dd858435c2eea3ab64019f2af910b3bd113a4bcac2395926a9b5d8151c1fdec2c259a4a0c9fe1b53cbd1f0e063fece6592f5558e142e6f373389b97c8da22
-MISC metadata.xml 435 SHA256 17d441afcfa0aac8ea4317f50436a55adad6b51dd407613df8e6a7341fc348a6 SHA512 17d166ec4154f6d9a85cfc7135f3b14641d0357d959b76af27067cf069f392f9fe7bbf44683f84a963552e0dd88c668f3c9c4f3a4e00ee98ab56de291d292b0a WHIRLPOOL 69f278ec8875ed0085e86db9373a04285c2452448f1220ed1c8c31e9f0283b8b80c720b108373ba9a0478a0118034faec7b91ab7f5d93adbff2bfca79b5460f1
+EBUILD freeradius-2.2.5.ebuild 5105 SHA256 bc83be12074301a6743a62ff7d55798afeba2b73ade67fc91d1cb23bfe0fe289 SHA512 37cd06eb2898712c940169b9048a87b2416bfd7ad1ba8a1a3f10f3e5fe1d2ee8799260233d623f6eaf392aed528b75505581da06baf543ff2bf787a1e88ec6b6 WHIRLPOOL 05e22cdfeffb37ae67addcaeabcd62ef59c047c8c7cc1b24972ed39c1371113b3ac4afc59e99894db9de9f5574a92db9135c5c05f3306660ed55bb3d480fd9f6
+EBUILD freeradius-3.0.3.ebuild 5495 SHA256 b41f9dea09bd0117a66befce95072d19523fb42453f2be83f69154a41d1eb72b SHA512 93594864b1bef03e120d671844cbfe043dc3b5eab801285dd18094035b068871b32f9f0c8ba124f8d00acf525a31080bed20a08369c20185f81392ca14994c44 WHIRLPOOL 364250fb68c4447eca9afd2a493136f192b813559ceda4a870487a531f8c896f9a6bbcf12c72f3331e4bb00aa4ec9071329ce6c4b3f0cc55bc53f0bd12d0a981
+MISC ChangeLog 28169 SHA256 7d469936b3d7d3800ec0285550db996c11b23727fa01bd3c265f3000ea671825 SHA512 75428dd76ef788a6413240bca0e262d31411900e00da26d103e863eeae6beee2dafef8dcee97e4e259224e8d9950d9d2876858d316fc8e2319603710da283862 WHIRLPOOL 7ad5889a80b658bcb06bd79844e22ba1afc307134202d11414bd72fcfcc654201d32e5e60f996803b4165d590e4e1121fecb93eff589084f0cea0ecf43a74bc5
+MISC metadata.xml 292 SHA256 2dd425124762370883ff4bda38aea3916b488da4757278911e891c20db752a00 SHA512 e94382e544441b4ed022138fd2d37d7ad7b79c8a3d4c8cf1422f4c8e66d7504346db60d3719fd93059dcf4604e16eb9b9c376d210317ddd45ed2375949a3dc30 WHIRLPOOL 998d68c8a161f31811850f25080bd05ca1ca934e43ce2fc9291ded75f0031521ddaeef7fd81d5a444399bfb935165d9c7853cd590d5fdfd38df23f2f071255ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgLHIACgkQVxOqA9G7/aD2+QD+IXWkiC/hZlmmFVvQFHv2MMO/
-XEG0kBBeE121Eq7x198BAKFtTwLx3YARgImcKlf0fYxhqvtSs9UgjYDTQEL8G9IO
-=sG3r
+iQGcBAEBCAAGBQJVBce0AAoJEJQzkH1pP7W4MsoMAIq1oa6uHccn5p93AM7sv5LY
+bQgqvtyEZk8dC9zypSoesxfEwdMkILFQzxWGzkOWrooH8nCDRiPBjJ/8w7hmitm+
+amVDxYnhJ/V5tk8jsPp7Lhm2z7LD6+2OedqcVRMa285m5r5P5eeKCJxLMQWzaTQy
+x0e9N/m1592DMJnvkO2cG3WnzNjdrLPvvbQ59K6Dl0Ck9+Wn1CTOFbotxCGc5I2t
+U4bnbQVXvbkecYL3E+Ni0aHiZqi5kB3tk6VYRst6tWdKAJ+yxoZv1U4GALAU7mED
+VzTe6KY7uOMmnI6DOObJFs3G8XmLoB3Z0H3jS7i0SPEhFQ2jPzMsvjArmZWOVEAK
+YF0inYrjayq7h80YJRKFf7wA/8rqYfEwQDcrN3xipswo7xtCDzfyiGszIEvGPz8V
+0t0X/7SAt4yQW9qc1Kr/9WM5DaJyK6CI7ruVoqs4UmMVV4ugx4TRo+VfPQ0PyzyK
+VkrWBIf0HtDEMoRQKCP83QHcDL5fGM9T+V9SEvy7WA==
+=htoQ
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/freeradius-2.2.5.ebuild b/net-dialup/freeradius/freeradius-2.2.5.ebuild
index 24d5abf1319b..936e74cf814b 100644
--- a/net-dialup/freeradius/freeradius-2.2.5.ebuild
+++ b/net-dialup/freeradius/freeradius-2.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.5.ebuild,v 1.7 2014/12/28 16:14:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.5.ebuild,v 1.8 2015/03/15 17:56:04 ulm Exp $
 
 EAPI=5
 
@@ -25,9 +25,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
 	postgres python readline sqlite ssl
 "
+RESTRICT="firebird? ( bindist )"
 
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
@@ -50,8 +51,6 @@ RDEPEND="!net-dialup/cistronradius
 	oracle? ( dev-db/oracle-instantclient-basic )"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="bindist? ( !firebird )"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
diff --git a/net-dialup/freeradius/freeradius-3.0.3.ebuild b/net-dialup/freeradius/freeradius-3.0.3.ebuild
index 68920cc6948a..c35aa1eaccfc 100644
--- a/net-dialup/freeradius/freeradius-3.0.3.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.3.ebuild,v 1.3 2014/12/28 16:14:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-3.0.3.ebuild,v 1.4 2015/03/15 17:56:04 ulm Exp $
 
 EAPI=5
 
@@ -23,11 +23,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	bindist debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
+	debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap
 	postgres python readline sqlite ssl
 "
-
-REQUIRED_USE="bindist? ( !firebird )"
+RESTRICT="firebird? ( bindist )"
 
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 9e2d8adf829a..381ec90e597c 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -6,9 +6,5 @@
     <flag name='pcap'>
       Build the RADIUS sniffer which requires <pkg>net-libs/libpcap</pkg>.
     </flag>
-    <flag name='bindist'>
-      Disallow building the <pkg>dev-db/firebird</pkg> module, which
-      is not compatible with GPL-2.
-    </flag>
   </use>
 </pkgmetadata>