Version bump.

(Portage version: 1.524.2.76-cvs)

6 files changed, 22 insertions, 34 deletions

diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index a6bd094e9d70..0c47c3c7592e 100644
--- a/dev-db/mysql-administrator/ChangeLog
+++ b/dev-db/mysql-administrator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-administrator
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.18 2005/04/13 08:11:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.19 2005/06/16 16:04:13 swegener Exp $
+
+*mysql-administrator-1.0.22a (16 Jun 2005)
+
+  16 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.0.19-crontab.patch, -mysql-administrator-1.0.19-r1.ebuild,
+  mysql-administrator-1.0.20.ebuild, +mysql-administrator-1.0.22a.ebuild:
+  Version bump.
 
 *mysql-administrator-1.0.20 (13 Apr 2005)
 
diff --git a/dev-db/mysql-administrator/files/1.0.19-crontab.patch b/dev-db/mysql-administrator/files/1.0.19-crontab.patch
deleted file mode 100644
index 452b734f66e8..000000000000
--- a/dev-db/mysql-administrator/files/1.0.19-crontab.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mysql-administrator-1.0.19.orig/mysql-gui-common/source/linux/MCrontab.cc mysql-administrator-1.0.19/mysql-gui-common/source/linux/MCrontab.cc
---- mysql-administrator-1.0.19.orig/mysql-gui-common/source/linux/MCrontab.cc	2005-01-11 20:02:31.429772354 +0100
-+++ mysql-administrator-1.0.19/mysql-gui-common/source/linux/MCrontab.cc	2005-01-11 20:03:31.148873681 +0100
-@@ -222,7 +222,7 @@
-   if (!g_spawn_command_line_sync(cmdline, &stdout_text, &stderr_text, &exit_status,
-                                  &error) || exit_status != 0)
-   {
--    if (!strstr(stderr_text, "no crontab"))
-+    if (!stderr_text || !strstr(stderr_text, "no crontab"))
-     {
-       got_error= true;
- 
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.19-r1 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.19-r1
deleted file mode 100644
index b421a8c18fac..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.19-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b495755208b55333cb9c060c09246fe2 mysql-administrator-1.0.19.tar.gz 5288781
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a
new file mode 100644
index 000000000000..5babfc5ccd02
--- /dev/null
+++ b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a
@@ -0,0 +1 @@
+MD5 ed0f1af3eb7be03c2785ad9057492b75 mysql-administrator-1.0.22a.tar.gz 7444056
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild
index ac19a7d87c60..458f8d8897af 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild,v 1.1 2005/04/13 08:11:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.20.ebuild,v 1.2 2005/06/16 16:04:13 swegener Exp $
 
 inherit gnome2 eutils
 
@@ -24,11 +24,11 @@ DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11"
 
 src_compile() {
-	cd ${S}/mysql-gui-common
+	cd "${S}"/mysql-gui-common
 	econf --with-commondirname=common-administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 
-	cd ${S}/mysql-administrator
+	cd "${S}"/mysql-administrator
 	econf --with-commondirname=common-administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 }
@@ -36,11 +36,11 @@ src_compile() {
 src_install() {
 	USE_DESTDIR=1
 
-	cd ${S}/mysql-gui-common
+	cd "${S}"/mysql-gui-common
 	gnome2_src_install || die "gnome2_src_install failed"
 
-	cd ${S}/mysql-administrator
+	cd "${S}"/mysql-administrator
 	gnome2_src_install || die "gnome2_src_install failed"
 
-	dohtml -r ${S}/mysql-administrator/doc/ || die "dohtml failed"
+	dohtml -r "${S}"/mysql-administrator/doc/ || die "dohtml failed"
 }
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
index 0f6d5c8dabb0..be02ddc3bdea 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild,v 1.1 2005/01/11 19:29:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild,v 1.1 2005/06/16 16:04:13 swegener Exp $
 
-inherit gnome2 eutils
+inherit gnome2
 
 DESCRIPTION="MySQL Administrator"
 HOMEPAGE="http://www.mysql.com/products/administrator/"
@@ -23,19 +23,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-crontab.patch
-}
-
 src_compile() {
-	cd ${S}/mysql-gui-common
+	cd "${S}"/mysql-gui-common
 	econf --with-commondirname=common-administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 
-	cd ${S}/mysql-administrator
+	cd "${S}"/mysql-administrator
 	econf --with-commondirname=common-administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 }
@@ -43,11 +36,11 @@ src_compile() {
 src_install() {
 	USE_DESTDIR=1
 
-	cd ${S}/mysql-gui-common
+	cd "${S}"/mysql-gui-common
 	gnome2_src_install || die "gnome2_src_install failed"
 
-	cd ${S}/mysql-administrator
+	cd "${S}"/mysql-administrator
 	gnome2_src_install || die "gnome2_src_install failed"
 
-	dohtml -r ${S}/mysql-administrator/doc/ || die "dohtml failed"
+	dohtml -r "${S}"/mysql-administrator/doc/ || die "dohtml failed"
 }