Add patch to fix building with --as-needed (bug #238262).

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 50 insertions, 7 deletions

diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 0297c919bca0..c081d9fe044e 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libjingle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.11 2008/09/17 13:35:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.12 2008/11/13 00:53:09 flameeyes Exp $
+
+  13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libjingle-0.3.12-asneeded.patch, libjingle-0.3.12.ebuild:
+  Add patch to fix building with --as-needed (bug #238262).
 
 *libjingle-0.3.12 (17 Sep 2008)
 
diff --git a/net-libs/libjingle/Manifest b/net-libs/libjingle/Manifest
index c64fe612b512..f7224bb17b36 100644
--- a/net-libs/libjingle/Manifest
+++ b/net-libs/libjingle/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX libjingle-0.3.11-gcc43.patch 9565 RMD160 082360eeed9e4f4c8b5dca6eb7bea5f9825b8258 SHA1 1f222fef9c6efb992e0c55b28c72273e45872e65 SHA256 793f1aad29fc7c4eeb46d3bfb1184aac81f7876e087988f1656fdd630379290f
+AUX libjingle-0.3.12-asneeded.patch 1024 RMD160 ea8aa08e02f9c40fb957c0fbadb1475aae4daabd SHA1 5a720aa0f0908c98858e00deba850b8212564f8d SHA256 2e069cedf0287359b8add040e0c1dff1d01d583eaaeda39aafbde27513bfec54
 DIST libjingle-0.3.11.tar.gz 613784 RMD160 61c4359f029fed2ce4fcd9da38a9ff2324b7af17 SHA1 47f6b403388d470f2bcb9e1e961711e236d01445 SHA256 d287f9f90fd0d31272d7d63edbf7103b986e2e20f82906b0ddddcfdbb914b4f4
 DIST libjingle-0.3.12.tar.gz 526316 RMD160 b0b823a405e75b2c952bd638087647cee7aeef26 SHA1 7435366a5f9c228dc7fa7e47e94a7702ede0bc2e SHA256 4bbc4b4813292c20905d2f857ec7ec1055cc54611ae9cd7c85f46962f1b1a2d9
 EBUILD libjingle-0.3.11.ebuild 754 RMD160 94d954264a7bca53e0d449b43d1b4c6f4644b8cb SHA1 cf58528d43d65fcaa4dd952ea5fb977039a1c70f SHA256 df562a1cceef3b36c0999a8cc48888037ba1cc843d0ca9e9ca659d2976394af4
-EBUILD libjingle-0.3.12.ebuild 677 RMD160 69fa9c3c4e356f4644e3b31e1f8f9b910baa771a SHA1 e7173a04c167673d452b16a9e870fb02df08f0ad SHA256 4053c4998e91f710ce7056671912ad8874ee37c03b2e1647d49de34a42052845
-MISC ChangeLog 1850 RMD160 ec40f15af936e96e17edca8d58b0b8920cf29d3c SHA1 2c865ced3bf18e8a227c6f5c4946e2c8fec9cf4f SHA256 2223001eebb76c98e1d79fbedb1c2b0a4f3913ecddab01704b6e65af4f2e3c5a
+EBUILD libjingle-0.3.12.ebuild 822 RMD160 03770b6f7359a06ed071bcc8cf325063448325cb SHA1 fc6b786cfea38decc7726001273ccbb4dd7dd89c SHA256 4fc53d8b6deae941fa3c0ba3ea53a50ecac2290b3e89d331bb8e29d4574db7ff
+MISC ChangeLog 2034 RMD160 bca406cce9b4e2238f03059899380fde24c80c84 SHA1 af571bb1f837254d1ed8d705463ff3f4e508551f SHA256 6474378df1111f96cf922151ea33290ea5e8c15bdeae707bc29170babb2f57d6
 MISC metadata.xml 274 RMD160 4768001753012d66c37ffdf286af9f85acc909d2 SHA1 7d11f7d9f6871b06db910f54f1b5d68de3625698 SHA256 757abf07369008f55658d8a6b937f6677602cdfb1961aa0767a189d4bfef6d70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjRB5MACgkQ+IXOQtHLm/i6xQCgjpYu1N4Ch1Lfe27eNcP1I/Ch
-Qt0AnjyTtJ9i7HAhmqzddeaNnudec36R
-=u0ju
+iEYEARECAAYFAkkbenoACgkQAiZjviIA2XgxSgCfcIK2ReQFa3xHNrDm1Cvo1nAa
+1cMAn0KNF1wRweJHGmBk/YdmItBvwtmr
+=c21G
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch b/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch
new file mode 100644
index 000000000000..522659a21181
--- /dev/null
+++ b/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch
@@ -0,0 +1,26 @@
+Index: libjingle-0.3.12/talk/base/Makefile.am
+===================================================================
+--- libjingle-0.3.12.orig/talk/base/Makefile.am
++++ libjingle-0.3.12/talk/base/Makefile.am
+@@ -31,7 +31,7 @@ libjinglebase_la_SOURCES =  socketaddres
+                             signalthread.cc \
+                             socketpool.cc
+ 
+-libjinglebase_la_LIBADD = -lrt
++libjinglebase_la_LIBADD = -lrt -lssl -lcrypto
+ 
+ libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base
+ libjinglebase_include_HEADERS = asyncfile.h \
+Index: libjingle-0.3.12/talk/p2p/base/Makefile.am
+===================================================================
+--- libjingle-0.3.12.orig/talk/p2p/base/Makefile.am
++++ libjingle-0.3.12/talk/p2p/base/Makefile.am
+@@ -38,7 +38,7 @@ libjinglep2pbase_include_HEADERS = candi
+ 								   sessionresponsemessage.h \
+ 								   sessionmessagefactory.h
+ 
+-libjinglep2pbase_la_LIBADD = -lssl -lcrypto
++libjinglep2pbase_la_LIBADD =
+ 
+ AM_CPPFLAGS = -DPOSIX
+ 
diff --git a/net-libs/libjingle/libjingle-0.3.12.ebuild b/net-libs/libjingle/libjingle-0.3.12.ebuild
index 5fea7f4d6152..b5808cb46790 100644
--- a/net-libs/libjingle/libjingle-0.3.12.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.12.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.1 2008/09/17 13:35:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.2 2008/11/13 00:53:09 flameeyes Exp $
+
+inherit autotools eutils
 
 DESCRIPTION="Google's jabber voice extension library modified by Tapioca/Farsight"
 HOMEPAGE="http://farsight.freedesktop.org/"
@@ -16,6 +18,16 @@ RDEPEND="dev-libs/openssl
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# See bug #238262
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	eautomake
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README