Disable firebird support when bindist USE flag is enabled, bug #200284.

Package-Manager: portage-2.1.3.19

4 files changed, 30 insertions, 26 deletions

diff --git a/dev-db/opendbx/ChangeLog b/dev-db/opendbx/ChangeLog
index b81089402ee6..17bf799fc420 100644
--- a/dev-db/opendbx/ChangeLog
+++ b/dev-db/opendbx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/opendbx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.11 2007/10/04 10:52:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.12 2007/12/05 22:08:49 swegener Exp $
+
+  05 Dec 2007; Sven Wegener <swegener@gentoo.org> opendbx-1.2.3-r1.ebuild,
+  opendbx-1.3.4.ebuild:
+  Disable firebird support when bindist USE flag is enabled, bug #200284.
 
   04 Oct 2007; Sven Wegener <swegener@gentoo.org> -opendbx-1.2.2.ebuild,
   -opendbx-1.2.3.ebuild, -opendbx-1.3.2.ebuild, -opendbx-1.3.3.ebuild:
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 461c6e701ca1..a9b239cf79c9 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST opendbx-1.2.3.tar.gz 480438 RMD160 f6fb1a5a0f44ba02ca735484506dd2497910934d SHA1 68280a24d95310ecfecf299dee4c9c4f77b4de3d SHA256 6fe30b8627e25099c8ed0ffbabf65169a8a8cf8a512d6f1cf6c22e3802de7678
 DIST opendbx-1.3.4.tar.gz 506034 RMD160 aa09f3de9d22a7b75d229e572891aed574e528f1 SHA1 0fd77399d1e218c92ebcf0470af7218b2a8f2230 SHA256 36d75abbc75f81718eb57d170d3e6584f2afc738acefd7b3dbfdb9cbd6c4af47
-EBUILD opendbx-1.2.3-r1.ebuild 1782 RMD160 7b511502ffaba4a79cdc8d1f455054e7547e320c SHA1 a20ab6a1bc2b6190981aa8143a06c6e058187776 SHA256 b107c628f9299493ec921db32e50d35f2be033b2f538d4a75e582004d8dba86c
-MD5 ad927df5c7dfedab1306475f45d02bb9 opendbx-1.2.3-r1.ebuild 1782
-RMD160 7b511502ffaba4a79cdc8d1f455054e7547e320c opendbx-1.2.3-r1.ebuild 1782
-SHA256 b107c628f9299493ec921db32e50d35f2be033b2f538d4a75e582004d8dba86c opendbx-1.2.3-r1.ebuild 1782
-EBUILD opendbx-1.3.4.ebuild 1779 RMD160 b0e666430279a87a97a5ef44a44bfa496d8e122b SHA1 50b6d8f66c691b568f71a2d1e2e0d3eddcd4ba8c SHA256 31507029be80a3505ab1ac23c6d0f669f5b597923451502a85d59b07fd89a032
-MD5 00fee57f13debf2a129a276c81321f94 opendbx-1.3.4.ebuild 1779
-RMD160 b0e666430279a87a97a5ef44a44bfa496d8e122b opendbx-1.3.4.ebuild 1779
-SHA256 31507029be80a3505ab1ac23c6d0f669f5b597923451502a85d59b07fd89a032 opendbx-1.3.4.ebuild 1779
-MISC ChangeLog 1694 RMD160 bdd0cc312680b2a4aaa222a2495f152a71772abd SHA1 a0e5c72337645332456a379db19f7aac8e040404 SHA256 5f06c57732bf51b63bbc34fc10f89f4fd03925510752728e5f2bd78162652660
-MD5 24823253b98bd1549bf12d4d4610257e ChangeLog 1694
-RMD160 bdd0cc312680b2a4aaa222a2495f152a71772abd ChangeLog 1694
-SHA256 5f06c57732bf51b63bbc34fc10f89f4fd03925510752728e5f2bd78162652660 ChangeLog 1694
+EBUILD opendbx-1.2.3-r1.ebuild 1836 RMD160 8242889321a954d4f7a132227e27bc4a01ab4fe4 SHA1 f13dc338262ab22f55f9cbb5b5fc1138ef626137 SHA256 3611af87380df3a8b43686ef9a419219cde60a779074576cdc9cf7330efa3439
+MD5 9f0a42469881eaedeb3487d04a26bdac opendbx-1.2.3-r1.ebuild 1836
+RMD160 8242889321a954d4f7a132227e27bc4a01ab4fe4 opendbx-1.2.3-r1.ebuild 1836
+SHA256 3611af87380df3a8b43686ef9a419219cde60a779074576cdc9cf7330efa3439 opendbx-1.2.3-r1.ebuild 1836
+EBUILD opendbx-1.3.4.ebuild 1833 RMD160 41ecbe651a3ea9787d402831d8638ad8beebc4ba SHA1 fee8b80920bfcdc0722b61cf1171a3b61ba7f16d SHA256 3b3f5f291da1312f01f2f0a8c530a45243a50ab6d4a03cb106ef45348c3dcfb1
+MD5 b3d33edf4e6ce97436add67194f46728 opendbx-1.3.4.ebuild 1833
+RMD160 41ecbe651a3ea9787d402831d8638ad8beebc4ba opendbx-1.3.4.ebuild 1833
+SHA256 3b3f5f291da1312f01f2f0a8c530a45243a50ab6d4a03cb106ef45348c3dcfb1 opendbx-1.3.4.ebuild 1833
+MISC ChangeLog 1868 RMD160 3b46a2776f7d5f38534a43205f840a13b855c075 SHA1 fb7115aa67261735deef4bd3f45653c6e555d377 SHA256 513aa545363c5a9b471d9f82450b3cd4a603d33c3ba3743ce68363f36f0b9961
+MD5 1c18d44195b0acc73f9f4d2b30dd6acb ChangeLog 1868
+RMD160 3b46a2776f7d5f38534a43205f840a13b855c075 ChangeLog 1868
+SHA256 513aa545363c5a9b471d9f82450b3cd4a603d33c3ba3743ce68363f36f0b9961 ChangeLog 1868
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 MD5 59ddc43b17320bfa384ade93c548f569 metadata.xml 270
 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 metadata.xml 270
@@ -28,7 +28,7 @@ SHA256 b16125b1c994ed3e8a3926f675c44bc753211c8016626e53f995fa408ae87dad files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLEEpI1lqEGTUzyQRAko/AJ4pwxIfOXNR37yLw39rav9UYZLcBwCcCuF8
-j0d5kIlZI6uanhCB3pyvGW4=
-=9s7W
+iD8DBQFHVyF6I1lqEGTUzyQRAmmXAJ9DUTs8gXsolPg8+LplRgjN9wyg6gCfZB86
+Z7h0P0Zj6VWhqWthGLB4QZs=
+=KEQF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/opendbx/opendbx-1.2.3-r1.ebuild b/dev-db/opendbx/opendbx-1.2.3-r1.ebuild
index 70496424fd53..c566657aac56 100644
--- a/dev-db/opendbx/opendbx-1.2.3-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.2.3-r1.ebuild,v 1.2 2007/11/03 09:36:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.2.3-r1.ebuild,v 1.3 2007/12/05 22:08:49 swegener Exp $
 
 inherit flag-o-matic
 
@@ -11,18 +11,18 @@ SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="firebird mysql oracle postgres sqlite sqlite3"
+IUSE="bindist firebird mysql oracle postgres sqlite sqlite3"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	sqlite? ( <dev-db/sqlite-3 )
 	sqlite3? ( =dev-db/sqlite-3* )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	firebird? ( dev-db/firebird )"
+	!bindist? ( firebird? ( dev-db/firebird ) )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
+	if ! ( use !bindist && use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
 	then
 		die "Need at least one of firebird, mysql, oracle, postgres, sqlite and sqlite3 activated!"
 	fi
@@ -40,7 +40,7 @@ pkg_setup() {
 src_compile() {
 	local backends=""
 
-	use firebird && backends="${backends} firebird"
+	use !bindist && 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.3.4.ebuild b/dev-db/opendbx/opendbx-1.3.4.ebuild
index f30dc190aea3..f18f4824d65c 100644
--- a/dev-db/opendbx/opendbx-1.3.4.ebuild
+++ b/dev-db/opendbx/opendbx-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.3.4.ebuild,v 1.2 2007/11/03 09:36:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.3.4.ebuild,v 1.3 2007/12/05 22:08:49 swegener Exp $
 
 inherit flag-o-matic
 
@@ -11,18 +11,18 @@ SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="firebird mysql oracle postgres sqlite sqlite3"
+IUSE="bindist firebird mysql oracle postgres sqlite sqlite3"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	sqlite? ( <dev-db/sqlite-3 )
 	sqlite3? ( =dev-db/sqlite-3* )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	firebird? ( dev-db/firebird )"
+	!bindist? ( firebird? ( dev-db/firebird ) )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
+	if ! ( use !bindist && use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
 	then
 		die "Need at least one of firebird, mysql, oracle, postgres, sqlite and sqlite3 activated!"
 	fi
@@ -40,7 +40,7 @@ pkg_setup() {
 src_compile() {
 	local backends=""
 
-	use firebird && backends="${backends} firebird"
+	use !bindist && use firebird && backends="${backends} firebird"
 	use mysql && backends="${backends} mysql"
 	use oracle && backends="${backends} oracle"
 	use postgres && backends="${backends} pgsql"