Version bump.

(Portage version: 2.0.51.22-r1)

7 files changed, 31 insertions, 44 deletions

diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index dcd93c9b9aea..44c62eca1c93 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mysql-query-browser
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.19 2005/06/17 18:11:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.20 2005/06/23 03:42:23 swegener Exp $
+
+*mysql-query-browser-1.1.12 (23 Jun 2005)
+
+  23 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.1.11-optional-4.1-support.patch,
+  +files/1.1.12-optional-4.1-support.patch,
+  -files/1.1.11-no-unkown-widgets.patch, -mysql-query-browser-1.1.11.ebuild,
+  +mysql-query-browser-1.1.12.ebuild:
+  Version bump.
 
   17 Jun 2005; Sven Wegener <swegener@gentoo.org>
   +files/1.1.11-optional-4.1-support.patch,
diff --git a/dev-db/mysql-query-browser/Manifest b/dev-db/mysql-query-browser/Manifest
index 5b816b597f77..864417688ec9 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41785a63d32d2214aca638b9272bfe4b mysql-query-browser-1.1.11.ebuild 1442
-MD5 61adf7a5d56211a0217be4405ca3e7ad mysql-query-browser-1.1.7.ebuild 1292
-MD5 27e0f7b8a98a40c68d228208ebdb2043 mysql-query-browser-1.1.9.ebuild 1284
 MD5 4305a84cfe7e1bc5b0bf3edade057d18 ChangeLog 3623
-MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
 MD5 85b5bb9ee651889caf15dd409f816ac5 files/1.1.11-no-unkown-widgets.patch 693
-MD5 c2deb0a90ff26719ce2ad70f3331077c files/digest-mysql-query-browser-1.1.11 79
 MD5 a86763ed63c1e913c62e1d3bf05758d7 files/1.1.11-optional-4.1-support.patch 913
+MD5 c2deb0a90ff26719ce2ad70f3331077c files/digest-mysql-query-browser-1.1.11 79
+MD5 e0966e51958acdc3c52b44c721ea38ea files/digest-mysql-query-browser-1.1.12 79
 MD5 5752ca8d9c3c557c6c8b06ce2f269f45 files/digest-mysql-query-browser-1.1.7 78
 MD5 2e3a04a394a27297ccfa8dc009b2a224 files/digest-mysql-query-browser-1.1.9 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCsxJfI1lqEGTUzyQRAjQUAJ9xq4cNHV6Qj4ibrmeqOesB6GldcACgu/kC
-b1UeKcdeW2PJXN7De+pbfJw=
-=K9q+
------END PGP SIGNATURE-----
+MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
+MD5 41785a63d32d2214aca638b9272bfe4b mysql-query-browser-1.1.11.ebuild 1442
+MD5 947f604da010950120698a8ac2b7a572 mysql-query-browser-1.1.12.ebuild 1444
+MD5 61adf7a5d56211a0217be4405ca3e7ad mysql-query-browser-1.1.7.ebuild 1292
+MD5 27e0f7b8a98a40c68d228208ebdb2043 mysql-query-browser-1.1.9.ebuild 1284
diff --git a/dev-db/mysql-query-browser/files/1.1.11-no-unkown-widgets.patch b/dev-db/mysql-query-browser/files/1.1.11-no-unkown-widgets.patch
deleted file mode 100644
index 18d18baae5a6..000000000000
--- a/dev-db/mysql-query-browser/files/1.1.11-no-unkown-widgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur mysql-query-browser-1.1.11.orig/mysql-query-browser/source/linux/MQWorkArea.cc mysql-query-browser-1.1.11/mysql-query-browser/source/linux/MQWorkArea.cc
---- mysql-query-browser-1.1.11.orig/mysql-query-browser/source/linux/MQWorkArea.cc	2005-06-02 03:19:03.000000000 +0000
-+++ mysql-query-browser-1.1.11/mysql-query-browser/source/linux/MQWorkArea.cc	2005-06-16 16:26:15.800899738 +0000
-@@ -275,9 +275,6 @@
-     _mainw->set_status(ufmt(_("Default schema not set. You must select one in the File menu before executing any query.")));
- 
-   update_toolbar_sensitivity();
--  
--  if (!_dispatcher->check_version(5,0,1))
--    _xml->get_widget("make_view_btn")->set_sensitive(false);
- }
- 
- 
diff --git a/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch b/dev-db/mysql-query-browser/files/1.1.12-optional-4.1-support.patch
index 4e0be6f73f70..148e0fc88ba6 100644
--- a/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch
+++ b/dev-db/mysql-query-browser/files/1.1.12-optional-4.1-support.patch
@@ -2,15 +2,15 @@ diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_l
 --- 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,

+   //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-query-browser/files/digest-mysql-query-browser-1.1.11 b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.11
deleted file mode 100644
index 9816d0047c2e..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 899856b5b5111322b703aebf9f6c6535 mysql-query-browser-1.1.11.tar.gz 7910648
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
new file mode 100644
index 000000000000..e08c20047b8e
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12
@@ -0,0 +1 @@
+MD5 cd0e8552e42834266229df2431a85553 mysql-query-browser-1.1.12.tar.gz 8084846
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild
index f225388d9552..067bcf2b1653 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.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-query-browser/mysql-query-browser-1.1.11.ebuild,v 1.3 2005/06/17 18:11:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild,v 1.1 2005/06/23 03:42:23 swegener Exp $
 
 inherit gnome2 eutils
 
@@ -28,7 +28,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PV}-no-unkown-widgets.patch
 	epatch "${FILESDIR}"/${PV}-optional-4.1-support.patch
 }