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

5 files changed, 64 insertions, 5 deletions

diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 53bf576b755e..9643d31797ef 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.7 2004/10/23 01:23:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.8 2004/11/21 23:35:07 swegener Exp $
+
+*mysql-administrator-1.0.14 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-administrator-1.0.13.ebuild, +mysql-administrator-1.0.14.ebuild:
+  Version bump. This version needs >=dev-db/mysql-4.1. Modified the 1.0.13
+  ebuild to depend on <dev-db/mysql-4.1.
 
   23 Oct 2004; Simon Stelling <blubb@gentoo.org>
   mysql-administrator-1.0.13.ebuild:
diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 4c9397210cb1..e1956a01885a 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -1,5 +1,7 @@
 MD5 f72951884bce93d608c97147e26ad7e9 ChangeLog 1280
 MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
 MD5 0424dda5b8f8849f318ca241fc4f5435 mysql-administrator-1.0.13.ebuild 1371
-MD5 2860a344803fd5cc6e113c684e66cabf files/mysql-administrator 302
+MD5 65a65627dbe93d4d174124e8aceb3a2e mysql-administrator-1.0.14.ebuild 1377
 MD5 62f3b97837c797aa68da60ede44747b8 files/digest-mysql-administrator-1.0.13 80
+MD5 2860a344803fd5cc6e113c684e66cabf files/mysql-administrator 302
+MD5 ffb8df2b3b818926ec046978fc42ba41 files/digest-mysql-administrator-1.0.14 79
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.14 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.14
new file mode 100644
index 000000000000..fe8f1fe3614b
--- /dev/null
+++ b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.14
@@ -0,0 +1 @@
+MD5 80cf9922eec79175680f495db05e49d9 mysql-administrator-1.0.14.tar.gz 4292913
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.13.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.13.ebuild
index bc35a6ca0b76..dab01af5a4a7 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.13.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.13.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-administrator/mysql-administrator-1.0.13.ebuild,v 1.2 2004/10/23 01:23:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.13.ebuild,v 1.3 2004/11/21 23:35:07 swegener Exp $
 
 inherit gnome2
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 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
@@ -45,5 +45,5 @@ src_install() {
 	rm ${D}/usr/bin/mysql-administrator
 	dobin ${FILESDIR}/mysql-administrator || die "dobin failed"
 
-	dohtml -r ${S}/mysql-administrator/doc/{resources,mysqladministrator.html,html.css}
+	dohtml -r ${S}/mysql-administrator/doc/{resources,mysqladministrator.html,html.css} || die "dohtml failed"
 }
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.14.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.14.ebuild
new file mode 100644
index 000000000000..7c8e50e5b8e4
--- /dev/null
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 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.14.ebuild,v 1.1 2004/11/21 23:35:07 swegener Exp $
+
+inherit gnome2
+
+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-4.1
+	>=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_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"
+
+	rm ${D}/usr/bin/mysql-administrator
+	dobin ${FILESDIR}/mysql-administrator || die "dobin failed"
+
+	dohtml -r ${S}/mysql-administrator/doc/{resources,mysqladministrator.html,html.css} || die "dohtml failed"
+}