From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 15 Mar 2015 18:03:54 +0000 (+0000)
Subject: Add conditional bindist restriction and remove bindist USE flag, bug 541488.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6e1f5c9f3fdd57534f259e98e9e85f7a059969d4;p=gentoo.git

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

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

diff --git a/dev-db/opendbx/ChangeLog b/dev-db/opendbx/ChangeLog
index fe789a593aab..4ee743a30d10 100644
--- a/dev-db/opendbx/ChangeLog
+++ b/dev-db/opendbx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/opendbx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.42 2014/12/28 15:06:33 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.43 2015/03/15 18:03:52 ulm Exp $
+
+  15 Mar 2015; Ulrich Müller <ulm@gentoo.org> opendbx-1.4.5.ebuild,
+  opendbx-1.4.6.ebuild, opendbx-1.5.0.ebuild, metadata.xml:
+  Add conditional bindist restriction and remove bindist USE flag, bug 541488.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> opendbx-1.4.5.ebuild,
   opendbx-1.4.6.ebuild, opendbx-1.5.0.ebuild:
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 8fbbe210c5e5..a2c0f1f78f93 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -4,15 +4,22 @@ Hash: SHA256
 DIST libopendbx-1.5.0.tar.gz 583894 SHA256 1a274939847c3b3d3614c19cad86539007737c60ba0d7259614a0967b1fd71d9 SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5 WHIRLPOOL c5a933fcbffe6f7c7589a43d7f4148375b30d81d7221a0148bece6f3d3f1ea490fade6b8c160f4db0576ada31aab00a69d828418e67f2c8b0b4df6f31fcf184b
 DIST opendbx-1.4.5.tar.gz 582915 SHA256 206c998f370d1677a5692a64941470205dc6cd8ad95be1af6b033df50a6431cd SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e WHIRLPOOL 0a518ee0993447c67731141bc105ff5c082cb434c575a64b3df53614ffc6a72e8734b2720ffa46697b52e81e544e4a3752517059b534faae5698060af71bc5ef
 DIST opendbx-1.4.6.tar.gz 587514 SHA256 2246a03812c7d90f10194ad01c2213a7646e383000a800277c6fb8d2bf81497c SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55 WHIRLPOOL b66761e99e04119f2aaefa071c8a35a9f0af84a012e7e2f908eb9fefc9bae99a26a9942c1adf3e5dc6061ff78fb4ae0d0397bebcb709ea10c7a7797f95f03aad
-EBUILD opendbx-1.4.5.ebuild 1988 SHA256 eb1c75e5c039829c202ad87cbc8d4e2b3744f4e1dad89ee106722f9ee336f3dd SHA512 5e5692cd279e0c2b0e0fbccde226d00520bbce36c0eb26724fe802c230158920000ed8f86613f4eccb1c371423d6eb895c977e635a2d7a83c65c2a3f8a1b27fc WHIRLPOOL a8a1333e80b51d4444fb4be215812e16915ea12ccf50f2672134418d81b10633fbdbcdfc7d4abbaf3baed06ea0878629ed9a23a178331c61be5063672ea667a7
-EBUILD opendbx-1.4.6.ebuild 1999 SHA256 4598031b0f80c887f6ee8ad79e5f27480accf4b0b529f8bf5f1ab80833ba26c9 SHA512 675e44a19d05628b38b720585c79340e36b8eed654db7b2904f1120a2eae2115eab8e59de000fe0a9a7a96ff6de32169bfdeba7d05211ab48ff0c2f8ac9ec15e WHIRLPOOL 29133ce91a0555c56f0fe674e99f2545466d21d241b85d4bebbefda1f272ee446746616209e7d28ab2e60b006da9e443da1a8628e1b5d910bbbb8f623e449186
-EBUILD opendbx-1.5.0.ebuild 2067 SHA256 b7173d944e85d891457f34ad779581f9ba4f842927a9e8765d7acd006a36df77 SHA512 c99ac9f9c9de90d6a5a7ca26dc2c54cea255d1e00e7d453f47c3d773ba7a0e857aedd90b0d32b66a026bfa0afd6aed52f78269b3aea7f1d401338e0ad07022ee WHIRLPOOL c91890e636b38f50217e4e2113ca1ae87e7b8377eb313ded84f53de1ab31ea08037c6a41c81b14af3f7d590151e9e3a4b215c9a5bde699367fa5354b675b70b2
-MISC ChangeLog 6484 SHA256 b5126dc07c431647b982656a713136d635d3eaba684c442feb00e02a8b11ce18 SHA512 5e904ac7cbf54a6df047ba711e5522bbb3cbde4d6743d3ef8692a902b4c9494d4c8b10e7e682457928f1bdb675f70dd3493f9b743795d7a22dc745510eb7fb21 WHIRLPOOL 66fabb7c38bc3c9221857f15f81197d6ad2abc4b8c397254eef5bcc5aeb35c67b098378016884c14ebf96f763f645c2e3f3d4e1cdb552b85d382576c175dddcf
-MISC metadata.xml 358 SHA256 4a1591706c64315224b6ec83a63a68b58925439e41e805dfc7797ce0b34ff006 SHA512 66e1b3be59cc778d80e1897596f3a6d9ec18498d959f3180cdf35458b87e16ae228a8f79b4f89ddea2c8dbd38789c3af965040c1445654d53a836436466e362a WHIRLPOOL e3817274d9847f8e6f43a8ac7ad1526112ac238b3bac1808318d9bc790939f64784cbc84bc6b1105667f12cf4041e9ede9a761134288ea5a040b6a7fb980e6e8
+EBUILD opendbx-1.4.5.ebuild 1960 SHA256 3c95882d70b7af653c34f4ec79107a6f25e2547420c79b5980a9ebfec226b8f3 SHA512 d1ba5473252bedc1c624fc2bf47cbc06f278fa7ab5b8c1a17ab5098ddf29da22b86868bef38ac0c4bfefa3234f7267b8a626bd92f055ea1c8b051c7a1ce0d86b WHIRLPOOL 5c3533c9a25f86627223fd3ac473c91930d03906563284045b3ce2d2c7c25961007b34e6fe553a03bbb7165422b0762ff221faa1c77c3774403961161cdcc4d1
+EBUILD opendbx-1.4.6.ebuild 1962 SHA256 8f4ca726422fc09cca4be2a9d521feb07dde421182865e206a767c3ed91cf2bd SHA512 a8ef7e3a11fd6994ba6f0a54ec70282f4831c34ade3eec849d29699c9fb9c02350041e13e8ea6e9041e19f4c4a5e879117416466450d3b9d28fb48ba13957a23 WHIRLPOOL 51b671a268417545abb617b44308ec5f4a228aa7c0ac1366f6f1b4e14d8dad7186cbc73b85ce2ed34aabfe729be26b235f48b6b79d41f42642fdf665d6865eab
+EBUILD opendbx-1.5.0.ebuild 2030 SHA256 b1c9f1d9e56f89ce9a99a7206a2259508ec1e35f478be9468f219b53a08d9c8e SHA512 80788588733eba2eba416894e7e2d6fe4d3d648f2e5c44516b3e9d93d19d8c13d84a55b85123caec6b0e5fac51f0ddefba54379477e130159220f1bf417c87b6 WHIRLPOOL 51985994ce5ef93f85f070a7e2a2854e5a27f3355d69c74a27c18272e8de6ed819f59045aa9a9d6bd65c22e9ab58fc01c1562172ce8dc1d673a16b00dc5e7a3f
+MISC ChangeLog 6686 SHA256 d74577ca28dca5ae79a5075a5e1130afac81985ce8d2c5ea1c82d11c47138384 SHA512 171c2ddbb020ab42996a68932b240ee3da19cb6d1cb685c16fd45e5b1df9d7696a279815fc12aef115a0d4390f8cf8bef23543c43fd656991dc7aa73a568d16d WHIRLPOOL 48b6b4968da4e20eb5eb3587078193809d78f490b8ac943dbe3c4b48cc8e583bfbead70d9d1588c14fd24a6b386304cdba139d18e2543ccb13ac77131c60d024
+MISC metadata.xml 229 SHA256 12b161b95a7a407fa671dae17cb8b171096e6ad84c4a7dbcd4719e96ed08be56 SHA512 41ab0f6ef630ff95037ddee3f20d05f55eb6117e9e21c12ec070ce440bb189703bc76a5aedda4df14281d0a11bdec941ebce1416046440fafe2fc85b94ed95b7 WHIRLPOOL dbd0652e013d063bb12d913cb5eacf5dac07bd50a37e9618a5aa51eb97faf4a1944ad527e8025c8624daa974136f490d79a3b8d8bd07595634dac174781d2f29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgHHoACgkQVxOqA9G7/aDOSwD7BDuLdnq1jaDLRj1wVVqg6lUM
-fxyXO/0wfbmdNywVeUQA/isvTeu10i9wcNHNv9MuHKSyHOvyNMnFlpK+lLkyLMEY
-=w1X4
+iQGcBAEBCAAGBQJVBcmIAAoJEJQzkH1pP7W4UtwMAJf110ReEfgdXftHt+SQGSa1
+52Wpkxcu0LqjHSN2T0cU5g8J5/efjmvWUOhei3W/04G7Q0xZ36x8orUB7e95PUi8
+28+VJMBPbhHedKwLDXCVZ/gOmhk4rnF+oJ59DfL/raKl8zNEYNbubaupgoo+rrh0
+uCzi7tOZEpq0ysdlo0Fwkjbz/+krPO+Go7t5flJit7no2LcsdfaskbQQTaANiTJx
+7TrUZpXUyJARXtsBPk26F2BR2dY3cJowaFD1wMz7lFoyNSf6M3Ot4S/sB3Nm8+SL
+VhCk1k1wsKqIXHXIJW8Ys1FUqjWcHZkcakaircz7C5EL3lD25b8Ix0rXNkJf4Hpy
+Nh7iHpGRYBkK6cJ7XJDLZjNzKW6u5BZwt4Hfa/q8pBy11HaCrsH3F99Ev/SPJjwM
+IIBFwnfuyvNDL2imhxGHUzd4hYD/ngNgoce4gBeNCNEUhkVw2q8sMCgC9duq2Xht
+wkb/LeA2BUOUmfnUh0I5fbr451E8pVY3YIijI8N5OQ==
+=WSy6
 -----END PGP SIGNATURE-----
diff --git a/dev-db/opendbx/metadata.xml b/dev-db/opendbx/metadata.xml
index cb3bf7e77b13..35926e0cab20 100644
--- a/dev-db/opendbx/metadata.xml
+++ b/dev-db/opendbx/metadata.xml
@@ -5,8 +5,4 @@
 	<email>alicef@gentoo.org</email>
 	<name>Alice Ferrazzi</name>
 </maintainer>
-<use>
-	<flag name="bindist">Disable support for <pkg>dev-db/firebird</pkg> database
-		which is not GPL compatible.</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-db/opendbx/opendbx-1.4.5.ebuild b/dev-db/opendbx/opendbx-1.4.5.ebuild
index 1aa9a0c5af88..239aa94b1cc3 100644
--- a/dev-db/opendbx/opendbx-1.4.5.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.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/dev-db/opendbx/opendbx-1.4.5.ebuild,v 1.8 2014/12/28 15:06:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.5.ebuild,v 1.9 2015/03/15 18:03:52 ulm Exp $
 
 EAPI="2"
 
@@ -13,18 +13,19 @@ SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
+IUSE="firebird +mysql oracle postgres sqlite sqlite3"
+RESTRICT="firebird? ( bindist )"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	sqlite? ( <dev-db/sqlite-3 )
 	sqlite3? ( =dev-db/sqlite-3* )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	!bindist? ( firebird? ( dev-db/firebird ) )"
+	firebird? ( dev-db/firebird )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! ( use !bindist && use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
+	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
 	then
 		ewarn "You should enable at least one of the following USE flags:"
 		ewarn "firebird, mysql, oracle, postgres, sqlite or sqlite3"
@@ -43,7 +44,7 @@ pkg_setup() {
 src_configure() {
 	local backends=""
 
-	use !bindist && use firebird && backends="${backends} firebird"
+	use firebird && backends="${backends} firebird"
 	use mysql && backends="${backends} mysql"
 	use oracle && backends="${backends} oracle"
 	use postgres && backends="${backends} pgsql"
diff --git a/dev-db/opendbx/opendbx-1.4.6.ebuild b/dev-db/opendbx/opendbx-1.4.6.ebuild
index 650e4437389f..858b015cc4d2 100644
--- a/dev-db/opendbx/opendbx-1.4.6.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6.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/dev-db/opendbx/opendbx-1.4.6.ebuild,v 1.5 2014/12/28 15:06:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.6.ebuild,v 1.6 2015/03/15 18:03:52 ulm Exp $
 
 EAPI="5"
 
@@ -13,7 +13,8 @@ SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
+IUSE="firebird +mysql oracle postgres sqlite sqlite3"
+RESTRICT="firebird? ( bindist )"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
@@ -23,8 +24,6 @@ DEPEND="mysql? ( virtual/mysql )
 	firebird? ( dev-db/firebird )"
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="bindist? ( !firebird )"
-
 pkg_setup() {
 	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
 	then
@@ -45,7 +44,7 @@ pkg_setup() {
 src_configure() {
 	local backends=""
 
-	use !bindist && use firebird && backends="${backends} firebird"
+	use firebird && backends="${backends} firebird"
 	use mysql && backends="${backends} mysql"
 	use oracle && backends="${backends} oracle"
 	use postgres && backends="${backends} pgsql"
diff --git a/dev-db/opendbx/opendbx-1.5.0.ebuild b/dev-db/opendbx/opendbx-1.5.0.ebuild
index baeadc701af7..cefa1d6899e5 100644
--- a/dev-db/opendbx/opendbx-1.5.0.ebuild
+++ b/dev-db/opendbx/opendbx-1.5.0.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/dev-db/opendbx/opendbx-1.5.0.ebuild,v 1.5 2014/12/28 15:06:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.5.0.ebuild,v 1.6 2015/03/15 18:03:52 ulm Exp $
 
 EAPI="5"
 
@@ -16,7 +16,8 @@ SRC_URI="http://www.linuxnetworks.de/opendbx/download/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x64-solaris"
-IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
+IUSE="firebird +mysql oracle postgres sqlite sqlite3"
+RESTRICT="firebird? ( bindist )"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
@@ -26,8 +27,6 @@ DEPEND="mysql? ( virtual/mysql )
 	firebird? ( dev-db/firebird )"
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="bindist? ( !firebird )"
-
 S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
@@ -50,7 +49,7 @@ pkg_setup() {
 src_configure() {
 	local backends=""
 
-	use !bindist && use firebird && backends="${backends} firebird"
+	use firebird && backends="${backends} firebird"
 	use mysql && backends="${backends} mysql"
 	use oracle && backends="${backends} oracle"
 	use postgres && backends="${backends} pgsql"