Fix linking with -Wl,--as-needed, bug 306387, thanks to Bjoern Thorwirth <Bjoern.Thorwirth@uni-due.de>.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

6 files changed, 55 insertions, 33 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index b3cccd57a5e4..e1c69dd9245a 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2010/02/17 19:34:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.5 2010/02/24 17:36:13 idl0r Exp $
+
+  24 Feb 2010; Christian Ruppert <idl0r@gentoo.org>
+  mysql-workbench-5.2.15.ebuild, mysql-workbench-5.2.16.ebuild,
+  +files/mysql-workbench-5.2.16-asneeded.patch:
+  Fix linking with -Wl,--as-needed, bug 306387, thanks to Bjoern Thorwirth
+  <Bjoern.Thorwirth@uni-due.de>.
 
 *mysql-workbench-5.2.16 (17 Feb 2010)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 8ce91afc0c9c..cb06d3b0a9e2 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mysql-workbench-5.2.15-as-needed.patch 667 RMD160 0b5ee32d011c4ce20473c74743f0c992c319c217 SHA1 a66f109e8757d4caa54245297aa3d9b18c60d40f SHA256 cbdaf75c98e5c7524c75159c14bc0fcc0a7253046cb41190358911763dde4126
 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
 DIST mysql-workbench-oss-5.2.15a.tar.gz 15008009 RMD160 da84c91456b5c6580e8d87e0780b75e80cff15de SHA1 7ef4d33e85c7d364626db87cce0b0eb7e1f8827f SHA256 5c936bc8adf2ac18a197f979f7941fd1094ffdfc1d01b2abdad7562d0b7bf672
 DIST mysql-workbench-oss-5.2.16.tar.gz 15139915 RMD160 b5992ebb373baf71c922110ae1e32af0e1b8d455 SHA1 1e7d48c1f97bc96e79623d6bb459219cb5769892 SHA256 08c7e3002a672e02c03016d3ec734df29f46f9f317a4a1b04da56a1e7c7a8cdc
-EBUILD mysql-workbench-5.2.15.ebuild 1439 RMD160 e055b5a31699609ea2d7740905efd7c291c8a95e SHA1 15e3f9d8513f55a5ba44cc424001792bb329eac5 SHA256 a992ddbbd39ba056b60f1563b651a393237662815b0b8ae281594fcb2671971d
-EBUILD mysql-workbench-5.2.16.ebuild 1474 RMD160 b7da4a236a4fa5aa9c9e26a17425e4cb23fa7a24 SHA1 e5cf41446ce009d13e1266892def528c35db6b01 SHA256 0f4c9ed3a8c508b71dbb93af669213a90c7492d12548e769c285c8ad312379a3
-MISC ChangeLog 1060 RMD160 7e7853331d0e90fc96462fa94627414876b75319 SHA1 8f9829318e486ee8976bc7b85e3f12a58ce22dfd SHA256 c2398f56e2d66ef806496dab64cbe6e4076c787141a40bb132cea2f446cf81e0
+EBUILD mysql-workbench-5.2.15.ebuild 1445 RMD160 7947113c5b3f8a0dcba4c3e9e1ee7208a69b7aa5 SHA1 5bf61e29258e4608e7ff5061e2acdb9b396f4c7a SHA256 1e60fee2bd65f44c9427ba191298184d31bed7b4b339307710b46fd1c65e92f0
+EBUILD mysql-workbench-5.2.16.ebuild 1454 RMD160 cbb6cd7d76632ecd8ea18c93ba7f64fee3cbbe00 SHA1 1bd3e69c350cef13042fbbeb9f163728162b423d SHA256 0ce81e4a64f08df57c00d7af6c7b6379a2ea8527cd248cec3b098dfc153d52a7
+MISC ChangeLog 1332 RMD160 7e97e57f383047faefaf206f39a2687d9817dccb SHA1 962acc1586442d6d5dcf24d7763413845ea92faf SHA256 82ef0ded30b2276861d9128ff148736b8bb4bb3e3bb07a4d20199d3f25f99231
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt8RMwACgkQeM7EJeUH71P94wCgiBtKYdw66GFSYZ+uC1xWYkSw
-FmgAnAguUxvgLufeUYeMKYiKtTc0DmOD
-=9J/7
+iEYEARECAAYFAkuFY5kACgkQixe2jn+ufThS0gCfUlBisaCX+C1CuUOVkYvOLbm7
+OCAAniZqGHybcTl9NRXW+FLoByP3v4OF
+=8Qzn
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch
deleted file mode 100644
index 278a0df1ec8a..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- library/base/src/Makefile.am.~1~	2009-12-17 20:30:22.000000000 +0100
-+++ library/base/src/Makefile.am	2009-12-26 15:11:38.347093031 +0100
-@@ -6,6 +6,7 @@
- 
- INCLUDES= -Wall -Wsign-compare\
-         @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
-+LIBS= @PCRE_LIBS@
- 
- libwbbase_la_SOURCES=util.c\
- 	util_functions.c\
---- backend/wbpublic/Makefile.am.~1~	2009-12-17 20:30:13.000000000 +0100
-+++ backend/wbpublic/Makefile.am	2009-12-26 15:33:27.795967633 +0100
-@@ -20,6 +20,8 @@
- 	-I$(top_srcdir)/modules\
- 	-I$(top_srcdir)/ext/ctemplate/ctemplate-src/src
- 
-+LIBS= @CTEMPLATE_LIBS@
-+
- libwbpublic_la_SOURCES=\
- 	grt/refresh_ui.cpp\
- 	grt/editor_base.cpp\
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch
new file mode 100644
index 000000000000..156e71713951
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch
@@ -0,0 +1,37 @@
+--- mysql-workbench-oss-5.2.16.orig/library/base/src/Makefile.am	2010-02-16 20:29:55.000000000 +0100
++++ mysql-workbench-oss-5.2.16/library/base/src/Makefile.am	2010-02-24 17:34:07.401777509 +0100
+@@ -7,6 +7,9 @@ pkglib_LTLIBRARIES = libwbbase.la
+ INCLUDES= -Wall -Wsign-compare\
+         @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
+ 
++libwbbase_la_LIBADD=@GLIB_LIBS@\
++					@PCRE_LIBS@
++
+ libwbbase_la_SOURCES=util.c\
+ 	util_functions.c\
+ 	xml_util_functions.c\
+--- mysql-workbench-oss-5.2.16.orig/backend/wbpublic/Makefile.am	2010-02-16 20:29:46.000000000 +0100
++++ mysql-workbench-oss-5.2.16/backend/wbpublic/Makefile.am	2010-02-24 17:47:05.623513994 +0100
+@@ -145,4 +145,4 @@ libwbpublic_la_SOURCES=\
+ 	grtui/checkbox_list_control.cpp\
+   grtui/file_charset_dialog.cpp
+ 
+-libwbpublic_la_LIBADD=../../library/canvas/src/libmdcanvas.la ../../library/forms/libmforms.la ../../library/dbc/libcdbc.la ../../library/vsqlite++/src/sqlite/libvsqlitepp.la
++libwbpublic_la_LIBADD=../../library/canvas/src/libmdcanvas.la ../../library/forms/libmforms.la ../../library/dbc/libcdbc.la ../../library/vsqlite++/src/sqlite/libvsqlitepp.la @CTEMPLATE_LIBS@
+--- mysql-workbench-oss-5.2.16.orig/library/grt/src/Makefile.am	2010-02-16 20:29:56.000000000 +0100
++++ mysql-workbench-oss-5.2.16/library/grt/src/Makefile.am	2010-02-24 17:33:32.341520830 +0100
+@@ -13,9 +13,11 @@ INCLUDES=-I. -I.. @GLIB_CFLAGS@ @SIGC_CF
+ 	@GRT_CFLAGS@
+ 
+ libgrt_la_LIBADD=\
+-        @LUA_LIBS@\
+-        $(top_srcdir)/library/base/src/libwbbase.la
+-
++		@LUA_LIBS@\
++		@GLIB_LIBS@\
++		@SIGC_LIBS@\
++		$(top_srcdir)/library/base/src/libwbbase.la
++        
+ libgrt_la_SOURCES=\
+ 	grtpp_grt.cpp\
+ 	grtpp_helper.cpp\
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
index 97010e5ddadf..b6113270180a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.3 2010/02/17 17:12:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild,v 1.4 2010/02/24 17:36:13 idl0r Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -47,7 +47,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-configure.in.pythonlib.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-5.2.16-asneeded.patch"
 	eautoreconf
 }
 
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
index 25a549d4bdc1..a04d26638ac5 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
@@ -1,6 +1,6 @@
 # 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.16.ebuild,v 1.1 2010/02/17 19:34:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild,v 1.2 2010/02/24 17:36:13 idl0r Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -47,7 +47,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/mysql-workbench-5.2.15-configure.in.pythonlib.patch"
-	epatch "${FILESDIR}/mysql-workbench-5.2.15-as-needed.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 	eautoreconf
 }