Added an updated linking patch as kindly provided by corsair on bug 209138. xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.

Package-Manager: portage-2.1.4.4

5 files changed, 78 insertions, 16 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 14bc73c506a4..876d4b917001 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xmlrpc-c
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.43 2008/02/22 23:24:14 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.44 2008/03/02 00:44:21 philantrop Exp $
+
+  02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  files/xmlrpc-c-1.06.09-asneeded.patch,
+  +files/xmlrpc-c-1.06.09-strsol.patch, xmlrpc-c-1.06.09-r1.ebuild:
+  Added an updated linking patch as kindly provided by corsair on bug 209138.
+  xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.
 
 *xmlrpc-c-1.06.09-r1 (22 Feb 2008)
 
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index e90564524fdd..79db4d6b0517 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xmlrpc-c-1.05-pic.patch 566 RMD160 2e64750d04cdb3a9ad9f95e753e6dd46d4cd650c SHA1 5b266ed0600aa32c5f461df402038ffee1dac87c SHA256 b27f31ef0098ff83518be25131b1ddb72a3290c45636219a58cbf7dcd5ff415d
 AUX xmlrpc-c-1.06.02-strsol.patch 716 RMD160 c98b5c6d10ae1b11d57ed80515aa2e7855acceb7 SHA1 5540ded87bd50ca0a413c0b4bbf5faa630754d32 SHA256 2ffd9c6cf54a1bb8664b0d0aeb36985efd40d65ccf71f697ad0f6efb845adedd
 AUX xmlrpc-c-1.06.02-threadupdatestatus.patch 465 RMD160 e8e8cdeb31d0afad547dd8abab3533e9f54114ba SHA1 b209a5d55c3e587eabe220503c8818b17731fc78 SHA256 64fac915d4bdab37ebf04fece7066213a96d09651d4e088c90f08e9fd364a985
 AUX xmlrpc-c-1.06.03-mustbuildclient.patch 5124 RMD160 c668c5fb37711344dac9e1680064e0eb3015ff8c SHA1 b3352a43aadd2556d68b63ece06062c45a70059d SHA256 fcd41df910adf58ac873094f38d332af64d290b4162a5a131892372f9187ffa8
-AUX xmlrpc-c-1.06.09-asneeded.patch 635 RMD160 45be0e32e7bb54505bf9c4e2523723e84ea41c9c SHA1 262f10dbae7b3050f355a498071592112ea47267 SHA256 6ac2d74b415bfe64e82c321581fb10cde5bab5af17f183e52af268139378af5b
+AUX xmlrpc-c-1.06.09-asneeded.patch 2218 RMD160 82e644faf71229ecb77f558fd48d73e327ce16ec SHA1 17d9f11f7dfdd03f74f9c9a8016c9da8526309f5 SHA256 456ef854ee642a228f139171ba8d4a06bc2a9467f614628564ca2130d84f679a
+AUX xmlrpc-c-1.06.09-strsol.patch 602 RMD160 b18f2ceb63c44cccdbcc2f38cefd7d5f2769f917 SHA1 64ad16c0a4908a1cda54209c2667f2e6a7f1d719 SHA256 e77fb9ac9aa2d4e10b80386618e044ccce514fd63afd8f938da12b086ca36b0b
 AUX xmlrpc-c-gcc43.patch 3386 RMD160 7260a649337849caa2784f0ecdbe9a64e31215a7 SHA1 a90b4ba1ad7ba793dce640f62c15cdb46ee5d36f SHA256 d34c3c5e7b7fbcba19a1abdb1afafdeaebb32fff7300981027c6ed247eb80092
 DIST xmlrpc-c-1.06.03.tgz 679053 RMD160 e33916221bdb5c8f0b1ebd1099a08f6cc1ce12fa SHA1 06e0daaac84829b04ce6bd6f28dd23def259c3bf SHA256 f9bf17b1a7cdf7d1e20de855012e0f91aef3133316fab35aa27e719abf5383d1
 DIST xmlrpc-c-1.06.09.tgz 680245 RMD160 0f8678f1f643ae6d78d445d96e7205e89b4d07c5 SHA1 9a6b902c61e9d8a76d66527562caa1d397c6addd SHA256 3dd759bb3fc2df519c51cfac605144f973e28603c1d9e028211212dc3dfd3f22
 EBUILD xmlrpc-c-1.06.03.ebuild 1395 RMD160 de1bb097a98e9d3a12d02c31f81b13b064b19603 SHA1 54d12e92622e98345d87d794f3e151c8c436b049 SHA256 557bd11f965b4cda2416d4de18c50bbaae324205c3cf4ff5e01b4175fe981e28
-EBUILD xmlrpc-c-1.06.09-r1.ebuild 1710 RMD160 5743364fb434ec721dd243c33f294dde90784041 SHA1 ec17d738c48a2ee2c983e74f881fc3eced81491e SHA256 dbd68d82c2995d0ce3c4f9d2f5f8190e07d754559fe0a3c4f13276bcf30aa014
+EBUILD xmlrpc-c-1.06.09-r1.ebuild 1760 RMD160 7735ff9627d40794c1e7a10a60cc66ff3f2d0f6c SHA1 02eef703519c816327a1cfd00a7c3dc47e5bb32d SHA256 18f7cb8d344d088497e8f090872883e1c0d9a2a9f1baefbfd49786b440c0e9b2
 EBUILD xmlrpc-c-1.06.09.ebuild 1703 RMD160 d564301e1b7d3995f19710b5ebca7e9c5c6e14c8 SHA1 67f47be5a67dba243cd8dcaf8502f13ab1f1dcd5 SHA256 104d8cc253855ad3a065da7976420c2397cf28941a74ff01713a544204baf6f2
-MISC ChangeLog 6484 RMD160 7bb6a841dd6c4349816a9799babef1039502366d SHA1 ff987c8178e1f9a67dd31859a60d945861d21c21 SHA256 b397072634836f26b5498a3538bdcc1d16fe22bbab0332648bf4add8f58da93c
+MISC ChangeLog 6793 RMD160 c681836733a059cfa76b1d4db70b66c0c0183eb6 SHA1 c6e4cf5a109ab3b23943f8cd643d4367d304adba SHA256 667412d134f23c00b1f7832fc3a6e3a14c8dd3363634bf61a87e423cc70106cb
 MISC metadata.xml 252 RMD160 3569a8c74f4fe5daa6ccffa29ea2f353692c129c SHA1 fedaa12353a12a6b010da943110e2df3b073f2e9 SHA256 c8f4a1165b70224f3a567ab9abe9c4be4b4d659697f86393a8ab25a944e429da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHv1mFB18eXLOpYdkRAjywAKCC3pI/5Oz2TMrrU7dhFUfGqVJdKgCeKOT/
-C3DGNOQ+iJd7cC9BFMoSWT4=
-=XQWF
------END PGP SIGNATURE-----
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch
index 2f3bc5437b7f..f9611f1faabc 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch
@@ -19,3 +19,47 @@ Index: xmlrpc-c-1.06.09/src/Makefile
  
  LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS)
  
+diff -Naur xmlrpc-c-1.06.09.orig/examples/cpp/Makefile xmlrpc-c-1.06.09/examples/cpp/Makefile
+--- xmlrpc-c-1.06.09.orig/examples/cpp/Makefile	2006-01-09 00:36:06.000000000 +0100
++++ xmlrpc-c-1.06.09/examples/cpp/Makefile	2008-03-02 00:15:42.000000000 +0100
+@@ -63,13 +63,13 @@
+ all: $(PROGS)
+ 
+ $(SERVERPROGS_ABYSS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
++	$(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
+ 
+ $(LEGACY_CLIENTPROGS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT)
++	$(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS)
+ 
+ $(CLIENTPROGS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
++	$(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
+ 
+ %.o:%.cpp
+ 	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $<
+diff -Naur xmlrpc-c-1.06.09.orig/examples/Makefile xmlrpc-c-1.06.09/examples/Makefile
+--- xmlrpc-c-1.06.09.orig/examples/Makefile	2005-11-20 22:39:57.000000000 +0100
++++ xmlrpc-c-1.06.09/examples/Makefile	2008-03-02 00:15:04.000000000 +0100
+@@ -81,16 +81,16 @@
+ 	$(MAKE) -C $(dir $@) $(notdir $@)
+ 
+ $(CLIENTPROGS):%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
++	$(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
+ 
+ $(SERVERPROGS_CGI):%.cgi:%_cgi.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI)
++	$(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS)
+ 
+ $(SERVERPROGS_ABYSS):%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
++	$(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
+ 
+ gen_sample_add_xml:%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE)
++	$(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS)
+ 
+ %.o:%.c
+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch
new file mode 100644
index 000000000000..094e1c510aaf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch
@@ -0,0 +1,19 @@
+--- xmlrpc-c-1.06.09/tools/Makefile.common.orig	2006-07-30 05:07:28.000000000 +0200
++++ xmlrpc-c-1.06.09/tools/Makefile.common	2008-02-29 11:57:06.000000000 +0100
+@@ -1,6 +1,7 @@
+ # -*-makefile-*-    <-- an Emacs control
+ 
+ CLIENT_LDLIBS = -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc
++CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util
+ 
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+   CLIENT_LDLIBS += $(shell libwww-config --libs)
+@@ -14,8 +15,6 @@
+ 
+ CLIENT_LDLIBS += $(LDLIBS_XML)
+ 
+-CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util
+-
+ 
+ UTIL_DIR = $(BUILDDIR)/lib/util
+ 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild
index 060c05f8cfb4..e0935555dfc3 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild,v 1.1 2008/02/22 23:24:14 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild,v 1.2 2008/03/02 00:44:21 philantrop Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-1.05-pic.patch
 	epatch "${FILESDIR}"/${PN}-1.06.02-threadupdatestatus.patch
-	epatch "${FILESDIR}"/${PN}-1.06.02-strsol.patch
+	epatch "${FILESDIR}"/${P}-strsol.patch
 	epatch "${FILESDIR}"/${PN}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 
@@ -41,6 +41,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# Respect the user's LDFLAGS.
+	export LADD=${LDFLAGS}
 	econf --disable-wininet-client --enable-libxml2-backend \
 		$(use_enable threads abyss-threads) \
 		$(use_enable curl curl-client) \