Version bump. This version needs >=dev-db/mysql-4.1. Modified the 1.0.7 ebuild to depend on <dev-db/mysql-4.1.

5 files changed, 70 insertions, 16 deletions

diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index 8153affee366..ec6ab423e1d4 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-query-browser
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.4 2004/10/22 23:06:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.5 2004/11/21 23:45:00 swegener Exp $
+
+*mysql-query-browser-1.1.1 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-query-browser-1.0.7a_beta.ebuild, +mysql-query-browser-1.1.1.ebuild:
+  Version bump. This version needs >=dev-db/mysql-4.1. Modified the 1.0.7
+  ebuild to depend on <dev-db/mysql-4.1.
 
   23 Oct 2004; Sven Wegener <swegener@gentoo.org>
   mysql-query-browser-1.0.7a_beta.ebuild:
diff --git a/dev-db/mysql-query-browser/Manifest b/dev-db/mysql-query-browser/Manifest
index 7b9f85b1adf5..ab98485874a3 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
 MD5 8450ce280467218d4f4e2716e4b7a177 ChangeLog 983
+MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
 MD5 3e55c603b7ff1f41544e3782962cafec mysql-query-browser-1.0.7a_beta.ebuild 1419
-MD5 1b63d1ede30317531b67b872a5fb3665 files/mysql-query-browser 303
+MD5 7b06aed6c99bd4b977eb3558c94b0858 mysql-query-browser-1.1.1.ebuild 1421
 MD5 e7511de4fcda374e7233bb1bffb55270 files/digest-mysql-query-browser-1.0.7a_beta 84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD4DBQFBeZKMI1lqEGTUzyQRAnbbAJ994xl/Um4+tb9f12zEI7wgvANoigCY7TYZ
-gEsL0jt8vArOQHxoXtSTbg==
-=2wFK
------END PGP SIGNATURE-----
+MD5 1b63d1ede30317531b67b872a5fb3665 files/mysql-query-browser 303
+MD5 0ad986b62f6fd4b03426739f6a5bff81 files/digest-mysql-query-browser-1.1.1 84
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.1 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.1
new file mode 100644
index 000000000000..e126b94f7c38
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.1
@@ -0,0 +1 @@
+MD5 10808c3c3e92e4a5d287274e1eb78b70 mysql-query-browser-1.1.1-gamma.tar.gz 5607343
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild
index 0e53d8991af5..2472dcb66582 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild,v 1.3 2004/10/22 23:06:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild,v 1.4 2004/11/21 23:45:00 swegener Exp $
 
 inherit gnome2
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-RDEPEND="dev-db/mysql
+RDEPEND="<dev-db/mysql-4.1
 	>=dev-libs/libpcre-4.4
 	>=dev-libs/libxml2-2.6.2
 	>=gnome-base/libglade-2
@@ -50,5 +50,5 @@ src_install() {
 	rm ${D}/usr/bin/mysql-query-browser
 	dobin ${FILESDIR}/mysql-query-browser || die "dobin failed"
 
-	dohtml -r ${S}/mysql-query-browser/doc/{images,mysqlquerybrowser.html,html.css}
+	dohtml -r ${S}/mysql-query-browser/doc/{images,mysqlquerybrowser.html,html.css} || die "dohtml failed"
 }
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.1.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.1.ebuild
new file mode 100644
index 000000000000..ecf8fb64de9e
--- /dev/null
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.1.ebuild,v 1.1 2004/11/21 23:45:00 swegener Exp $
+
+inherit gnome2
+
+MY_P="${P}-gamma"
+
+DESCRIPTION="MySQL Query Browser"
+HOMEPAGE="http://www.mysql.com/"
+SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+RDEPEND=">=dev-db/mysql-4.1
+	>=dev-libs/libpcre-4.4
+	>=dev-libs/libxml2-2.6.2
+	>=gnome-base/libglade-2
+	=gnome-extra/libgtkhtml-3.0*
+	>=dev-libs/glib-2
+	=dev-cpp/gtkmm-2.2*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=app-text/scrollkeeper-0.3.11"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	cd ${S}/mysql-gui-common
+	econf --with-commondirname=common-query-browser || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	cd ${S}/mysql-query-browser
+	econf --with-commondirname=common-query-browser || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	USE_DESTDIR=1
+
+	cd ${S}/mysql-gui-common
+	gnome2_src_install || die "gnome2_src_install failed"
+
+	cd ${S}/mysql-query-browser
+	gnome2_src_install || die "gnome2_src_install failed"
+
+	rm ${D}/usr/bin/mysql-query-browser
+	dobin ${FILESDIR}/mysql-query-browser || die "dobin failed"
+
+	dohtml -r ${S}/mysql-query-browser/doc/{images,mysqlquerybrowser.html,html.css} || die "dohtml failed"
+}