More --as-needed patching in modules. This brings back the accept/discard buttons in EDIT mode. Also improve Python detection to fix compilation issues with forced --as-needed.

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

5 files changed, 121 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 347bcc1b2bdb..1190054b8e8f 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.8 2010/04/03 08:23:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.9 2010/04/09 14:55:24 graaff Exp $
+
+*mysql-workbench-5.2.17-r1 (09 Apr 2010)
+
+  09 Apr 2010; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.17-r1.ebuild,
+  +files/mysql-workbench-5.2.17-as-needed-modules.patch,
+  +files/mysql-workbench-5.2.17-python-libs.patch:
+  More --as-needed patching in modules. This brings back the accept/discard
+  buttons in EDIT mode. Also improve Python detection to fix compilation
+  issues with forced --as-needed.
 
 *mysql-workbench-5.2.17 (03 Apr 2010)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 46a98cfa5344..16db037f8c15 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,17 +3,20 @@ Hash: SHA1
 
 AUX mysql-workbench-5.2.15-configure.in.pythonlib.patch 649 RMD160 ff69015e136a79abb189b7310269b2069c496d05 SHA1 b1e65450dd5f8150cacb76545d11007df2f8db0c SHA256 2ad14218a99fd46dcdac6dbbb51d7d50a381f78e77be07dbe34a43521115f0e4
 AUX mysql-workbench-5.2.16-asneeded.patch 1688 RMD160 f9adbea38432197a6c1ebbf458df402fc7e56038 SHA1 70bed63e4a32c3a3affd046fd9d897a9861f9e97 SHA256 1b387e789cdb2ba877da1714222f532eaedc18628a69c53154fe326361480a66
+AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da
 AUX mysql-workbench-5.2.17-as-needed.patch 298 RMD160 cd548cd700d94be9480efc803c3046efcede7df8 SHA1 5530534012c02d08062b78b379d8a5e474bfcb1c SHA256 8aec2b9061a3d89ded9fdf58b1d52764a2faacaf89fe170f34980f9c81b0dcfd
+AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b
 DIST mysql-workbench-oss-5.2.16.tar.gz 15139915 RMD160 b5992ebb373baf71c922110ae1e32af0e1b8d455 SHA1 1e7d48c1f97bc96e79623d6bb459219cb5769892 SHA256 08c7e3002a672e02c03016d3ec734df29f46f9f317a4a1b04da56a1e7c7a8cdc
 DIST mysql-workbench-oss-5.2.17.tar.gz 15942705 RMD160 6c485b64790e54f95318495ba96527f98a209d72 SHA1 63301b79471daf99f4d29b1787ddeab3d1873495 SHA256 ed69f0a9e6a930f9b05472666fd72b7592bea9dc23d9abacb802b724534f95f4
 EBUILD mysql-workbench-5.2.16.ebuild 1456 RMD160 ac6aa703f277ddac14d6cf83d5df3dc378ec5345 SHA1 4fe4ac7b5faf302483d4b955c949df251970623e SHA256 077f96566fa07ffc830b3a2f10203a52a828e9afb29c1fac75fe9c33e9b288ac
+EBUILD mysql-workbench-5.2.17-r1.ebuild 1506 RMD160 59d04efdd85f66857a7cb3085851e1eee16db0f3 SHA1 3192d4699d0f4a58ec967c0d385cc71c27904957 SHA256 b45382a5685325265f95ef23502fb08a52b045ccd9964a690394b45dc9e63220
 EBUILD mysql-workbench-5.2.17.ebuild 1391 RMD160 cb32d546a83482081efec234447d8c1ae36a0080 SHA1 e0be8ccc3849af580c7e0a0b1a345a4ed1d2fa23 SHA256 be458f80b8b938943c96f37484e90c7810a564e0c33ad417d2c3a49ee8bf4783
-MISC ChangeLog 1897 RMD160 3ae0abaa3ce5f1d219447ca82f5c422a2c09b8e0 SHA1 cbfa3887d61871f03aeb0bc48c0dc59de3c02b12 SHA256 9b9bfe8a5d9deddbf7d38418a73c89ae33e6dd06805653506ccb05c3373e5923
+MISC ChangeLog 2318 RMD160 673dc35b847fb856540a5dab9e187ee4be8e7a10 SHA1 e0122d739e040575c4583399af6105464b037fbf SHA256 d5027dcb4381fced5d12b35c0641a0395f80c090063780ab9da57b0190197ac5
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku2+ygACgkQeM7EJeUH71MBbQCcCFXp3T9ybd86mkhA7uyuAqz8
-P0IAnRPD0zsngBqGVQqykUmq3j8T+6st
-=7W9Q
+iEYEARECAAYFAku/P+0ACgkQeM7EJeUH71P3YgCfUxmcPrq2PShn1mXy/wV07C8T
+qMEAnibEmGJkGLc+8CwymQcup6eDZi6G
+=BmE9
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch
new file mode 100644
index 000000000000..a53b49d37f0c
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch
@@ -0,0 +1,20 @@
+--- modules/wb.validation/Makefile.am.~1~	2010-04-02 03:26:24.000000000 +0200
++++ modules/wb.validation/Makefile.am	2010-04-09 16:18:16.703343478 +0200
+@@ -19,6 +19,7 @@
+ 
+ 
+ wb_validation_grt_la_LDFLAGS=-module
++wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
+ #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la 
+ 
+ wb_validation_grt_la_SOURCES=src/register_plugin.cpp\
+--- modules/wb.mysql.validation/Makefile.am.~1~	2010-04-02 03:26:24.000000000 +0200
++++ modules/wb.mysql.validation/Makefile.am	2010-04-09 16:17:53.991717921 +0200
+@@ -21,6 +21,7 @@
+ 
+ 
+ wb_mysql_validation_grt_la_LDFLAGS=-module
++wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
+ #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
+ 
+ wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch
new file mode 100644
index 000000000000..8fb6b71e91b0
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch
@@ -0,0 +1,21 @@
+Use a simpler check for Python's libs that return an actual linker
+invocation (e.g. -lpython2.6) instead of the .so file. This fixes the
+case with forced as-needed where the .so gets re-ordered to the front
+during link.
+
+--- configure.in.~1~	2010-04-02 03:26:27.000000000 +0200
++++ configure.in	2010-04-09 16:06:10.271092660 +0200
+@@ -303,12 +303,7 @@
+ dnl 	enable_python=$enableval, enable_python=no)
+ 
+ AC_MSG_CHECKING(for Python)
+-PYTHON_LIBS=[$(python -c "from distutils import sysconfig
+-import os 
+-cfg=sysconfig.get_config_vars()
+-lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
+-if os.path.exists(lib):
+-    print lib")]
++PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')]
+ PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
+ print sysconfig.get_python_inc()")]
+ PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.17-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.17-r1.ebuild
new file mode 100644
index 000000000000..9667c7ca0130
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.17-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.17-r1.ebuild,v 1.1 2010/04/09 14:55:24 graaff Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils flag-o-matic autotools
+
+MY_P="${PN}-oss-${PV}"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls readline static-libs"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	dev-libs/glib:2
+	gnome-base/libglade:2.0
+	dev-libs/libsigc++:2
+	dev-libs/boost
+	>=dev-libs/libxml2-2.6.2
+	>=dev-cpp/glibmm-2.14
+	>=dev-cpp/gtkmm-2.14
+	dev-libs/libzip
+	>=virtual/mysql-5.0
+	dev-libs/libpcre
+	virtual/opengl
+	>=dev-lang/lua-5.1[deprecated]
+	gnome-base/libgnome
+	x11-libs/pango
+	|| ( sys-libs/e2fsprogs-libs
+		dev-libs/ossp-uuid )
+	>=x11-libs/cairo-1.5.12[svg]
+	dev-python/pexpect
+	dev-python/paramiko
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/ctemplate-0.95
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.2.17-python-libs.patch"
+	epatch "${FILESDIR}/${PN}-5.2.17-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-5.2.17-as-needed-modules.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable readline readline) \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		--with-system-ctemplate
+}