Fix compilation with Gnome 2.28, bug 293063.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 147 insertions, 6 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 2300c0ee9b1f..65fe26e57954 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.29 2009/11/20 18:02:11 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.30 2009/12/07 20:23:12 graaff Exp $
+
+*mysql-gui-tools-5.0_p12-r3 (07 Dec 2009)
+
+  07 Dec 2009; Hans de Graaff <graaff@gentoo.org>
+  +mysql-gui-tools-5.0_p12-r3.ebuild,
+  +files/mysql-gui-tools-5.0_p12-gnome-2.28.patch:
+  Fix compilation with gnome 2.28 installed, due to other modules dropping
+  the libgnome dependency: #293063.
 
   20 Nov 2009; Mark Loeser <halcy0n@gentoo.org>
   mysql-gui-tools-5.0_p12-r2.ebuild:
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index c6bcd28a1afd..6a58244afa91 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 AUX mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch 4974 RMD160 de60ab5dcc6479b82dc07337d4a67fd2a7b7d10b SHA1 b59073272865b111f30b58fac0b5f0b061d80e86 SHA256 88f61ff309afc0b210cab1f5bdef1d512c4cb6616550a028ae9f1d41f7da961a
 AUX mysql-gui-tools-5.0_p12-gcc-4.3.patch 1189 RMD160 939152bbcbd99372351023fdf61441326235a763 SHA1 21b827334555ffd30f5d1991d9be381fa800b4d8 SHA256 507d029d23c7d180418831e6f61a9ec53b8461891a0493689909c61fc60e6939
+AUX mysql-gui-tools-5.0_p12-gnome-2.28.patch 338 RMD160 6ad2342cf6ca773105ac8f2a59043dfb2aae50db SHA1 99ee8ca9235b0de300679a6ca215072630471dde SHA256 f7b45a35d8b98aba1e28e69fc3d9b0523bc07c170c4327fc3ee04f127991ff7c
 AUX mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8320 RMD160 b6f1a5f946fa371f9ce484af6ca839dedd46bec7 SHA1 7b2146726ec939ccda449a3ddbc127eab823b5ec SHA256 9844dcb8b7b9c1ea2d092c6afa4cb2a46b994b6ae8c3654932b4e24cf8d24048
 AUX mysql-gui-tools-5.0_p12-query-browser-sps.patch 313 RMD160 c2b2727f8cab0946659b1cc39ae1d2983a50e4f0 SHA1 ce78c02e84e029199b7d8ea73a8b53f67d32b38b SHA256 a68fce4a3d4f51f9ad9d3c743fa9bb7be59356eaf2f21a7cc6f1735fd5528c8b
 AUX mysql-gui-tools-5.0_p8-i18n-fix.patch 354 RMD160 660c2f3715e655c5473738c8c69be69c5e3d2a81 SHA1 eb700f0d691fa7d6a69db3f51059844b9855215f SHA256 9abc2cb8370b4f550718c6500be717951c527e6dca9f9530be534a5f8db09447
 AUX mysql-gui-tools-5.0_p8-lua-modules.patch 672 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 SHA1 d6b13610e25bbe3e22af040fc3c46d25564f0693 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28
 DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
 EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 2772 RMD160 7a5c8f0468852f57da38a90504473cac23694c18 SHA1 b3ae73e7fa34c04d97e64f36e4c7349167732c8a SHA256 435bc880dcfa20574b7d4d2b2780e938436831cfd0bf4b026e48e674a0ea3fd3
-MISC ChangeLog 5464 RMD160 5b83201ca9f251cf4646e4aae415c50e6b6befce SHA1 31ee4b484409d41e62d8c4fc152c3986f046fabf SHA256 8c7fc5098daaed89aad65b1f1c0c26e99ba52042a0e5be0ca03117d019246a54
+EBUILD mysql-gui-tools-5.0_p12-r3.ebuild 2900 RMD160 1041b8afd8fbf854faa2fc4fa4c00f5c541ec54c SHA1 b09390cf0179f4cdff029e00836e0389ed6011d4 SHA256 defbca963a5d554f001b11a0b6fb78e5530e23a6e0147216c2dfa7bdba567dae
+MISC ChangeLog 5757 RMD160 5bef214f1f4fc6e6132b83c69674bc88b541f8d8 SHA1 8e25770ff75e6506753f1f418ddb31f2a96a7bb6 SHA256 b3f1275ea7a73f3ea47f5d04914b22a33a643ee1dadfd2b75c389efa23249343
 MISC metadata.xml 433 RMD160 00b52a4a1d7d67beb63b23e2cf7541b3849594de SHA1 9fe6c230cad179e8e8109719cb332d64a58f50c6 SHA256 29a10e9d7bd0d3dcc7b8ddc354c532efc9158a7e39940f253ba8f7dd0a71c804
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksG2asACgkQCRZPokWLroQJwwCgrk1qWsQOhwRQnH090nVImAta
-KgIAn31wlS4eIZgV2XJAgyC4bt5aLte/
-=Oyb5
+iEYEARECAAYFAksdZD4ACgkQVYU2Ai8K93cwbACgjSm+DNdHEKzH0O/3smp843QR
+QdoAnRMaGaXcVrezAofcu1ahpwcl3kPD
+=A3N6
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-gnome-2.28.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-gnome-2.28.patch
new file mode 100644
index 000000000000..df4aeeac8596
--- /dev/null
+++ b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-gnome-2.28.patch
@@ -0,0 +1,10 @@
+--- mysql-query-browser/configure.in.~1~	2009-12-07 20:30:05.870570830 +0100
++++ mysql-query-browser/configure.in	2009-12-07 20:54:57.009820684 +0100
+@@ -72,6 +72,7 @@
+ 
+ PKG_CHECK_MODULES(GNOME, [libglade-2.0
+ 			gthread-2.0
++			libgnome-2.0
+ 			libxml-2.0 >= 2.6.2
+                         $gtkhtml
+                         gtkmm-2.4])
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r3.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r3.ebuild
new file mode 100644
index 000000000000..599f04e41592
--- /dev/null
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r3.ebuild,v 1.1 2009/12/07 20:23:12 graaff Exp $
+
+GCONF_DEBUG="no"
+EAPI="1"
+
+inherit autotools gnome2 eutils flag-o-matic
+
+MY_P="${P/_p/r}"
+
+DESCRIPTION="MySQL GUI Tools"
+HOMEPAGE="http://www.mysql.com/products/tools/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls +administrator +query-browser"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.6
+	>=gnome-base/libglade-2.5
+	>=dev-libs/libsigc++-2.0
+	>=dev-libs/libpcre-4.4
+	>=dev-libs/libxml2-2.6.2
+	>=dev-cpp/glibmm-2.14
+	dev-cpp/gtkmm:2.4
+	>=virtual/mysql-5.0
+	query-browser? (
+		gnome-extra/gtkhtml:3.14
+		gnome-base/libgnomeprint:2.2
+	)"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15
+	>=app-text/scrollkeeper-0.3.11"
+RDEPEND="${RDEPEND}
+	!dev-db/mysql-administrator
+	!dev-db/mysql-query-browser"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	if ! use administrator && ! use query-browser
+	then
+		elog "Please activate at least one of the following USE flags:"
+		elog "- administrator for MySQL Administrator"
+		elog "- query-browser for MySQL Query Browser"
+		die "Please activate at least one of the following USE flags: administrator, query-browser"
+	fi
+
+	# Needed for gcc-4.3
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch \
+		"${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch \
+		"${FILESDIR}"/${P}-query-browser-sps.patch \
+		"${FILESDIR}"/${P}-libsigc++-2.2.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-deprecated-gtk+-api.patch \
+		"${FILESDIR}"/${P}-gnome-2.28.patch
+
+	sed -i \
+		-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \
+		mysql-gui-common/tools/grtsh/Makefile.{am,in}
+
+	if use query-browser
+	then
+		cd "${S}"/mysql-query-browser
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	# mysql has -fno-exceptions, but we need exceptions
+	append-flags -fexceptions
+
+	cd "${S}"/mysql-gui-common
+	use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
+	gnome2_src_compile \
+		--disable-java-modules \
+		--disable-workbench \
+		$(use_enable nls i18n)
+
+	if use administrator
+	then
+		cd "${S}"/mysql-administrator
+		use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
+		gnome2_src_compile $(use_enable nls i18n)
+	fi
+
+	if use query-browser
+	then
+		cd "${S}"/mysql-query-browser
+		use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
+		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
+	fi
+}
+
+src_install() {
+	cd "${S}"/mysql-gui-common
+	gnome2_src_install
+
+	if use administrator
+	then
+		cd "${S}"/mysql-administrator
+		gnome2_src_install
+	fi
+
+	if use query-browser
+	then
+		cd "${S}"/mysql-query-browser
+		gnome2_src_install
+	fi
+}