Version bump, bug #120918. Also fix bug #115540.

(Portage version: 2.1_pre4-r1)

8 files changed, 110 insertions, 4 deletions

diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index 81889f5c70e5..ef23d173a755 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-query-browser
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.24 2006/01/12 22:46:10 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.25 2006/02/23 20:28:56 swegener Exp $
+
+*mysql-query-browser-1.1.18 (23 Feb 2006)
+
+  23 Feb 2006; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.18-gtk-fix.patch, +mysql-query-browser-1.1.18.ebuild:
+  Version bump, bug #120918. Also fix bug #115540.
 
   12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   mysql-query-browser-1.1.12.ebuild, mysql-query-browser-1.1.14.ebuild,
diff --git a/dev-db/mysql-query-browser/Manifest b/dev-db/mysql-query-browser/Manifest
index 0db58be7c4f7..93bed57e6757 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,9 +1,36 @@
 MD5 6e57e5cb1735b484f872ac1b9fdc4ddd ChangeLog 4597
+RMD160 07e6041ca8c38792df95698313a861320b54c1a5 ChangeLog 4597
+SHA256 12ae668e7d57bd6ba57531ef14448b0d3ec69d305716feba208c0b98595642b3 ChangeLog 4597
 MD5 60eb595eccb61a19e02a1861cc279ef3 files/1.1.12-optional-4.1-support.patch 901
-MD5 e0966e51958acdc3c52b44c721ea38ea files/digest-mysql-query-browser-1.1.12 79
-MD5 80663e572a70ca0c1744b60b33a63290 files/digest-mysql-query-browser-1.1.14 80
-MD5 5a9466771fd5b83e609c10bd35523c68 files/digest-mysql-query-browser-1.1.17 80
+RMD160 37add9c469f6d27ecf62d119e7a90dda894dec15 files/1.1.12-optional-4.1-support.patch 901
+SHA256 177f1a1e3ce45c21001dd6602b6a1c7be5eb44dc1456b77ef9a65769fb8304ab files/1.1.12-optional-4.1-support.patch 901
+MD5 e41933612a7e6249a9e57e8a2e92cc65 files/1.1.18-gtk-fix.patch 542
+RMD160 da84c7e2b315632b01247f4554e5badbd1910dee files/1.1.18-gtk-fix.patch 542
+SHA256 0a0bf0036ffa4b8ac709dddf44c51caa5545b465d931453bfdd0b12c1cd33040 files/1.1.18-gtk-fix.patch 542
+MD5 fb1e2b9595d2f118a73bad1b0de8ff4e files/digest-mysql-query-browser-1.1.12 283
+RMD160 2252c92b44cc9fd2d9ae93c4d14aa9abfb81bf05 files/digest-mysql-query-browser-1.1.12 283
+SHA256 7ad3165ecd7370dfd82084b8f1fb35b916ef2e24839781a96a99a8d89b793945 files/digest-mysql-query-browser-1.1.12 283
+MD5 30045fcad0b38ffa2ea9cda0d06efd5b files/digest-mysql-query-browser-1.1.14 286
+RMD160 c64d1336a9e77ce41d6c8df74f160abd2315b10a files/digest-mysql-query-browser-1.1.14 286
+SHA256 2ecd4d48faf3a2bdec0a413eeee92553b1a7640b5de7166ecc5bc442289b5d79 files/digest-mysql-query-browser-1.1.14 286
+MD5 e48adba2fd42c3eb3e71e632502a575d files/digest-mysql-query-browser-1.1.17 286
+RMD160 0a9380f7bf01f916e88492f4ce10a99789b270e1 files/digest-mysql-query-browser-1.1.17 286
+SHA256 6022e9972ca4d0bfae08ed09ebc660c92a3c420938955bb589006d76ee28d4b3 files/digest-mysql-query-browser-1.1.17 286
+MD5 b37d25cf26e93d3ec96dcf28c8d29069 files/digest-mysql-query-browser-1.1.18 286
+RMD160 3c6dc9e912141e7d1c51f2b790d2652882f07b6d files/digest-mysql-query-browser-1.1.18 286
+SHA256 6f44b9e52036f46f034ab206d8076ecd22a604eeb8c1dd495d179912e97db110 files/digest-mysql-query-browser-1.1.18 286
 MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
+RMD160 a3fae3c41bcdf7e04f141ca64ef94a292c1ef016 metadata.xml 687
+SHA256 7185e1dc2aa1395e2473be19323764b985e90976df4c98b29d226cf3fe257a10 metadata.xml 687
 MD5 f0694d31cd405dfbfa22aa1c3e40600b mysql-query-browser-1.1.12.ebuild 1387
+RMD160 82f71cef868ac022490e6b518098e06463d9404c mysql-query-browser-1.1.12.ebuild 1387
+SHA256 15b3a10539f02c732e82381f3ae105936cdbad87d31ddfef5a02d6bafa4cbb72 mysql-query-browser-1.1.12.ebuild 1387
 MD5 e3d1d4851b59073ddcd138863cfdd5b6 mysql-query-browser-1.1.14.ebuild 1321
+RMD160 9ea7da5d522dfda9732be17d4d9bf99b594d100c mysql-query-browser-1.1.14.ebuild 1321
+SHA256 20646d73623baaa8f452c602a3086b4ba7a62f2ed39626fd9498001957c87e65 mysql-query-browser-1.1.14.ebuild 1321
 MD5 c8dfe0fec9a69ab59cde469865fe531b mysql-query-browser-1.1.17.ebuild 1222
+RMD160 cbe209418b2c3d25bbdaa9bdd82a88982e03539a mysql-query-browser-1.1.17.ebuild 1222
+SHA256 56d5df6eab0a11874755920922833684a7c49d69a5a119d081a4958db5997f62 mysql-query-browser-1.1.17.ebuild 1222
+MD5 d4da42c01e052bb6a29e09b1778d9a10 mysql-query-browser-1.1.18.ebuild 1308
+RMD160 5bf6702ab47a9e40201543ca7d1acb492d120b3c mysql-query-browser-1.1.18.ebuild 1308
+SHA256 61a8cfc6d92073c62ef097661344570f45517f56a81fa0ab1c8b5618e9445b6e mysql-query-browser-1.1.18.ebuild 1308
diff --git a/dev-db/mysql-query-browser/files/1.1.18-gtk-fix.patch b/dev-db/mysql-query-browser/files/1.1.18-gtk-fix.patch
new file mode 100644
index 000000000000..6126efddaf50
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/1.1.18-gtk-fix.patch
@@ -0,0 +1,12 @@
+--- mysql-query-browser-1.1.18/mysql-query-browser/source/linux/MQBookmarkBrowser.cc.orig	2005-10-13 08:22:40.000000000 +0000
++++ mysql-query-browser-1.1.18/mysql-query-browser/source/linux/MQBookmarkBrowser.cc	2006-01-20 15:30:13.000000000 +0000
+@@ -257,7 +257,8 @@
+   {

+     for (unsigned int i=0; i < _menu.items().size(); i++)

+       _menu.items()[i].set_sensitive(false);

+-    _menu.items()[3].set_sensitive(true); // New Folder

++    if (_menu.items().size() > 3)

++	_menu.items()[3].set_sensitive(true); // New Folder

+   }

+ }

+ 

diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12
index e08c20047b8e..b8c88c1b9ec7 100644
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12
@@ -1 +1,3 @@
 MD5 cd0e8552e42834266229df2431a85553 mysql-query-browser-1.1.12.tar.gz 8084846
+RMD160 604d146a1affb6428f9f68db5344e395797ce50b mysql-query-browser-1.1.12.tar.gz 8084846
+SHA256 d19ac967f649e678fe2fcfc8aa278a88b9b74e54640feb014eb291d98a78988a mysql-query-browser-1.1.12.tar.gz 8084846
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.14 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.14
index 3d3c79a64e0d..28ed8ac60fe4 100644
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.14
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.14
@@ -1 +1,3 @@
 MD5 dd185df8266f7375924dcc732258e9e7 mysql-query-browser-1.1.14.tar.gz 12093344
+RMD160 ab5a99a74d69c7911cb490633c9598d20eab9a5a mysql-query-browser-1.1.14.tar.gz 12093344
+SHA256 68a87b2efb759c77900a7c36e5d8772ddf8be2c7baf3cb49f6793b844b1d5e30 mysql-query-browser-1.1.14.tar.gz 12093344
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.17 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.17
index 21e5a12c3707..5424abf6d310 100644
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.17
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.17
@@ -1 +1,3 @@
 MD5 21049084207781314297bfab93ba6fc6 mysql-query-browser-1.1.17.tar.gz 12524409
+RMD160 b59763ef4844be6291ca3ae8cd43a5636df3adbd mysql-query-browser-1.1.17.tar.gz 12524409
+SHA256 c63ff0814afc44d993f6f4a133d92ca53c721b9f86b30f514dc31d0e7540074b mysql-query-browser-1.1.17.tar.gz 12524409
diff --git a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.18 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.18
new file mode 100644
index 000000000000..fe8c92351d11
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.18
@@ -0,0 +1,3 @@
+MD5 bf9cae997cc6ac833e68dafff580c315 mysql-query-browser-1.1.18.tar.gz 13472748
+RMD160 1ae99e9df5229c1a2db2bb7f2cba196a4fef2882 mysql-query-browser-1.1.18.tar.gz 13472748
+SHA256 658068ee90da056a5d380cc01ce08d089470f7d7edf7c3d94fb5968b9f1129bf mysql-query-browser-1.1.18.tar.gz 13472748
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.18.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.18.ebuild
new file mode 100644
index 000000000000..ea6fdbc50a0a
--- /dev/null
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 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.18.ebuild,v 1.1 2006/02/23 20:28:56 swegener Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="MySQL Query Browser"
+HOMEPAGE="http://www.mysql.com/products/query-browser/"
+SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+RDEPEND=">=dev-db/mysql-4.0
+	>=dev-libs/libpcre-4.4
+	>=dev-libs/libxml2-2.6.2
+	>=gnome-base/libglade-2
+	=gnome-extra/gtkhtml-3.0*
+	>=dev-libs/glib-2
+	=dev-cpp/gtkmm-2.8*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=app-text/scrollkeeper-0.3.11"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/1.1.18-gtk-fix.patch
+}
+
+src_compile() {
+	cd "${S}"/mysql-gui-common
+	econf --with-commondirname=common/query-browser || die "econf failed"
+	emake || die "emake failed"
+
+	cd "${S}"/mysql-query-browser
+	econf --with-commondirname=common/query-browser || die "econf failed"
+	emake || 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"
+}