Make the gtkmm and glibmm a || dependency. Also bump the gtkhtml dependency.

Package-Manager: portage-2.1.3.9

3 files changed, 27 insertions, 17 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index da8935e54586..247f9fdcf600 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.17 2007/09/28 13:40:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.18 2007/09/28 19:24:20 swegener Exp $
+
+  28 Sep 2007; Sven Wegener <swegener@gentoo.org>
+  mysql-gui-tools-5.0_p12.ebuild:
+  Make the gtkmm and glibmm a || dependency. Also bump the gtkhtml dependency.
 
   28 Sep 2007; Sven Wegener <swegener@gentoo.org>
   mysql-gui-tools-5.0_p12.ebuild:
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index 154be0a11127..1e1def8b70f9 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -10,14 +10,14 @@ MD5 ecde06bbc6210d4fd339eed19b03e516 files/mysql-gui-tools-5.0_p8-lua-modules.pa
 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 files/mysql-gui-tools-5.0_p8-lua-modules.patch 672
 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28 files/mysql-gui-tools-5.0_p8-lua-modules.patch 672
 DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
-EBUILD mysql-gui-tools-5.0_p12.ebuild 2919 RMD160 b6e7b4901a5fae5cd42f69e1059268ef873aeb01 SHA1 1b264fa317338731b5252332e826ac7011f59795 SHA256 b7a877721d0241f3b5965c6bac35e0e941ae18890987a5674d520e6c0de6c933
-MD5 42bf5a519ab4b1bcf2ddead8336e8328 mysql-gui-tools-5.0_p12.ebuild 2919
-RMD160 b6e7b4901a5fae5cd42f69e1059268ef873aeb01 mysql-gui-tools-5.0_p12.ebuild 2919
-SHA256 b7a877721d0241f3b5965c6bac35e0e941ae18890987a5674d520e6c0de6c933 mysql-gui-tools-5.0_p12.ebuild 2919
-MISC ChangeLog 3330 RMD160 f3767307092d923f8120da4904d96cbaccf02658 SHA1 00c7244bce171dc6307823ce824a9df7ae4f9573 SHA256 a41c50d7461b26136cf50f9ec2cac4807ea2e04358ce92a0b7aefbb37ab2e31e
-MD5 ae4ddc2abe9a3d7c6018edc7408eedda ChangeLog 3330
-RMD160 f3767307092d923f8120da4904d96cbaccf02658 ChangeLog 3330
-SHA256 a41c50d7461b26136cf50f9ec2cac4807ea2e04358ce92a0b7aefbb37ab2e31e ChangeLog 3330
+EBUILD mysql-gui-tools-5.0_p12.ebuild 2987 RMD160 2ffd60ab956bd95acf08c0b172e261ab1398415f SHA1 57b36b1afc9e226763bc5d4c2514c4747d267a74 SHA256 bbd6a2a735586f71268d15a224a34ae8eda882c01a26c482a0e54e02813ca548
+MD5 00e853a462c3c3c2e28c1af8ae865bd4 mysql-gui-tools-5.0_p12.ebuild 2987
+RMD160 2ffd60ab956bd95acf08c0b172e261ab1398415f mysql-gui-tools-5.0_p12.ebuild 2987
+SHA256 bbd6a2a735586f71268d15a224a34ae8eda882c01a26c482a0e54e02813ca548 mysql-gui-tools-5.0_p12.ebuild 2987
+MISC ChangeLog 3494 RMD160 aba5dde9168cebfa4b640f838a034d817120953c SHA1 7b8840fbf4a60a9299b541e226c767b512269370 SHA256 989aee54088ddd239ca7438a8e7a3598f777ec85d51cc8747105d39af58a8893
+MD5 ba12996bbb312f3a70cebba1ee7dbf9f ChangeLog 3494
+RMD160 aba5dde9168cebfa4b640f838a034d817120953c ChangeLog 3494
+SHA256 989aee54088ddd239ca7438a8e7a3598f777ec85d51cc8747105d39af58a8893 ChangeLog 3494
 MISC metadata.xml 272 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced SHA1 7701e9d8d21b6250ae0664d90bebabaa231e908e SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4
 MD5 a7f4f1fdfeaf295779bf8da23d2732b7 metadata.xml 272
 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced metadata.xml 272
@@ -28,7 +28,7 @@ SHA256 4093b02c4baef9418457d0d93d18e506bbf873f6975f35c67fb686402edb5d58 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG/QROI1lqEGTUzyQRAk+JAKC1WsXYmimenCiKmlKhW3UtTImIlQCeK5tK
-gMWV74MbZ/o08i/456ecwG4=
-=XgK2
+iD8DBQFG/VTsI1lqEGTUzyQRAr2cAKDLnRN+cUdS5wi+1895c7qBZpgKOACgp7TM
+Gro59S5ldVwUviUFtRAR4Ss=
+=fCjc
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild
index 6bf4aa73cb5e..902673ef711d 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.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/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.3 2007/09/28 13:40:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.4 2007/09/28 19:24:20 swegener Exp $
 
 GCONF_DEBUG="no"
 
@@ -23,15 +23,21 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=dev-libs/libsigc++-2.0
 	>=dev-libs/libpcre-4.4
 	>=dev-libs/libxml2-2.6.2
-	=dev-cpp/glibmm-2.14*
-	=dev-cpp/gtkmm-2.12*
+	|| (
+		=dev-cpp/glibmm-2.14*
+		=dev-cpp/glibmm-2.12*
+	)
+	|| (
+		=dev-cpp/gtkmm-2.12*
+		=dev-cpp/gtkmm-2.10*
+	)
 	>=virtual/mysql-5.0
 	workbench? (
 		=dev-lang/lua-5.0*
 		virtual/opengl
 	)
 	query-browser? (
-		=gnome-extra/gtkhtml-3.12*
+		=gnome-extra/gtkhtml-3.14*
 	)"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15
@@ -88,7 +94,7 @@ src_compile() {
 	then
 		cd "${S}"/mysql-query-browser
 		use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
-		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.8
+		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
 	fi
 
 	if use workbench