Version bump. No more need to use our own wrapper script. Removed old beta ebuilds.

8 files changed, 19 insertions, 84 deletions

diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index ec6ab423e1d4..0ace0e42ec91 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2004/11/21 23:45:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.6 2004/12/01 20:04:57 swegener Exp $
+
+*mysql-query-browser-1.1.2 (01 Dec 2004)
+
+  01 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/mysql-query-browser, -mysql-query-browser-1.0.7a_beta.ebuild,
+  -mysql-query-browser-1.1.1.ebuild, +mysql-query-browser-1.1.2.ebuild:
+  Version bump. No more need to use our own wrapper script. Removed old beta
+  ebuilds.
 
 *mysql-query-browser-1.1.1 (22 Nov 2004)
 
diff --git a/dev-db/mysql-query-browser/Manifest b/dev-db/mysql-query-browser/Manifest
index fbdbd6d3b317..fb5127e8b0a3 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7f7e53d7d82a0dcefe778e1a517e7383 mysql-query-browser-1.0.7a_beta.ebuild 1447
-MD5 5e8e6e9b8f343f349b41031367d93e2a mysql-query-browser-1.1.1.ebuild 1444
-MD5 a34cd4790ab99ad993bb858a14b0d398 ChangeLog 1268
+MD5 89cdac451e3b3f8100ee4474fbf00573 mysql-query-browser-1.1.2.ebuild 1259
+MD5 3bcc7301d9248a4ed66fbe902a3bf2ba ChangeLog 1592
 MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
-MD5 1b63d1ede30317531b67b872a5fb3665 files/mysql-query-browser 303
-MD5 e7511de4fcda374e7233bb1bffb55270 files/digest-mysql-query-browser-1.0.7a_beta 84
-MD5 0ad986b62f6fd4b03426739f6a5bff81 files/digest-mysql-query-browser-1.1.1 84
+MD5 2f491eda9afaed1c2dbee60a9cbf01f4 files/digest-mysql-query-browser-1.1.2 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBoSiCI1lqEGTUzyQRAjr8AJ9SPoKn9xaBJqR2Bw0XOkUs/EDjugCfdCEm
-YvXJ2qhrUuEVeH/4eC5BwC8=
-=mRvC
+iD8DBQFBriPyI1lqEGTUzyQRAov1AKCCexgb4pzEITim6qNZ5VAn7ecLigCeLevY
+fkI1OWDD17RjclJXRKT3Dhg=
+=o7yD
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.0.7a_beta b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.0.7a_beta
deleted file mode 100644
index 86aad53c3fa8..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.0.7a_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99f5a898a9184ebefbcfa490f76a77d0 mysql-query-browser-1.0.7a-beta.tar.gz 5173837
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
deleted file mode 100644
index e126b94f7c38..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10808c3c3e92e4a5d287274e1eb78b70 mysql-query-browser-1.1.1-gamma.tar.gz 5607343
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.2 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.2
new file mode 100644
index 000000000000..d459cd9ad830
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.2
@@ -0,0 +1 @@
+MD5 5cc86410146dd1fd0170fe71bf19f9eb mysql-query-browser-1.1.2.tar.gz 5767123
diff --git a/dev-db/mysql-query-browser/files/mysql-query-browser b/dev-db/mysql-query-browser/files/mysql-query-browser
deleted file mode 100644
index af7db4b25c10..000000000000
--- a/dev-db/mysql-query-browser/files/mysql-query-browser
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# 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/files/mysql-query-browser,v 1.1 2004/08/25 06:06:31 swegener Exp $
-
-export MQB_DIR=/
-
-exec /usr/bin/mysql-query-browser-bin
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
deleted file mode 100644
index 2472dcb66582..000000000000
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.0.7a_beta.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.4 2004/11/21 23:45:00 swegener Exp $
-
-inherit gnome2
-
-MY_P="${P/_/-}"
-
-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"
-}
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.2.ebuild
index ecf8fb64de9e..25cd74464880 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.1.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.2.ebuild
@@ -1,14 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.2.ebuild,v 1.1 2004/12/01 20:04:57 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"
+SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
@@ -26,8 +24,6 @@ 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"
@@ -47,8 +43,5 @@ src_install() {
 	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"
+	dohtml -r ${S}/mysql-query-browser/doc/ || die "dohtml failed"
 }