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.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

4 files changed, 114 insertions, 1 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/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
+}