change gnomedb USE to libgda

Package-Manager: portage-2.1.3.9

4 files changed, 33 insertions, 42 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 600060c4e915..decc89b678f1 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/glade
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.78 2007/08/11 15:05:47 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.79 2007/09/16 22:15:39 eva Exp $
+
+  16 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org> glade-2.6.8.ebuild,
+  glade-2.12.1.ebuild:
+  changed gnomedb USE to libgda
 
   11 Aug 2007; Andrej Kacian <ticho@gentoo.org> glade-3.2.2.ebuild:
   Stable on x86, bug #185823.
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 70594287a6cd..c28ec554a275 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX glade-2.0.0-scrollkeeper.patch 490 RMD160 bd8f2712cd87818f1d53a5249cdf9c0e3513d80b SHA1 f3807b986d684c11c4cf4e5b4643293201cfe280 SHA256 38510704625873ddc0e03bad492c4514f00122053f8d0543bcf9d63574b04482
 MD5 5a2537a4609ee178e84e4e7472ee93a6 files/glade-2.0.0-scrollkeeper.patch 490
 RMD160 bd8f2712cd87818f1d53a5249cdf9c0e3513d80b files/glade-2.0.0-scrollkeeper.patch 490
@@ -11,14 +8,14 @@ DIST glade3-3.1.5.tar.bz2 1072770 RMD160 2b993d692b29829f9c7a17cd9f3316d03e8b7fb
 DIST glade3-3.2.0.tar.bz2 1344693 RMD160 85013a1b7daa570ac934b7d0fc985cea35e00a13 SHA1 d73bff5c8d791e0d60f709e56598e143850b0035 SHA256 4ca06cc1ab8670858b0295fc126aa39f059a0b90f0c399022770ee0b522eb35e
 DIST glade3-3.2.1.tar.bz2 1371624 RMD160 7b19718ec8fb406e5ad1d1b042867c87f076be90 SHA1 e5404adba6540fbe9b0bd976e81281ed1d972609 SHA256 496e8ee6eda3a932669c3009360097bd4ab45ac5449327743946ff49111b91ca
 DIST glade3-3.2.2.tar.bz2 1429808 RMD160 6953c52ab921e6d0727e428796095fe9b84a0873 SHA1 d32d38dbb475d6c35c564c4e5dcb3df3ce075916 SHA256 28f97d7c41c6e1e1fd91e1e660e49aa0a7dee7839ea92f5cb661e571685b19bd
-EBUILD glade-2.12.1.ebuild 1051 RMD160 8e8005204c969f8bdafee11acdac64e338a7d1ba SHA1 b8451d70b85ac2d43385be58aa24fa0dd77247d7 SHA256 2e00cc941ecf531e30002c3285b6c6c9d3f88f3c7f46370cb55ea236a959d415
-MD5 62a52d2736e5eb0df8df489d884e819d glade-2.12.1.ebuild 1051
-RMD160 8e8005204c969f8bdafee11acdac64e338a7d1ba glade-2.12.1.ebuild 1051
-SHA256 2e00cc941ecf531e30002c3285b6c6c9d3f88f3c7f46370cb55ea236a959d415 glade-2.12.1.ebuild 1051
-EBUILD glade-2.6.8.ebuild 1209 RMD160 bd16027b6dcdbc407829729d3b2d6c8b3b10c56c SHA1 2338606fa152fa7dc0c4a042ff38e20c4bad31aa SHA256 6acc927b179d5c59bfb5f186cda419eda53a54b1f0109f876ca31bad170027b7
-MD5 2d04b73a3ae631b5b947ffa62535d702 glade-2.6.8.ebuild 1209
-RMD160 bd16027b6dcdbc407829729d3b2d6c8b3b10c56c glade-2.6.8.ebuild 1209
-SHA256 6acc927b179d5c59bfb5f186cda419eda53a54b1f0109f876ca31bad170027b7 glade-2.6.8.ebuild 1209
+EBUILD glade-2.12.1.ebuild 996 RMD160 8bcb8181f3b781e594ef1ef499b56e1a4cf926ac SHA1 ce6fd243dff22855a7d51b2da9cb369777c7a136 SHA256 35090e9a7cabb1d11eddb3d5f659b1325859209e59e772166d63f8f6146b6a11
+MD5 de1996a2804184872e95cbb409ccb489 glade-2.12.1.ebuild 996
+RMD160 8bcb8181f3b781e594ef1ef499b56e1a4cf926ac glade-2.12.1.ebuild 996
+SHA256 35090e9a7cabb1d11eddb3d5f659b1325859209e59e772166d63f8f6146b6a11 glade-2.12.1.ebuild 996
+EBUILD glade-2.6.8.ebuild 1214 RMD160 cf21ee282e78c16ecef2d27d65150c2dbef2f136 SHA1 a628b496b27c12eacc05e41de3019387ed91387e SHA256 412181816e31876cd786369737c8fdcca8308475419d99add5315e426a5a730b
+MD5 b4f1e213914af1ecdcfd8c83c2560f42 glade-2.6.8.ebuild 1214
+RMD160 cf21ee282e78c16ecef2d27d65150c2dbef2f136 glade-2.6.8.ebuild 1214
+SHA256 412181816e31876cd786369737c8fdcca8308475419d99add5315e426a5a730b glade-2.6.8.ebuild 1214
 EBUILD glade-3.1.5.ebuild 1103 RMD160 211e9759076ab32f2b2eb3d84027abb82857b7b2 SHA1 fbdc2b697520575eaee3cfe6a80e5e761c1d1250 SHA256 aee70d8eec8413c40867fed9468e535fbaf0a4d338770fa310eb23a4c825799f
 MD5 6ff9a9b9c0b861f10ebd4b35c8ea8b0f glade-3.1.5.ebuild 1103
 RMD160 211e9759076ab32f2b2eb3d84027abb82857b7b2 glade-3.1.5.ebuild 1103
@@ -35,10 +32,10 @@ EBUILD glade-3.2.2.ebuild 1157 RMD160 12af882f9ff91cfd4e7a7ec1b3b4aba28479ee62 S
 MD5 518234865592348b22f803719266c7d1 glade-3.2.2.ebuild 1157
 RMD160 12af882f9ff91cfd4e7a7ec1b3b4aba28479ee62 glade-3.2.2.ebuild 1157
 SHA256 42adcd775a721ad7175705da8bdfb7813f44217da04a12dec1be609861c81aaf glade-3.2.2.ebuild 1157
-MISC ChangeLog 9352 RMD160 58441ab29b33cf0c53ff653968f7f9874766ea80 SHA1 c21bce00b1e66a154203c3650d1202eaab5f15c9 SHA256 79f910930a3d7346ee2359b54e50e21b4f0df5f961edef48451d9597a2133b6b
-MD5 871e2e774b5bd994038ac525300f3fe4 ChangeLog 9352
-RMD160 58441ab29b33cf0c53ff653968f7f9874766ea80 ChangeLog 9352
-SHA256 79f910930a3d7346ee2359b54e50e21b4f0df5f961edef48451d9597a2133b6b ChangeLog 9352
+MISC ChangeLog 9480 RMD160 b5c9106c773620f0a3488819c472b9e554d82762 SHA1 cc564310a36788c42ce109dc61436c5dfb46070d SHA256 e68f4c9c0ea9e93111f8646f865212613129f2ee1beda7b4a5bc251826d87be1
+MD5 f8c4ea21f78870c58a436b67005402c2 ChangeLog 9480
+RMD160 b5c9106c773620f0a3488819c472b9e554d82762 ChangeLog 9480
+SHA256 e68f4c9c0ea9e93111f8646f865212613129f2ee1beda7b4a5bc251826d87be1 ChangeLog 9480
 MISC metadata.xml 221 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 SHA1 b78c278ada4bb68032eb139b0377fafbe1a23ca4 SHA256 3fc3c4c8d38e16d4437c4e745fbee3143d7bbbc45e134a9fe32ecbac4bbba2ac
 MD5 4f77f65f8a5bbf34fa7b14459034c51e metadata.xml 221
 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 metadata.xml 221
@@ -61,10 +58,3 @@ SHA256 1cd7f5f42f5555d9553819319f62baf2c51bb4dc79cd3782a11a82374660cf9a files/di
 MD5 2fd1c975808cc5646b3649b2699c2cbc files/digest-glade-3.2.2 244
 RMD160 36aff732ea8383eeca0700a14d64d27235c69b71 files/digest-glade-3.2.2 244
 SHA256 89e55be50f62a2566c0e59c18b1ff2536ad57abfd06c9464eb8994b4b85e974e files/digest-glade-3.2.2 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGvdBRQlM6RnzZP+IRAjUQAKC6M2BuchErGRFuGvMnHrd+fcvXBgCguLz5
-p4Eridb03qFiiufoDvsdMx0=
-=EeIc
------END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-2.12.1.ebuild b/dev-util/glade/glade-2.12.1.ebuild
index 01615cc9283a..fc2d50edb017 100644
--- a/dev-util/glade/glade-2.12.1.ebuild
+++ b/dev-util/glade/glade-2.12.1.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-util/glade/glade-2.12.1.ebuild,v 1.9 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.12.1.ebuild,v 1.10 2007/09/16 22:15:39 eva Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="accessibility gnome"
-# gnomedb
+# libgda
 
 RDEPEND=">=dev-libs/libxml2-2.4.1
 	>=x11-libs/gtk+-2.8
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/libxml2-2.4.1
 		>=gnome-base/libgnomecanvas-2
 		>=gnome-base/libbonoboui-2
 		accessibility? ( gnome-extra/libgail-gnome ) )"
-#	gnomedb? (
+#	libgda? (
 #		=gnome-extra/libgnomedb-1*
 #		=gnome-extra/libgda-1* )"
 
@@ -35,10 +35,5 @@ USE_DESTDIR="1"
 
 pkg_setup() {
 	G2CONF="$(use_enable gnome)"
-	#	$(use_enable gnomedb gnome-db)"
-}
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
+	#	$(use_enable libgda gnome-db)"
 }
diff --git a/dev-util/glade/glade-2.6.8.ebuild b/dev-util/glade/glade-2.6.8.ebuild
index 9bf1f35dbc3f..5ef6ace96b10 100644
--- a/dev-util/glade/glade-2.6.8.ebuild
+++ b/dev-util/glade/glade-2.6.8.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-util/glade/glade-2.6.8.ebuild,v 1.11 2007/06/24 09:15:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.8.ebuild,v 1.12 2007/09/16 22:15:39 eva Exp $
 
 inherit eutils gnome2
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://glade.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="gnome gnomedb"
+IUSE="gnome libgda"
 
 RDEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/libxml2-2.4.1
 	gnome? ( >=gnome-base/libgnomeui-2.6.0
 		>=gnome-base/libgnomecanvas-2.0.0
 		>=gnome-base/libbonoboui-2.0.0 )
-	gnomedb? ( =gnome-extra/libgnomedb-1*
+	libgda? ( =gnome-extra/libgnomedb-1*
 			=gnome-extra/libgda-1* )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -25,18 +25,20 @@ DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.10
 	>=dev-util/intltool-0.30"
 
+DOCS="AUTHORS FAQ INSTALL NEWS README TODO"
+USE_DESTDIR="1"
+
 src_unpack() {
-	unpack ${A}
-	# this patch fixes potential potential issues
+	gnome2_src_unpack
+
+	# this patch fixes potential issues
 	# with scrollkeeper. speeds up unnecessary scroll generation
-	cd ${S}
 	epatch ${FILESDIR}/${PN}-2.0.0-scrollkeeper.patch
 }
 
-G2CONF="${G2CONF} `use_enable gnome` `use_enable gnomedb gnome-db`"
-
-DOCS="AUTHORS FAQ INSTALL NEWS README TODO"
-USE_DESTDIR="1"
+pkg_config() {
+	G2CONF="${G2CONF} $(use_enable gnome) $(use_enable libgda gnome-db)"
+}
 
 src_install() {