fix previous patch for optional client libs

Package-Manager: portage-2.1.1_pre4-r3

4 files changed, 76 insertions, 18 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index ca868860ca36..5c95bcd6f7e2 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xmlrpc-c
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.17 2006/08/12 07:37:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.18 2006/08/12 09:50:36 hollow Exp $
+
+  12 Aug 2006; Benedikt Böhm <hollow@gentoo.org>
+  files/xmlrpc-c-1.06.03-mustbuildclient.patch, xmlrpc-c-1.06.03.ebuild:
+  fix previous patch for optional client libs
 
 *xmlrpc-c-1.06.03 (12 Aug 2006)
 
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index d0284ff34c4f..671d213fecdf 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -17,10 +17,10 @@ AUX xmlrpc-c-1.06.02-threadupdatestatus.patch 465 RMD160 e8e8cdeb31d0afad547dd8a
 MD5 a0ceeb369541ad7b7997762682647efa files/xmlrpc-c-1.06.02-threadupdatestatus.patch 465
 RMD160 e8e8cdeb31d0afad547dd8abab3533e9f54114ba files/xmlrpc-c-1.06.02-threadupdatestatus.patch 465
 SHA256 64fac915d4bdab37ebf04fece7066213a96d09651d4e088c90f08e9fd364a985 files/xmlrpc-c-1.06.02-threadupdatestatus.patch 465
-AUX xmlrpc-c-1.06.03-mustbuildclient.patch 2944 RMD160 61687a6a18f7954e010317d46ca6a11c988cfa87 SHA1 218b2147d8d3b107ac28ab702ad6d77b0560cdc2 SHA256 78fb66972eddd841dd40b569146ef401caf0f096b23c9946403854957a29dfe5
-MD5 b4efacfd1587458584e910fb81603308 files/xmlrpc-c-1.06.03-mustbuildclient.patch 2944
-RMD160 61687a6a18f7954e010317d46ca6a11c988cfa87 files/xmlrpc-c-1.06.03-mustbuildclient.patch 2944
-SHA256 78fb66972eddd841dd40b569146ef401caf0f096b23c9946403854957a29dfe5 files/xmlrpc-c-1.06.03-mustbuildclient.patch 2944
+AUX xmlrpc-c-1.06.03-mustbuildclient.patch 5124 RMD160 c668c5fb37711344dac9e1680064e0eb3015ff8c SHA1 b3352a43aadd2556d68b63ece06062c45a70059d SHA256 fcd41df910adf58ac873094f38d332af64d290b4162a5a131892372f9187ffa8
+MD5 b6a1e0e53e90aa3fceb5be81a9d5d0ea files/xmlrpc-c-1.06.03-mustbuildclient.patch 5124
+RMD160 c668c5fb37711344dac9e1680064e0eb3015ff8c files/xmlrpc-c-1.06.03-mustbuildclient.patch 5124
+SHA256 fcd41df910adf58ac873094f38d332af64d290b4162a5a131892372f9187ffa8 files/xmlrpc-c-1.06.03-mustbuildclient.patch 5124
 AUX xmlrpc-c-gcc-3.4.patch 275 RMD160 713f342ecebf6d0efb412f996bea465ef56ae685 SHA1 3dc9f9086393ed232cf9bb6c863a8d9fb8cbbb06 SHA256 8c2198821aea5d192e88b071adb4d1c1a097bd76f5be49fab1f4518208bb5db9
 MD5 7c21670fa8df73d16d04f3c8ed62fab3 files/xmlrpc-c-gcc-3.4.patch 275
 RMD160 713f342ecebf6d0efb412f996bea465ef56ae685 files/xmlrpc-c-gcc-3.4.patch 275
@@ -36,14 +36,14 @@ EBUILD xmlrpc-c-1.06.02.ebuild 1272 RMD160 eff56d7d3846e6c0bb7b751ba8b80a057fa67
 MD5 76d43c0a4df60e501be38c69b02ccf33 xmlrpc-c-1.06.02.ebuild 1272
 RMD160 eff56d7d3846e6c0bb7b751ba8b80a057fa67320 xmlrpc-c-1.06.02.ebuild 1272
 SHA256 165e1d5fccf2b6ed6cb27d56ccc58cb60de12e9d9bfc452e313085faa5a1329a xmlrpc-c-1.06.02.ebuild 1272
-EBUILD xmlrpc-c-1.06.03.ebuild 1333 RMD160 644cc6201f7e4ea4f4087f5dc0a4937cc2ff9d48 SHA1 147c8ec34c1fdf7c9edbd0f8cc2450454c5a6d63 SHA256 2d72fdbd7eccfa7a27832f35a091673acf7f68fe0f9b541889ee2a93ab571e2f
-MD5 aea79427af350f365da5f3d7b7edf9ab xmlrpc-c-1.06.03.ebuild 1333
-RMD160 644cc6201f7e4ea4f4087f5dc0a4937cc2ff9d48 xmlrpc-c-1.06.03.ebuild 1333
-SHA256 2d72fdbd7eccfa7a27832f35a091673acf7f68fe0f9b541889ee2a93ab571e2f xmlrpc-c-1.06.03.ebuild 1333
-MISC ChangeLog 2771 RMD160 8ef58566230e527a7b80d0432d3102f86307fae9 SHA1 e04c58ce446e7db56a40dd6b7f77316369393e57 SHA256 a74af554a3c36ac2469526f5680522505cd95fcd9eb6d8a7529020d1cb57b9db
-MD5 2c17191ff985bde26b4c3fcf3d8dc3e9 ChangeLog 2771
-RMD160 8ef58566230e527a7b80d0432d3102f86307fae9 ChangeLog 2771
-SHA256 a74af554a3c36ac2469526f5680522505cd95fcd9eb6d8a7529020d1cb57b9db ChangeLog 2771
+EBUILD xmlrpc-c-1.06.03.ebuild 1330 RMD160 f333cbc9bca5aa1d920149b7c06a414f94a4bd66 SHA1 24021ee3df89dd38cd0e083e6552c5c0b66c6fa7 SHA256 8ee84337a887b19cdc93af2ab582a7a8a6ff1a12a6a20d872c2ea4455882e854
+MD5 38982166661b7430582d7596490443a9 xmlrpc-c-1.06.03.ebuild 1330
+RMD160 f333cbc9bca5aa1d920149b7c06a414f94a4bd66 xmlrpc-c-1.06.03.ebuild 1330
+SHA256 8ee84337a887b19cdc93af2ab582a7a8a6ff1a12a6a20d872c2ea4455882e854 xmlrpc-c-1.06.03.ebuild 1330
+MISC ChangeLog 2941 RMD160 71411cb06f9628cda0960eb83f7617d834e0f13d SHA1 241b5d2ec1fa0954b9393858145186565dd76606 SHA256 ea4cf0a567985188b92d4dd8cbfcb4caf040e2d9207162ef5dde07331801e181
+MD5 b23ec4d67dc5c90f14b691fe8d8e5f58 ChangeLog 2941
+RMD160 71411cb06f9628cda0960eb83f7617d834e0f13d ChangeLog 2941
+SHA256 ea4cf0a567985188b92d4dd8cbfcb4caf040e2d9207162ef5dde07331801e181 ChangeLog 2941
 MISC metadata.xml 231 RMD160 b32aed93ad0695a6c66e66b35822a7c96aaebc20 SHA1 9e5de2ed3c51ab0bc2eb5cb7ef55c24808fb4d13 SHA256 efcbeaab370c37afb589de7e8358b24bbca358586f7c47f2cc8b0d0da0318d85
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
 RMD160 b32aed93ad0695a6c66e66b35822a7c96aaebc20 metadata.xml 231
@@ -60,7 +60,7 @@ SHA256 e52860179ec1481ac89ac3e661e8d9c0990ee4a2c84bab221087aa5ace98d252 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE3YUvmPFBzbX68WERAt6BAJ493Kv8cDfG6B6UCXa9mR6ctxWuTgCglD8F
-gN879D+MCeMBJU4qBFlCBFA=
-=HTiX
+iD8DBQFE3aR4mPFBzbX68WERAmKmAJ9LiAvfL0fqUPvgbU8mMbaTO00g5QCfe/G4
+SEb5aewL6J+F91nbY30WOvo=
+=SttV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch
index f4c600b6887c..4ceb2e8fbfb3 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch
@@ -95,3 +95,57 @@ Index: xmlrpc-c-1.06.03/tools/Makefile
  
  .PHONY: all clean distclean install check dep
  
+Index: xmlrpc-c-1.06.03/xmlrpc-c-config.in
+===================================================================
+--- xmlrpc-c-1.06.03.orig/xmlrpc-c-config.in
++++ xmlrpc-c-1.06.03/xmlrpc-c-config.in
+@@ -108,26 +108,31 @@ while test $# -gt 0; do
+       ;;
+     client|libwww-client)
+       # libwww-client is for backward compatibility
+-      the_libs="-lxmlrpc_client $the_libs"
+ 
+-      if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
+-        the_libs="@WININET_LDADD@ $the_libs"
+-        the_rpath="@WININET_RPATH@ $the_rpath"
+-        the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath"
+-      fi
+-      if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then
+-        the_libs="@CURL_LDADD@ $the_libs"
+-        the_rpath="@CURL_RPATH@ $the_rpath"
+-        the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath"
+-      fi
+-      if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then
+-        the_libs="@LIBWWW_LDADD@ $the_libs"
+-        the_rpath="@LIBWWW_RPATH@ $the_rpath"
+-        the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
+-      fi
+-      if test "${needCpp}" = "yes"; then
+-        the_libs="-lxmlrpc_client++ $the_libs"
++      if test "${MUST_BUILD_WININET_CLIENT}" = "yes" || \
++         test "${MUST_BUILD_CURL_CLIENT}" = "yes" || \
++         test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then
++        the_libs="-lxmlrpc_client $the_libs"
++
++        if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
++          the_libs="@WININET_LDADD@ $the_libs"
++          the_rpath="@WININET_RPATH@ $the_rpath"
++          the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath"
+         fi
++        if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then
++          the_libs="@CURL_LDADD@ $the_libs"
++          the_rpath="@CURL_RPATH@ $the_rpath"
++          the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath"
++        fi
++        if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then
++          the_libs="@LIBWWW_LDADD@ $the_libs"
++          the_rpath="@LIBWWW_RPATH@ $the_rpath"
++          the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
++        fi
++        if test "${needCpp}" = "yes"; then
++          the_libs="-lxmlrpc_client++ $the_libs"
++        fi
++      fi
+       ;;
+     --version)
+       echo "@VERSION@"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.03.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.03.ebuild
index 9b0c227e1e5b..6850d578a127 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.03.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.03.ebuild,v 1.1 2006/08/12 07:37:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.03.ebuild,v 1.2 2006/08/12 09:50:36 hollow Exp $
 
 inherit eutils
 
@@ -35,7 +35,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}"/${PN}-1.06.03-cppmustbuildclient.patch
+	epatch "${FILESDIR}"/${PN}-1.06.03-mustbuildclient.patch
 }
 
 src_compile() {