Remove firebird support from 1.2.4; bug #183465

Package-Manager: portage-2.1.3.18

3 files changed, 26 insertions, 13 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 99de905b7875..21fdf65372d2 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.113 2007/11/06 19:18:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.114 2007/11/07 17:29:19 dang Exp $
+
+  07 Nov 2007; Daniel Gryniewicz <dang@gentoo.org> libgda-1.2.4.ebuild:
+  Remove firebird support from 1.2.4; bug #183465
 
   06 Nov 2007; Markus Rothe <corsair@gentoo.org> libgda-1.2.4.ebuild:
   Stable on ppc64; bug #197799
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index fa34116ee38d..1ff7d77da3b9 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgda-1.2.3-freetds_api_fixes.patch 13517 RMD160 3639299b1f4ddfc12ada361b036e1ae887f0206e SHA1 a9e2d6fb3c40876519f43c5391c890e275983afe SHA256 a3c6f727e66f244586184c5433214302e8aab5393d3968657c08a4b93840bf8f
 MD5 af02e6861d4aff682d79857ee8c5df2e files/libgda-1.2.3-freetds_api_fixes.patch 13517
 RMD160 3639299b1f4ddfc12ada361b036e1ae887f0206e files/libgda-1.2.3-freetds_api_fixes.patch 13517
@@ -17,18 +20,18 @@ EBUILD libgda-1.2.3.ebuild 2104 RMD160 015e321a40a85f113e369240a7a62e624a168768
 MD5 99a3813827ad37adce5ba57a5d42af82 libgda-1.2.3.ebuild 2104
 RMD160 015e321a40a85f113e369240a7a62e624a168768 libgda-1.2.3.ebuild 2104
 SHA256 a56fb2210013911ed407108db07eaaa761454f958dddfbd69498892d6db198bd libgda-1.2.3.ebuild 2104
-EBUILD libgda-1.2.4.ebuild 2271 RMD160 cf0f0867b6a1581a3c610ff545ef34414a241b7d SHA1 c66c2a81251655e14d9253b646634d0a8be4d222 SHA256 2100a8344a751ddf50987b161bd9ff8abba5ef41102d3de1b919a1fe9833191a
-MD5 a6714193d1c2aceae91a101e3c7e3fae libgda-1.2.4.ebuild 2271
-RMD160 cf0f0867b6a1581a3c610ff545ef34414a241b7d libgda-1.2.4.ebuild 2271
-SHA256 2100a8344a751ddf50987b161bd9ff8abba5ef41102d3de1b919a1fe9833191a libgda-1.2.4.ebuild 2271
+EBUILD libgda-1.2.4.ebuild 2289 RMD160 b2730da6dcf2686c3420a99ad1a6b721db339023 SHA1 d43b5e4144aeba9eb34d822ff32e0956bc2a2aed SHA256 a43bb813fdcc4bca00bf1e386ca9b3311b80e094fd6a542f8fc5c36061fbccd0
+MD5 87c7d0f21b966328a76bacdf3e30a304 libgda-1.2.4.ebuild 2289
+RMD160 b2730da6dcf2686c3420a99ad1a6b721db339023 libgda-1.2.4.ebuild 2289
+SHA256 a43bb813fdcc4bca00bf1e386ca9b3311b80e094fd6a542f8fc5c36061fbccd0 libgda-1.2.4.ebuild 2289
 EBUILD libgda-3.0.1.ebuild 1855 RMD160 e13b12ede8921945467ecf6cc6d033269783212e SHA1 af07e0dd18e46d9cd7ae5d8c3994c871de245097 SHA256 a3d6f65f9102e99239d61680657707d63f89be43d04714f8e87ef8a53c5e6ff5
 MD5 32eb91b294d9c0f004f3854b6f2a368b libgda-3.0.1.ebuild 1855
 RMD160 e13b12ede8921945467ecf6cc6d033269783212e libgda-3.0.1.ebuild 1855
 SHA256 a3d6f65f9102e99239d61680657707d63f89be43d04714f8e87ef8a53c5e6ff5 libgda-3.0.1.ebuild 1855
-MISC ChangeLog 17251 RMD160 fb3a55e9dc095471e205857cb0f0318760fcb8df SHA1 2fbd0bf43c86deb074a19540f431ce89766e766d SHA256 86811bd40cd2f40289119cab163c5dbc96c6e90a2a7cb10bd0a3d012a969b163
-MD5 5138fdbee28944a6b43258e82d2fd722 ChangeLog 17251
-RMD160 fb3a55e9dc095471e205857cb0f0318760fcb8df ChangeLog 17251
-SHA256 86811bd40cd2f40289119cab163c5dbc96c6e90a2a7cb10bd0a3d012a969b163 ChangeLog 17251
+MISC ChangeLog 17371 RMD160 b37057199937ca91fab571307efb0044eb4733e5 SHA1 9f489d868a1b4700abf38508b3a19a22543af601 SHA256 1566bfcec3bc152cecf65c8cb9f884dedaf34f090c61f419cb9a18dcb147e2fe
+MD5 dacedeb322749ad73d3c69f37df42317 ChangeLog 17371
+RMD160 b37057199937ca91fab571307efb0044eb4733e5 ChangeLog 17371
+SHA256 1566bfcec3bc152cecf65c8cb9f884dedaf34f090c61f419cb9a18dcb147e2fe ChangeLog 17371
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -42,3 +45,10 @@ SHA256 f91c0bcfc4271b2751f510cc84fc441e85c410a0f6fd801eec2b14880b1a0cc2 files/di
 MD5 9c1786a60aeee6e5ce8115744596b708 files/digest-libgda-3.0.1 244
 RMD160 1894f9b8d5df66f46403104b083133540fbeafd6 files/digest-libgda-3.0.1 244
 SHA256 067e35623b692f5e4edf0e6a8a8966aa15a04ab4769b0a792d1d2c087ce651c9 files/digest-libgda-3.0.1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHMfZBomPajV0RnrERAk/uAJ9c26Ft8HCoRCYfjGdrIjj+Q26fFQCeM2FM
+d9ohaSseHG8g3pQaVfMuAL4=
+=VVQy
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-1.2.4.ebuild b/gnome-extra/libgda/libgda-1.2.4.ebuild
index eb6d6c19eedd..f5aabf60a2ab 100644
--- a/gnome-extra/libgda/libgda-1.2.4.ebuild
+++ b/gnome-extra/libgda/libgda-1.2.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/gnome-extra/libgda/libgda-1.2.4.ebuild,v 1.8 2007/11/06 19:18:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.2.4.ebuild,v 1.9 2007/11/07 17:29:19 dang Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -11,7 +11,7 @@ DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2 LGPL-2"
 
-IUSE="berkdb doc firebird freetds ldap mdb mysql oci8 odbc postgres sqlite3 xbase"
+IUSE="berkdb doc freetds ldap mdb mysql oci8 odbc postgres sqlite3 xbase"
 SLOT="1"
 KEYWORDS="alpha ~amd64 hppa ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
 
@@ -26,7 +26,6 @@ RDEPEND=">=dev-libs/glib-2
 	mysql? ( virtual/mysql )
 	postgres? ( >=dev-db/libpq-7.2.1 )
 	freetds? ( >=dev-db/freetds-0.62 )
-	x86? ( firebird? ( dev-db/firebird ) )
 	xbase? ( dev-db/xbase )
 	sqlite3? ( >=dev-db/sqlite-3 )
 	mdb? ( >=app-office/mdbtools-0.5 )
@@ -45,7 +44,6 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
 	G2CONF="$(use_with berkdb bdb /usr)    \
-		$(use_with firebird firebird /usr) \
 		$(use_with freetds tds /usr)       \
 		$(use_with ldap ldap /usr)         \
 		$(use_with mdb mdb /usr)           \
@@ -60,6 +58,8 @@ pkg_setup() {
 
 	# not in portage
 	G2CONF="${G2CONF} --without-msql --without-sybase --without-ibmdb2"
+	# Broken with firebird in portage; fixed in 3.x versions bug #183465
+	G2CONF="${G2CONF} --without-firebird"
 }
 
 src_unpack() {