Revision bump. Correctly check for errors when executing crontab. Should fix bug #62505.

5 files changed, 81 insertions, 5 deletions

diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 984db2493156..857246b2b3db 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.15 2005/01/11 09:52:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.16 2005/01/11 19:29:48 swegener Exp $
+
+*mysql-administrator-1.0.19-r1 (11 Jan 2005)
+
+  11 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0.19-crontab.patch, +mysql-administrator-1.0.19-r1.ebuild:
+  Revision bump. Correctly check for errors when executing crontab. Should fix
+  bug #62505.
 
 *mysql-administrator-1.0.19 (11 Jan 2005)
 
diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 65eedb4a27f2..618e32cec929 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 MD5 cdac1910ca6b13eb3840810c3d4e9120 mysql-administrator-1.0.19.ebuild 1254
 MD5 0fa8e25f3497c5ba30a37a02cb5e62fa mysql-administrator-1.0.18.ebuild 1256
-MD5 bc5475c3a54e42b82e623a1349f85439 ChangeLog 2790
+MD5 acc3aa3fddc85e728dc3e9aafae27e4f mysql-administrator-1.0.19-r1.ebuild 1345
+MD5 31921ad4c13fb1265ab6fb0a0ce87714 ChangeLog 3050
 MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
+MD5 a45443f1ee23ab02f823a69b7e224154 files/1.0.19-crontab.patch 688
+MD5 4605762cb4c229f1c9b575bc0078a780 files/digest-mysql-administrator-1.0.19-r1 79
 MD5 1b5b12a185f5b22cc643375391eafb37 files/digest-mysql-administrator-1.0.18 79
 MD5 4605762cb4c229f1c9b575bc0078a780 files/digest-mysql-administrator-1.0.19 79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB46HdI1lqEGTUzyQRAlXkAJ9lWfqj2+9Vg54zu2xQO4qGNvonmwCeJnE4
-UKArIisAIS29sKpt7XWFkgg=
-=oOC0
+iD8DBQFB5CkzI1lqEGTUzyQRAqRLAJ4hrsuW40efD0jApyfVg9AsHKOYhACdHWwg
+DqfY5/pDKUYK10615f5ZUG8=
+=poWS
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-administrator/files/1.0.19-crontab.patch b/dev-db/mysql-administrator/files/1.0.19-crontab.patch
new file mode 100644
index 000000000000..452b734f66e8
--- /dev/null
+++ b/dev-db/mysql-administrator/files/1.0.19-crontab.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..b421a8c18fac
--- /dev/null
+++ b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.19-r1
@@ -0,0 +1 @@
+MD5 b495755208b55333cb9c060c09246fe2 mysql-administrator-1.0.19.tar.gz 5288781
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild
new file mode 100644
index 000000000000..0f6d5c8dabb0
--- /dev/null
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.19-r1.ebuild
@@ -0,0 +1,53 @@
+# 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 $
+
+inherit gnome2 eutils
+
+DESCRIPTION="MySQL Administrator"
+HOMEPAGE="http://www.mysql.com/products/administrator/"
+SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+RDEPEND="dev-db/mysql
+	>=dev-libs/libpcre-4.4
+	>=dev-libs/libxml2-2.6.2
+	>=gnome-base/libglade-2
+	>=dev-libs/glib-2
+	=dev-cpp/gtkmm-2.2*"
+
+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
+	econf --with-commondirname=common-administrator || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	cd ${S}/mysql-administrator
+	econf --with-commondirname=common-administrator || 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-administrator
+	gnome2_src_install || die "gnome2_src_install failed"
+
+	dohtml -r ${S}/mysql-administrator/doc/ || die "dohtml failed"
+}