Version bump.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 80 insertions, 12 deletions

diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 5d4f6dbe09bd..f2110f65e1d3 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.22 2005/08/12 02:57:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.23 2005/09/06 19:20:08 swegener Exp $
+
+*mysql-administrator-1.1.2 (06 Sep 2005)
+
+  06 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.2-optional-4.1-support.patch,
+  +mysql-administrator-1.1.2.ebuild:
+  Version bump.
 
   12 Aug 2005; Sven Wegener <swegener@gentoo.org>
   -mysql-administrator-1.0.20.ebuild:
diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 4c3b860c00a6..1a8fb4db9a5a 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6f06e2f108710aeb83f808d8846ed1a1 ChangeLog 4145
+MD5 9704396cc9a8f2091a26a30545846cb8 ChangeLog 4334
 MD5 a86763ed63c1e913c62e1d3bf05758d7 files/1.0.22a-optional-4.1-support.patch 913
+MD5 60eb595eccb61a19e02a1861cc279ef3 files/1.1.2-optional-4.1-support.patch 901
 MD5 33ebdb0f3afc107d71706f4cfb9aaea6 files/digest-mysql-administrator-1.0.22a 80
+MD5 ec4abd81ff46189511e438f181d3a648 files/digest-mysql-administrator-1.1.2 79
 MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
 MD5 036f53411259d7d8c93c04cbdac66d62 mysql-administrator-1.0.22a.ebuild 1370
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/BA2I1lqEGTUzyQRAh/EAJ95F9rVmscwBEJd6Sm9sWd7LFiZFACgoYnr
-MDpj2+TPdSuEmkiRy81XPYc=
-=z+X6
------END PGP SIGNATURE-----
+MD5 c12b85b58da32f7a1a7a41f28a826a1f mysql-administrator-1.1.2.ebuild 1301
diff --git a/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch b/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch
new file mode 100644
index 000000000000..148e0fc88ba6
--- /dev/null
+++ b/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch
@@ -0,0 +1,16 @@
+diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c
+--- mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c	2005-06-06 16:12:15.000000000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c	2005-06-17 16:02:40.579309365 +0200
+@@ -581,10 +581,12 @@
+   //of mysql_real_connect are in utf8
+   //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+ 
++#if MYSQL_VERSION_ID >= 40100
+   if (myx_mysql_get_private(mysql)->embedded)
+     mysql_options(mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION, (char *)1);
+   else
+     mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
++#endif
+ 
+   if (!mysql_real_connect(mysql, user_conn->hostname, user_conn->username,
+                           user_conn->password, user_conn->schema,
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2
new file mode 100644
index 000000000000..4a1036f5c3c5
--- /dev/null
+++ b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2
@@ -0,0 +1 @@
+MD5 3d8bfbadbe160d9cd73ce3cce1eb088a mysql-administrator-1.1.2.tar.gz 11313947
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
new file mode 100644
index 000000000000..1db9dc286c19
--- /dev/null
+++ b/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
@@ -0,0 +1,51 @@
+# 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.1.2.ebuild,v 1.1 2005/09/06 19:20:08 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}-optional-4.1-support.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"
+}