fixing dev-util/glade for bug #172106

Package-Manager: portage-2.1.3_rc4

4 files changed, 24 insertions, 20 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 4635a45682a4..5e31a948ed58 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.71 2007/06/01 16:51:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.72 2007/06/24 09:15:27 eva Exp $
+
+  24 Jun 2007; Gilles Dartiguelongue <eva@gentoo.org> glade-2.6.8.ebuild,
+  glade-2.12.1.ebuild:
+  Preparing for lib{gda,gnomedb} 3.0, fixing dependencies (bug #172106)
 
   01 Jun 2007; nixnut <nixnut@gentoo.org> glade-3.2.0.ebuild:
   Stable on ppc wrt bug 180132
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index faf17a69ddc5..1596c1b54fd0 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -8,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 1055 RMD160 13f6348458f055bd50856ec2b1b977a1ff2e02f5 SHA1 309c86c2df5f3254d8e9d0697a2aa45ee673d278 SHA256 73bc008d99f5cb903f0ed5ea8bfa7a02ef13c6c9c5ff840904cd54049eaf478d
-MD5 78c747c88f59a65ecaceb50787a0c9fb glade-2.12.1.ebuild 1055
-RMD160 13f6348458f055bd50856ec2b1b977a1ff2e02f5 glade-2.12.1.ebuild 1055
-SHA256 73bc008d99f5cb903f0ed5ea8bfa7a02ef13c6c9c5ff840904cd54049eaf478d glade-2.12.1.ebuild 1055
-EBUILD glade-2.6.8.ebuild 1224 RMD160 3dd95ef2532ddb82f0d04eadaafe71399c23bf98 SHA1 2597fb5b9a76266e2ded46420caddf47716433c0 SHA256 e34fcad63cab149881139f7fcd8c5394c663677228f83cfcc0b94f27593e381f
-MD5 a39f59354bb76f42b0ab1e1278c91c7f glade-2.6.8.ebuild 1224
-RMD160 3dd95ef2532ddb82f0d04eadaafe71399c23bf98 glade-2.6.8.ebuild 1224
-SHA256 e34fcad63cab149881139f7fcd8c5394c663677228f83cfcc0b94f27593e381f glade-2.6.8.ebuild 1224
+EBUILD glade-2.12.1.ebuild 1047 RMD160 b98d77a838eafacdb634194ef2da6b08f8ad6d01 SHA1 2e682404f370d383a321a836eb86d5820d9e9162 SHA256 c0a5555171d0f65e02e0abf7ffac3a9e97eb860ec0c7e9066e2bde0880eff951
+MD5 7a70944c5bcd8f4170ed2fa71ce9d6d7 glade-2.12.1.ebuild 1047
+RMD160 b98d77a838eafacdb634194ef2da6b08f8ad6d01 glade-2.12.1.ebuild 1047
+SHA256 c0a5555171d0f65e02e0abf7ffac3a9e97eb860ec0c7e9066e2bde0880eff951 glade-2.12.1.ebuild 1047
+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-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
@@ -32,10 +32,10 @@ EBUILD glade-3.2.2.ebuild 1165 RMD160 2256d602517d27ffdc27398067ce0a53d05cdc45 S
 MD5 01b8e4d694afa39828867527083c9760 glade-3.2.2.ebuild 1165
 RMD160 2256d602517d27ffdc27398067ce0a53d05cdc45 glade-3.2.2.ebuild 1165
 SHA256 5381fe57a919af29646d4b0f5766053b55dd8737dd9c1fd5bae7adc7be0aaae2 glade-3.2.2.ebuild 1165
-MISC ChangeLog 8564 RMD160 2ac49a5d9f52a12b0d95af320a4ff5182cd15dc4 SHA1 2d69732f7d99544938cccb4034e93d6c57ce2ea7 SHA256 8d26e052357c51132b5a1dcdf9b0c64b3a7b43ff15a2c7cf9edfd8afdf694811
-MD5 a81dabdc3d6a8e5c3123d4a0d7788181 ChangeLog 8564
-RMD160 2ac49a5d9f52a12b0d95af320a4ff5182cd15dc4 ChangeLog 8564
-SHA256 8d26e052357c51132b5a1dcdf9b0c64b3a7b43ff15a2c7cf9edfd8afdf694811 ChangeLog 8564
+MISC ChangeLog 8731 RMD160 8186e60260db365a3fadfb9a8efc986a98fed65e SHA1 7d768d87f0b0080996d79c97043b60a3b3511943 SHA256 0f6798c51e96aa2ccc921da882c6fe9be1e9b95fca4b24137f92021c36802ad6
+MD5 82954b8cedd96891efceedb13d262b83 ChangeLog 8731
+RMD160 8186e60260db365a3fadfb9a8efc986a98fed65e ChangeLog 8731
+SHA256 0f6798c51e96aa2ccc921da882c6fe9be1e9b95fca4b24137f92021c36802ad6 ChangeLog 8731
 MISC metadata.xml 221 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 SHA1 b78c278ada4bb68032eb139b0377fafbe1a23ca4 SHA256 3fc3c4c8d38e16d4437c4e745fbee3143d7bbbc45e134a9fe32ecbac4bbba2ac
 MD5 4f77f65f8a5bbf34fa7b14459034c51e metadata.xml 221
 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 metadata.xml 221
diff --git a/dev-util/glade/glade-2.12.1.ebuild b/dev-util/glade/glade-2.12.1.ebuild
index ad6ef7ac8108..3fe55ac4511a 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.7 2007/03/12 18:55:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.12.1.ebuild,v 1.8 2007/06/24 09:15:27 eva Exp $
 
 inherit gnome2
 
@@ -21,8 +21,8 @@ RDEPEND=">=dev-libs/libxml2-2.4.1
 		>=gnome-base/libbonoboui-2
 		accessibility? ( gnome-extra/libgail-gnome ) )"
 #	gnomedb? (
-#		>=gnome-extra/libgnomedb-1.3
-#		>=gnome-extra/libgda-1.3 )"
+#		=gnome-extra/libgnomedb-1*
+#		=gnome-extra/libgda-1* )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
diff --git a/dev-util/glade/glade-2.6.8.ebuild b/dev-util/glade/glade-2.6.8.ebuild
index 80da571afcf1..9bf1f35dbc3f 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-2005 Gentoo Foundation
+# 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.10 2005/08/23 16:48:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.8.ebuild,v 1.11 2007/06/24 09:15:27 eva Exp $
 
 inherit eutils gnome2
 
@@ -17,8 +17,8 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	gnome? ( >=gnome-base/libgnomeui-2.6.0
 		>=gnome-base/libgnomecanvas-2.0.0
 		>=gnome-base/libbonoboui-2.0.0 )
-	gnomedb? ( >=gnome-extra/libgnomedb-0.90.3
-			>=gnome-extra/libgda-0.90.0 )"
+	gnomedb? ( =gnome-extra/libgnomedb-1*
+			=gnome-extra/libgda-1* )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext