Fix compilation with forced --as-needed, fixes bug 317905. Thanks to Kacper Kowalik for the patch.

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

4 files changed, 56 insertions, 7 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index 788359efd1e2..9d5c8eb8319e 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.92 2010/04/29 20:57:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.93 2010/05/01 08:27:51 graaff Exp $
+
+  01 May 2010; Hans de Graaff <graaff@gentoo.org>
+  mail-notification-5.4-r3.ebuild,
+  +files/mail-notification-5.4-asneeded.patch:
+  Fix compilation with forced --as-needed, fixes bug 317905. Thanks to
+  Kacper Kowalik for the patch.
 
   29 Apr 2010; Pacho Ramos <pacho@gentoo.org>
   mail-notification-5.4-r3.ebuild, +files/mail-notification-5.4-e-d-s.patch:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index df5c0022fa92..88accef66fd1 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mail-notification-5.4-asneeded.patch 1104 RMD160 daa7d61bc773cedd13ffdc33b7a5dcbac7b90754 SHA1 6ede43eff242cc28327afc773a3b781dead66dc5 SHA256 46d7d0a90e486c143fe6fc11709611de55920fe9a7ce24d54fa6984a72f174ec
 AUX mail-notification-5.4-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73
 AUX mail-notification-5.4-e-d-s-2.24.patch 521 RMD160 db3ae8438d054d3434605fb5d7cf90a965f806ff SHA1 75fac93f173f715bc4c7cbedf9c553e522785274 SHA256 e8bde8df77a51b1b06846ac37e7df2b3f0d1ee28716ce171b21150bcfd75094b
 AUX mail-notification-5.4-e-d-s.patch 3525 RMD160 840a3e684b87dc98ba617b7083a4ee1b7b8ffa54 SHA1 3f7074851b6539a3b499fd02d6b39f0aaa1961dd SHA256 95f506b595966609e35ba9db6a17631f8f3e31b82736f0dff16cdbae506cd96e
@@ -10,13 +11,13 @@ AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 RMD160 0d6eeb7f3f
 AUX mail-notification-5.4-sasl_encode64.patch 1298 RMD160 c1fec77994de9c4c58807b66882da4ecb92a80f2 SHA1 f371d9fec4b6e1a1e2be13b4b578c40ab8223313 SHA256 2d7b8132d6498d75d57cd44b1586ff9a9df74048a5e7724d96c05ed5c3cb079e
 DIST mail-notification-5.4.tar.bz2 570008 RMD160 64946509ef99fdeba8ff547ffac3830c36131484 SHA1 c148449c5d2fd0a75571e4e42932da1f1ae013f6 SHA256 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5
 EBUILD mail-notification-5.4-r1.ebuild 2825 RMD160 6b6fe3020e77a0b3dcbb0348f27e0a61045b0b6f SHA1 b889100e1b8e79e845b0f778e4959121a42006ec SHA256 cd2a3cff8d733617cd23f17a5a46a8792a9bfe2cb5cbce6b9afbf9f8aedff893
-EBUILD mail-notification-5.4-r3.ebuild 3152 RMD160 7528c224e8b0ff925bc14ab8a850c0d2b66cd93b SHA1 0ee6692be09c9d53404bc6a149d0de9bf8649cfb SHA256 2755e29448bfd653f6955ae5786d5a7e4e3538e31a5f081fde784a9436c91548
-MISC ChangeLog 18068 RMD160 9d1e93db5eef9756b46cf3ccb45f4727e13155ce SHA1 49436ae1809b05e75f43e5874c2a8f71c9a49e94 SHA256 c4e141ebf30642fa7f0a879f69e4857086d5923b2fd4f5ca8e8a2f8d5332fdee
+EBUILD mail-notification-5.4-r3.ebuild 3234 RMD160 b9fbc654fd8766828c3fe0d2cf87a3b5136679a5 SHA1 fd04f6aa5fa984d8e8bd192214e9579724a002db SHA256 b924b51ee0466e07386b21c2de7c02cd504e46f7e5e70d36ba43f555847af56f
+MISC ChangeLog 18305 RMD160 dfa2846a43e3169aa59a60181c4183fbc9849764 SHA1 b53d344a7279cfc891c93fb22857b02775b6ab94 SHA256 ec1bb704195bd80d591fe67452e676a1e1560b675f07c394b3b876907c361a4b
 MISC metadata.xml 707 RMD160 2ba53e2a8e4eab0cd33e19a637f6a514393c7b33 SHA1 c19133019aba5ee60fa1cbb108c848ffd8df166f SHA256 383502af536e5918f620980c074170430a84e62ca61393c2f01898dd141c0e18
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvZ8rsACgkQCaWpQKGI+9RHWQCeMMJR5VqAldSY+dCFdDBFha0Y
-WLgAn0dQOgMMAv0bNEuwxNo2mWA3JzU4
-=ifgp
+iEYEARECAAYFAkvb5g0ACgkQeM7EJeUH71OGHgCdHDsXZgyfHETc4W+cJjOz5gmn
+JiMAoJDFDw8SGBSMQ517UrBeTPM9rGKd
+=junI
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch
new file mode 100644
index 000000000000..30d53002b08a
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch
@@ -0,0 +1,39 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=317905
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- jb
++++ jb
+@@ -89,10 +89,11 @@
+ 
+ 		mkdir -p build/jbsrc || exit 1
+ 
+-		if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
++		if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
+ 			echo "ERROR: the GLib library was not found" >&2
+ 			exit 1
+ 		fi
++		gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`
+ 
+ 		sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \
+ 			jbsrc/jb.c > build/jbsrc/jb.c || exit 1
+@@ -103,14 +104,15 @@
+ 			-DG_LOG_DOMAIN="\"jb\"" \
+ 			-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
+ 			-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
+-			$gobject_cflags_libs \
++			$gobject_cflags \
+ 			$jb_cflags \
+ 			$jb_cppflags \
+ 			$jb_ldflags \
+ 			build/jbsrc/jb.c \
+ 			$jb_c_sources \
+ 			$jb_c_package_sources \
+-			$jb_libs; then
++			$jb_libs \
++			$gobject_libs; then
+ 			echo "ERROR: cannot build jb" >&2
+ 			exit 1
+ 		fi
diff --git a/mail-client/mail-notification/mail-notification-5.4-r3.ebuild b/mail-client/mail-notification/mail-notification-5.4-r3.ebuild
index 4c560d7f074b..699b47ce5029 100644
--- a/mail-client/mail-notification/mail-notification-5.4-r3.ebuild
+++ b/mail-client/mail-notification/mail-notification-5.4-r3.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/mail-client/mail-notification/mail-notification-5.4-r3.ebuild,v 1.2 2010/04/29 20:57:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild,v 1.3 2010/05/01 08:27:51 graaff Exp $
 
 EAPI=1
 
@@ -72,6 +72,9 @@ src_unpack() {
 
 	# Fedora patch to build against dev-libs/gmime:2.4
 	epatch "${FILESDIR}/${P}-gmime.patch"
+
+	# Fix forced --as-needed, bug 317905
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 }
 
 src_compile() {