summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2007-06-17 12:57:28 +0000
committerSven Wegener <swegener@gentoo.org>2007-06-17 12:57:28 +0000
commit03755cbb29ee530fc190ffe338470993793ba70e (patch)
treeb1f5d8bf3ab1aba5cc17c041a498be8c364edf8f
parentThis package was submitted by Moritz Armingeon in bug #63789 (diff)
downloadgentoo-2-03755cbb29ee530fc190ffe338470993793ba70e.tar.gz
gentoo-2-03755cbb29ee530fc190ffe338470993793ba70e.tar.bz2
gentoo-2-03755cbb29ee530fc190ffe338470993793ba70e.zip
Make the gtkhtml dependency conditional on the query-browser USE flag. Thanks to Pietro Franchi in bug #181285.
(Portage version: 2.1.3_rc3)
-rw-r--r--dev-db/mysql-gui-tools/ChangeLog7
-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
3 files changed, 14 insertions, 5 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/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