Fix building with gcc-4.1, thanks to Salvatore Ansani in bug #129285. Remove old ebuilds.

(Portage version: 2.1_pre7-r4)

10 files changed, 33 insertions, 178 deletions

diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index dc608e1566c3..5311802dfb22 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2006/02/25 16:27:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.27 2006/04/08 23:39:00 swegener Exp $
+
+  08 Apr 2006; Sven Wegener <swegener@gentoo.org>
+  -files/1.1.12-optional-4.1-support.patch, +files/1.1.18-gcc41-fix.patch,
+  -mysql-query-browser-1.1.12.ebuild, -mysql-query-browser-1.1.14.ebuild,
+  -mysql-query-browser-1.1.17.ebuild, mysql-query-browser-1.1.18.ebuild:
+  Fix building with gcc-4.1, thanks to Salvatore Ansani in bug #129285. Remove
+  old ebuilds.
 
   25 Feb 2006; Sven Wegener <swegener@gentoo.org>
   mysql-query-browser-1.1.18.ebuild:
diff --git a/dev-db/mysql-query-browser/files/1.1.12-optional-4.1-support.patch b/dev-db/mysql-query-browser/files/1.1.12-optional-4.1-support.patch
deleted file mode 100644
index 148e0fc88ba6..000000000000
--- a/dev-db/mysql-query-browser/files/1.1.12-optional-4.1-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-query-browser/files/1.1.18-gcc41-fix.patch b/dev-db/mysql-query-browser/files/1.1.18-gcc41-fix.patch
new file mode 100644
index 000000000000..7b5325011890
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/1.1.18-gcc41-fix.patch
@@ -0,0 +1,22 @@
+--- mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h.orig	2005-03-13 13:16:59.000000000 +0000
++++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h	2006-03-22 15:22:19.000000000 +0000
+@@ -41,7 +41,7 @@
+   public:

+     bool find_entry_by_comment(const std::string &comment, Entry &entry);

+ 

+-    bool MCrontab::remove_entry_with_comment(const std::string &comment,

++    bool remove_entry_with_comment(const std::string &comment,

+                                              const std::string &command="");

+     

+     void add_entry(Entry &entry, const std::string &comment);

+--- mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h.orig	2005-03-13 13:16:59.000000000 +0000
++++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h	2006-03-22 15:22:09.000000000 +0000
+@@ -40,7 +40,7 @@
+     virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0;

+ 

+     const char *find_value(MYX_OPTION_GROUP *group, const char *name);

+-    std::list<const char *>MGOptions::find_values(MYX_OPTION_GROUP *group, const char *name);

++    std::list<const char *> find_values(MYX_OPTION_GROUP *group, const char *name);

+ 

+     void add_group(MYX_APPLICATION_OPTIONS *options, const char *name,

+                    const std::list<ValuePair> &values);

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
deleted file mode 100644
index b8c88c1b9ec7..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.12
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 28ed8ac60fe4..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.14
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 5424abf6d310..000000000000
--- a/dev-db/mysql-query-browser/files/digest-mysql-query-browser-1.1.17
+++ /dev/null
@@ -1,3 +0,0 @@
-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/mysql-query-browser-1.1.12.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild
deleted file mode 100644
index bb193062d6d4..000000000000
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.12.ebuild,v 1.3 2006/03/17 22:38:33 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Query Browser"
-HOMEPAGE="http://www.mysql.com/products/tools/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.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/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"
-
-	dohtml -r "${S}"/mysql-query-browser/doc/ || die "dohtml failed"
-}
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild
deleted file mode 100644
index 1ef048a78137..000000000000
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.14.ebuild,v 1.3 2006/03/17 22:38:33 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Query Browser"
-HOMEPAGE="http://www.mysql.com/products/tools/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.2*"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.1.12-optional-4.1-support.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"
-}
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild
deleted file mode 100644
index b941672a4742..000000000000
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.17.ebuild,v 1.3 2006/03/17 22:38:33 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Query Browser"
-HOMEPAGE="http://www.mysql.com/products/tools/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_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"
-}
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
index 77f6f2b04478..596042e8b312 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2006/03/17 22:38:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.18.ebuild,v 1.4 2006/04/08 23:39:00 swegener Exp $
 
 inherit gnome2 eutils
 
@@ -29,6 +29,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/1.1.18-gtk-fix.patch
+	epatch "${FILESDIR}"/1.1.18-gcc41-fix.patch
+
 	echo "Categories=Application;Development;" >>"${S}"/mysql-query-browser/MySQLQueryBrowser.desktop.in
 }