Bump, bug 246083. Also solves bug 235989 (!!).

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

7 files changed, 244 insertions, 12 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 1b84f7279723..6c6fac50178e 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,15 @@
 # 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.72 2008/08/24 19:50:12 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.73 2008/11/29 17:18:22 loki_val Exp $
+
+*xmlrpc-c-1.16.04 (29 Nov 2008)
+
+  29 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.16.04-abyss-disable.patch,
+  +files/xmlrpc-c-1.16.04-compile.patch,
+  +files/xmlrpc-c-1.16.04-cpplinking.patch,
+  +files/xmlrpc-c-1.16.04-linking-order.patch, +xmlrpc-c-1.16.04.ebuild:
+  Bump, bug 246083. Also solves bug 235989 (!!).
 
 *xmlrpc-c-1.15.05 (24 Aug 2008)
 
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index f4e9fa09ded1..70a4acb343ef 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,6 +1,3 @@
------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
@@ -12,19 +9,18 @@ AUX xmlrpc-c-1.06.27-abyss-header-fixup.patch 896 RMD160 a9e536a19d78dad7040f945
 AUX xmlrpc-c-1.06.27-curl-easy-setopt.patch 800 RMD160 477121a69fbd1e4f923ec6e38cb86411d27e104b SHA1 17b92331be7d01854dcdb43b25fb0ce7733c4b7c SHA256 988cb420a9bac9bb62038158174c0d1b75ab4249526b71c202b7b55cee468961
 AUX xmlrpc-c-1.06.27-gcc43-test-fix.patch 1045 RMD160 e86d11e2279fea066fd7709a681b32a3ec01bc50 SHA1 16e4bd8a33cb6ff0d94d65e2d540f1400b424e37 SHA256 ddf21cad0ae3a44ae3d626bf34672e65c7bb37c8b652d04c87565bdd05f753e5
 AUX xmlrpc-c-1.14.07-abyss-disable.patch 677 RMD160 14904bb01c95451e1dd66ae0dce798ce31f73087 SHA1 2ffbfdcd98f134d51d52a0a7c3fc9f02985913bf SHA256 d53b2aeff24513f178f61101c188dd5fc9802d68f58b290d9860d4ca4967c30e
+AUX xmlrpc-c-1.16.04-abyss-disable.patch 715 RMD160 f578947b5f3389ad2c5cd39215deeee142089f06 SHA1 7a7b622d2c7b2c6d1842187f3181e7a9729d9d63 SHA256 b9d86d8b3084cb4c8f7d703ab2fd6e30d540a104667debae74ea47e76f6c2876
+AUX xmlrpc-c-1.16.04-compile.patch 1042 RMD160 a758a872cc3e425b6e51e197c631198107d2ceaf SHA1 43586f13268c4e7f0bee222912d634f7cc55beda SHA256 d7e88f32fbff83809397fe35a64b92e039d594fb7f6a8fa120a55644a4cb969a
+AUX xmlrpc-c-1.16.04-cpplinking.patch 619 RMD160 a70ff1f835720a85a43e1d6fe169f4910d4aa1c0 SHA1 713b12915a4401d3e33bbdede214f64b8a30dd44 SHA256 eaca1e07c75f9d4ea62fa122a139a8ee2924aeef1a8113ec270de3c24d249815
+AUX xmlrpc-c-1.16.04-linking-order.patch 2980 RMD160 0c14ba95e69ee10b852f2f6eea226c6f36356b16 SHA1 ef3f56bd8f70082ae92760554343da0364b551d4 SHA256 3a6ad4704dbb991d277c051751e31f7461909beefba1bcf8a714fe1a90c0f333
 AUX xmlrpc-c-gcc43.patch 3386 RMD160 7260a649337849caa2784f0ecdbe9a64e31215a7 SHA1 a90b4ba1ad7ba793dce640f62c15cdb46ee5d36f SHA256 d34c3c5e7b7fbcba19a1abdb1afafdeaebb32fff7300981027c6ed247eb80092
 DIST xmlrpc-1.06.27.tgz 699510 RMD160 65803ad240331182ecdddf442c0da80669ae3292 SHA1 7dc857eb411b2acf04a127ee5623e0961633bfac SHA256 04e81ec9f4b0e586be41ccffd402f42b6c268ec2fc7875d44fcbb4ba7a660378
 DIST xmlrpc-c-1.14.07.tar.bz2 553066 RMD160 6bc4628c1e9bceffc4b767ee28deca970620d682 SHA1 d47fe18dad11162492262a351a94721d2fcf19b9 SHA256 a49631fad33aa9a7f822f88fa87bfb53d53b4629cc40eec22e297071ab35bbee
 DIST xmlrpc-c-1.15.05.tar.bz2 565142 RMD160 493a17a4d7b78b49a63d0f6f46363c0a52933b83 SHA1 8b3c3530a5980b69f061328c46c876506625565a SHA256 75e2fdc3f7a8c32cba4ed2923479b01cabfbedebe5bd8fb0333df36da7db4ed8
+DIST xmlrpc-c-1.16.04.tar.bz2 570248 RMD160 02b4c4eaeac2cb68127f34dabdf852f7c33031b1 SHA1 d548ba6871588e85eede30d19f3d83d3e168b7a4 SHA256 25d69b4535a3e54f6daa7b2ad722f56b5de25d1fc6e3fd8b3c390c66bddf0368
 EBUILD xmlrpc-c-1.06.27.ebuild 2213 RMD160 f68f0248e88fc2dd5c77d30b5d25678f335c034e SHA1 9e2bb999540321c145b825ef4a9191554c4ebb2f SHA256 31cdbde6bdadb5b9912a6df373dbc8acb12865f8e9a88863bec7ce8855881a28
 EBUILD xmlrpc-c-1.14.07-r1.ebuild 2205 RMD160 4a18dadb6c97251cf68048a3835a631c3b54ba15 SHA1 88e32c21adbfc71947d9a023dc9ca8e10b039188 SHA256 2b1fb15ae8dec4a256e83281ca797da21c4b224950b641894918969969775a8b
 EBUILD xmlrpc-c-1.15.05.ebuild 2148 RMD160 35620f571e27181d071952de10633a0fc3864db2 SHA1 677cb362dd56bc4d6cd20473fae69abc3df61fe3 SHA256 598b92e5941760d69f9291dd9c2d848541afdf804f9ec72780d8c926c4323254
-MISC ChangeLog 11181 RMD160 c468b0a4853e8598943f9842043cd277755a9661 SHA1 86412472d5b1208e951bcb9f42e37d2fdde5e32f SHA256 431e4f5e1dc043fe06df49d5a40c9a2248143bcd88342afe99519e86b8bc7137
+EBUILD xmlrpc-c-1.16.04.ebuild 2249 RMD160 fd65ba6f9383feffa9e2ab4281dcb88ac911715a SHA1 bf7e3248a667e82006a911c8019c48e9dbf2ad3d SHA256 13d7df2dc8070100121c6f5473d5a1e9781050af85764cba6cd94cda1b79783b
+MISC ChangeLog 11522 RMD160 b5685a49bd45fe4702a197bf14e429f273926058 SHA1 ee1ffa2e5918ce7601a51b21364f885f894fde30 SHA256 a2985783e35b76367f75964691fc3ea5bb55b9c628f49aaf610505b4e0cd0788
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkQEjAACgkQ67wieSYcaxd5vACgmFHOCT4JcLEiCvpfWSSj1YUt
-TF8AnAnmBm9LaTQFeDvzs3thChHczuyf
-=qJ/D
------END PGP SIGNATURE-----
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch
new file mode 100644
index 000000000000..baa4d1a6f5c9
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch
@@ -0,0 +1,23 @@
+diff -NrU5 xmlrpc-c-1.16.04.orig/src/cpp/Makefile xmlrpc-c-1.16.04/src/cpp/Makefile
+--- xmlrpc-c-1.16.04.orig/src/cpp/Makefile	2008-11-29 14:34:40.000000000 +0100
++++ xmlrpc-c-1.16.04/src/cpp/Makefile	2008-11-29 14:36:19.000000000 +0100
+@@ -15,15 +15,18 @@
+ 
+ TARGET_LIB_NAMES_PP = \
+   libxmlrpc_cpp \
+   lib$(LIBXMLRPCPP_NAME) \
+   libxmlrpc_server++ \
+-  libxmlrpc_server_abyss++ \
+   libxmlrpc_server_cgi++ \
+   libxmlrpc_server_pstream++ \
+   libxmlrpc_packetsocket \
+ 
++ifeq ($(ENABLE_ABYSS_SERVER),yes)
++  TARGET_LIB_NAMES_PP += libxmlrpc_server_abyss++
++endif
++
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+   TARGET_LIB_NAMES_PP += libxmlrpc_client++
+ endif
+ 
+ STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES)
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch
new file mode 100644
index 000000000000..42ceee9c34f5
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch
@@ -0,0 +1,28 @@
+diff -NrU5 xmlrpc-c-1.16.04.orig/src/cpp/server_cgi.cpp xmlrpc-c-1.16.04/src/cpp/server_cgi.cpp
+--- xmlrpc-c-1.16.04.orig/src/cpp/server_cgi.cpp	2008-11-29 17:31:12.000000000 +0100
++++ xmlrpc-c-1.16.04/src/cpp/server_cgi.cpp	2008-11-29 17:32:20.000000000 +0100
+@@ -12,10 +12,11 @@
+    Contributed to the public domain by its author.
+ =============================================================================*/
+ 
+ #include <memory>
+ #include <stdio.h>
++#include <cstdlib>
+ 
+ #include "xmlrpc-c/girerr.hpp"
+ using girerr::throwf;
+ #include "xmlrpc-c/server_cgi.hpp"
+ 
+@@ -34,11 +35,11 @@
+     unsigned int contentLength;
+     bool contentLengthPresent;
+     bool authCookiePresent;
+     string authCookie;
+ 
+-    httpInfo::httpInfo() {
++    httpInfo() {
+ 
+         const char * const requestMethodC = getenv("REQUEST_METHOD");
+         const char * const contentTypeC   = getenv("CONTENT_TYPE");
+         const char * const contentLengthC = getenv("CONTENT_LENGTH");
+         const char * const authCookieC    = getenv("HTTP_COOKIE_AUTH");
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch
new file mode 100644
index 000000000000..67e58f0120be
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch
@@ -0,0 +1,16 @@
+diff -NrU5 xmlrpc-c-1.16.04.orig/common.mk xmlrpc-c-1.16.04/common.mk
+--- xmlrpc-c-1.16.04.orig/common.mk	2008-11-29 17:37:48.000000000 +0100
++++ xmlrpc-c-1.16.04/common.mk	2008-11-29 17:38:06.000000000 +0100
+@@ -265,11 +265,11 @@
+ 
+ $(TARGET_MODS:%=%.osh):%.osh:%.c
+ 	$(CC) -c -o $@ $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $<
+ 
+ $(TARGET_MODS_PP:%=%.o):%.o:%.cpp
+-	$(CXX) -c -o $@ $(INCLUDES) $(CXXFLAGS) $<
++	$(CXX) -c -o $@ $(INCLUDES) $(CFLAGS_SHLIB) $(CXXFLAGS) $<
+ 
+ $(TARGET_MODS_PP:%=%.osh): CXXFLAGS_COMMON += $(CFLAGS_SHLIB)
+ 
+ $(TARGET_MODS_PP:%=%.osh):%.osh:%.cpp
+ 	$(CXX) -c -o $@ $(INCLUDES) $(CXXFLAGS) $<
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch
new file mode 100644
index 000000000000..cd169c5f4fd6
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch
@@ -0,0 +1,71 @@
+diff -NrU5 xmlrpc-c-1.16.04.orig/common.mk xmlrpc-c-1.16.04/common.mk
+--- xmlrpc-c-1.16.04.orig/common.mk	2008-11-29 17:31:12.000000000 +0100
++++ xmlrpc-c-1.16.04/common.mk	2008-11-29 17:35:25.000000000 +0100
+@@ -134,14 +134,14 @@
+   TARGET_SHARED_LE_LIBS =
+ endif
+ 
+ #------ the actual rules ----------------------------------------------------
+ $(TARGET_SHARED_LIBRARIES) dummyshlib:
+-	$(CCLD) $(LDFLAGS_SHLIB) $(LIBDEP) -o $@ $(LIBOBJECTS) $(LADD)
++	$(CCLD) $(LADD) $(LDFLAGS_SHLIB) $(LIBOBJECTS)  $(LIBDEP) -o $@  
+ 
+ $(TARGET_SHARED_LIBS_PP) dummyshlibpp:
+-	$(CXXLD) $(LDFLAGS_SHLIB) $(LIBDEP) -o $@ $(LIBOBJECTS) $(LADD)
++	$(CXXLD) $(LADD) $(LDFLAGS_SHLIB) $(LIBOBJECTS)  $(LIBDEP) -o $@  
+ #----------------------------------------------------------------------------
+ 
+ LIBXMLRPC_UTIL_DIR = $(BLDDIR)/lib/libutil
+ 
+ ifneq ($(OMIT_LIBXMLRPC_UTIL_RULE),Y)
+diff -NrU5 xmlrpc-c-1.16.04.orig/dylib-common.make xmlrpc-c-1.16.04/dylib-common.make
+--- xmlrpc-c-1.16.04.orig/dylib-common.make	2008-11-29 17:31:12.000000000 +0100
++++ xmlrpc-c-1.16.04/dylib-common.make	2008-11-29 17:35:25.000000000 +0100
+@@ -3,13 +3,13 @@
+ # See unix-common.make for an explanation of this file.  This file is
+ # analogous to unix-common.make, but is for an Irix system.
+ 
+ SONAME = $(@:%.$(MIN)=%)
+ 
+-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
++SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
+ 
+-SHLIBPP_CMD = $(CXXLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
++SHLIBPP_CMD = $(CXXLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
+ 
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%.$(SHLIB_SUFFIX):%.$(MAJ).$(MIN).$(SHLIB_SUFFIX)
+ 	rm -f $@
+diff -NrU5 xmlrpc-c-1.16.04.orig/irix-common.make xmlrpc-c-1.16.04/irix-common.make
+--- xmlrpc-c-1.16.04.orig/irix-common.make	2008-11-29 17:31:12.000000000 +0100
++++ xmlrpc-c-1.16.04/irix-common.make	2008-11-29 17:35:25.000000000 +0100
+@@ -3,11 +3,11 @@
+ # See unix-common.make for an explanation of this file.  This file is
+ # analogous to unix-common.make, but is for an Irix system.
+ 
+ SONAME = $(@:%.$(MAJ):%)
+ 
+-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
++SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
+ 
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%:%.$(MAJ)
+ 	rm -f $@
+diff -NrU5 xmlrpc-c-1.16.04.orig/unix-common.make xmlrpc-c-1.16.04/unix-common.make
+--- xmlrpc-c-1.16.04.orig/unix-common.make	2008-11-29 17:31:12.000000000 +0100
++++ xmlrpc-c-1.16.04/unix-common.make	2008-11-29 17:35:25.000000000 +0100
+@@ -49,11 +49,11 @@
+ # SONAME is the name of the library file being built, with the minor
+ #   version number cut off.  E.g. if we're building libfoo.so.1.2, SONAME
+ #   is libfoo.so.1 .
+ SONAME = $(@:%.$(MIN)=%)
+ 
+-SHLIB_CMD = $(CCLD) $(LDFLAGS_SHLIB) -o $@ $^ $(LADD)
++SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 
+ 
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%:%.$(MAJ).$(MIN)
+ 	rm -f $@
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.16.04.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.04.ebuild
new file mode 100644
index 000000000000..f9d5aa1592b6
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.04.ebuild
@@ -0,0 +1,89 @@
+# 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.16.04.ebuild,v 1.1 2008/11/29 17:18:22 loki_val Exp $
+
+EAPI=1
+
+inherit eutils multilib base
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+SRC_URI="mirror://gentoo/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="+curl +cxx"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="dev-libs/libxml2
+	curl? ( net-misc/curl )"
+
+pkg_setup() {
+	if ! use curl
+	then
+		ewarn "Curl support disabled: No client library will be be built"
+	fi
+}
+
+#FAIL
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch"
+	"${FILESDIR}/${P}-compile.patch"
+	"${FILESDIR}/${P}-linking-order.patch"
+	"${FILESDIR}/${P}-cpplinking.patch" )
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	# Respect the user's CFLAGS/CXXFLAGS.
+	sed -i \
+		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
+		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
+		"${S}"/common.mk || die "404. File not found while sedding"
+
+	sed -i \
+		-e "/^LIBINST_DIR = / s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" \
+		config.mk.in
+}
+
+src_compile() {
+	#Bug 214137: We need to filter this.
+	unset SRCDIR
+
+	# Respect the user's LDFLAGS.
+	export LADD=${LDFLAGS}
+	econf	--disable-wininet-client \
+		--enable-libxml2-backend \
+		--disable-libwww-client \
+		--disable-abyss-server \
+		--enable-cgi-server \
+		--disable-abyss-threads \
+		$(use_enable cxx cplusplus) \
+		$(use_enable curl curl-client) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	unset LDFLAGS LADD SRCDIR
+	cd "${S}"/src/test/
+	einfo "Building general tests"
+	make || die "Make of general tests failed"
+	einfo "Running general tests"
+	./test || die "General tests failed"
+
+	cd "${S}"/src/cpp/test
+	einfo "Building C++ tests"
+	make || die "Make of C++ tests failed"
+	einfo "Running C++ tests"
+	./test || die "C++ tests failed"
+}
+
+src_install() {
+	unset SRCDIR
+	emake -j1 DESTDIR="${D}" install || die "installation failed"
+
+	dodoc README doc/CREDITS doc/DEVELOPING doc/HISTORY doc/SECURITY doc/TESTING \
+		doc/TODO || die "installing docs failed"
+}