summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/mysql-gui-tools/ChangeLog7
-rw-r--r--dev-db/mysql-gui-tools/Manifest30
-rw-r--r--dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild6
-rw-r--r--dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild6
4 files changed, 29 insertions, 20 deletions
diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 409dd29c69e9..f13c8f58b010 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,11 @@
# 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.14 2007/05/15 21:33:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.15 2007/06/17 12:57:28 swegener Exp $
+
+ 12 Jun 2007; Sven Wegener <swegener@gentoo.org>
+ mysql-gui-tools-5.0_p11.ebuild, mysql-gui-tools-5.0_p12.ebuild:
+ Make the gtkhtml dependency conditional on the query-browser USE flag.
+ Thanks to Pietro Franchi in bug #181285.
*mysql-gui-tools-5.0_p12 (15 May 2007)
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index 976a2fa42b14..feb63c7e4a26 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -11,18 +11,18 @@ RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 files/mysql-gui-tools-5.0_p8-lua
SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28 files/mysql-gui-tools-5.0_p8-lua-modules.patch 672
DIST mysql-gui-tools-5.0r11.tar.gz 24808001 RMD160 b577bb85094d637bb7124d0977a76362234bc8d4 SHA1 0e42f227fd30699c1edb56b0e06b86f96ace9336 SHA256 ee8a8d44f3e6888450a4083c1891f626fa1b8fe020f18ba1a31f86da52e8341c
DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
-EBUILD mysql-gui-tools-5.0_p11.ebuild 2897 RMD160 718900f28eb517e2ca2fe9e323964498ee5074d2 SHA1 47f4a0bb108827d392300612c8f309c27cf1f981 SHA256 5428c7f71137cc94ac6057a3209d17b02260ef5b2d4e8de0f92df3e1dae6e723
-MD5 08c623f6608aed929559dbe81374f6cd mysql-gui-tools-5.0_p11.ebuild 2897
-RMD160 718900f28eb517e2ca2fe9e323964498ee5074d2 mysql-gui-tools-5.0_p11.ebuild 2897
-SHA256 5428c7f71137cc94ac6057a3209d17b02260ef5b2d4e8de0f92df3e1dae6e723 mysql-gui-tools-5.0_p11.ebuild 2897
-EBUILD mysql-gui-tools-5.0_p12.ebuild 2897 RMD160 4911ffe4f86febc8a2dd3087077c42b66bb4ae24 SHA1 3e6901ff4c328be08c799b861b3502a01eeb265e SHA256 60f4948ef83b058500e2b1e31dc2d8452719773658b9db5a379dd4f349732e07
-MD5 fe0e6592a8ebd4663dbcec4b750806e2 mysql-gui-tools-5.0_p12.ebuild 2897
-RMD160 4911ffe4f86febc8a2dd3087077c42b66bb4ae24 mysql-gui-tools-5.0_p12.ebuild 2897
-SHA256 60f4948ef83b058500e2b1e31dc2d8452719773658b9db5a379dd4f349732e07 mysql-gui-tools-5.0_p12.ebuild 2897
-MISC ChangeLog 2875 RMD160 1c4f68f846ad8f643c798238ed45de3f682f6c83 SHA1 2a2a495674fbe3f51057ba07d5de6edc49a5b0cc SHA256 e189d6c730ffe1369640a5c1ba5adbb3a736dc7e0fdc26b0e3dc929052d55fcf
-MD5 3b0d6ff3d8d7fbd8f2724326a291d935 ChangeLog 2875
-RMD160 1c4f68f846ad8f643c798238ed45de3f682f6c83 ChangeLog 2875
-SHA256 e189d6c730ffe1369640a5c1ba5adbb3a736dc7e0fdc26b0e3dc929052d55fcf ChangeLog 2875
+EBUILD mysql-gui-tools-5.0_p11.ebuild 2919 RMD160 23e1524607fa7d9d16b498cbb34047e01d0e3eda SHA1 d5812ab5cf657dc8b475c651be91a9b6bf4ed993 SHA256 e8b368c7227d08c9f9cf321e15cf7f1ecf5334d282c653f31db15b69681629bb
+MD5 51e8ef1a54be9efb5a0dcec831d17c31 mysql-gui-tools-5.0_p11.ebuild 2919
+RMD160 23e1524607fa7d9d16b498cbb34047e01d0e3eda mysql-gui-tools-5.0_p11.ebuild 2919
+SHA256 e8b368c7227d08c9f9cf321e15cf7f1ecf5334d282c653f31db15b69681629bb mysql-gui-tools-5.0_p11.ebuild 2919
+EBUILD mysql-gui-tools-5.0_p12.ebuild 2919 RMD160 93b6c840e50a88471d26216647ceef49fb79cb79 SHA1 aa20637dafa7f0e29b520970c31867e88a95ed05 SHA256 87ea9729c28067dfc80bf48db89e1c13e0602737dd694e8c3803b55cdb43a89e
+MD5 35b6e0144d040639f4be4bddb82667c6 mysql-gui-tools-5.0_p12.ebuild 2919
+RMD160 93b6c840e50a88471d26216647ceef49fb79cb79 mysql-gui-tools-5.0_p12.ebuild 2919
+SHA256 87ea9729c28067dfc80bf48db89e1c13e0602737dd694e8c3803b55cdb43a89e mysql-gui-tools-5.0_p12.ebuild 2919
+MISC ChangeLog 3108 RMD160 155697843df4e37cc3f3169dcb50dd66897cc5c5 SHA1 c4c96b9421cab8645e830d848a94670243ebfce9 SHA256 899c201832edd48cde473b52b026c86724c442ef5a9510dce4c3338daf732532
+MD5 2e06b06cf9d461143beed97bf457382b ChangeLog 3108
+RMD160 155697843df4e37cc3f3169dcb50dd66897cc5c5 ChangeLog 3108
+SHA256 899c201832edd48cde473b52b026c86724c442ef5a9510dce4c3338daf732532 ChangeLog 3108
MISC metadata.xml 272 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced SHA1 7701e9d8d21b6250ae0664d90bebabaa231e908e SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4
MD5 a7f4f1fdfeaf295779bf8da23d2732b7 metadata.xml 272
RMD160 a64205312656df8afaa21bdbf37e15aaec949ced metadata.xml 272
@@ -36,7 +36,7 @@ SHA256 4093b02c4baef9418457d0d93d18e506bbf873f6975f35c67fb686402edb5d58 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGSicqI1lqEGTUzyQRAhnEAKDWTMuj3AbfuE4C7S60mXzh0xy2ZACgkEO9
-i13DutISzJ6nsr14nAkZaRI=
-=4lh0
+iD8DBQFGdS/CI1lqEGTUzyQRAnBDAJ0VWqXLU9GIbxElCKjjW2JXu+039wCgz+Q+
+18ovYtzvvoiuAcQgZAtiwbM=
+=QLw9
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild
index cf828036c14e..69266aa21671 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.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_p11.ebuild,v 1.4 2007/05/03 16:55:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p11.ebuild,v 1.5 2007/06/17 12:57:28 swegener Exp $
GCONF_DEBUG="no"
@@ -25,11 +25,13 @@ RDEPEND=">=x11-libs/gtk+-2.6
>=dev-libs/libxml2-2.6.2
=dev-cpp/glibmm-2.12*
=dev-cpp/gtkmm-2.10*
- =gnome-extra/gtkhtml-3.12*
>=virtual/mysql-5.0
workbench? (
=dev-lang/lua-5.0*
virtual/opengl
+ )
+ query-browser? (
+ =gnome-extra/gtkhtml-3.12*
)"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.15
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 dd1618f4bf9d..21e2999d062e 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.1 2007/05/15 21:33:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.2 2007/06/17 12:57:28 swegener Exp $
GCONF_DEBUG="no"
@@ -25,11 +25,13 @@ RDEPEND=">=x11-libs/gtk+-2.6
>=dev-libs/libxml2-2.6.2
=dev-cpp/glibmm-2.12*
=dev-cpp/gtkmm-2.10*
- =gnome-extra/gtkhtml-3.12*
>=virtual/mysql-5.0
workbench? (
=dev-lang/lua-5.0*
virtual/opengl
+ )
+ query-browser? (
+ =gnome-extra/gtkhtml-3.12*
)"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.15