Add new version. Upstream accepted our fixes from .04. New fixes included fixing bug 246749.

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64)

7 files changed, 110 insertions, 144 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 6c6fac50178e..185b60e1ea8b 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,18 @@
 # 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.73 2008/11/29 17:18:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.74 2008/12/03 00:41:47 loki_val Exp $
+
+*xmlrpc-c-1.16.06 (03 Dec 2008)
+
+  03 Dec 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,
+  +files/xmlrpc-c-1.16.06-no-undefined.patch, -xmlrpc-c-1.16.04.ebuild,
+  +xmlrpc-c-1.16.06.ebuild:
+  Add new version. Upstream accepted our fixes from .04. New fixes included
+  fixing bug 246749.
 
 *xmlrpc-c-1.16.04 (29 Nov 2008)
 
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
deleted file mode 100644
index baa4d1a6f5c9..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-abyss-disable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 42ceee9c34f5..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-compile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 67e58f0120be..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-cpplinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index cd169c5f4fd6..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.04-linking-order.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/files/xmlrpc-c-1.16.06-no-undefined.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-no-undefined.patch
new file mode 100644
index 000000000000..59460d628a4b
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-no-undefined.patch
@@ -0,0 +1,95 @@
+diff -NrU5 xmlrpc-c-1.16.06.orig/src/cpp/Makefile xmlrpc-c-1.16.06/src/cpp/Makefile
+--- xmlrpc-c-1.16.06.orig/src/cpp/Makefile	2008-12-02 23:54:23.000000000 +0100
++++ xmlrpc-c-1.16.06/src/cpp/Makefile	2008-12-03 01:22:44.000000000 +0100
+@@ -110,28 +110,33 @@
+ # shlibfn generates e.g. libxmlrpc.so.3.1
+ # shliblefn generates e.g. libxmlrpc.so
+ 
+ LIBXMLRPC_CPP_SH = $(call shlibfn, libxmlrpc_cpp)
+ 
+-$(LIBXMLRPC_CPP_SH): XmlRpcCpp.osh
++$(LIBXMLRPC_CPP_SH): XmlRpcCpp.osh \
++  $(LIBXMLRPC_UTIL)
+ $(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh
+-$(LIBXMLRPC_CPP_SH): LIBDEP = -Lblddir/src -lxmlrpc
++$(LIBXMLRPC_CPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -lxmlrpc_server -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+ 
+ LIBXMLRPCPP_SH = $(call shlibfn, lib$(LIBXMLRPCPP_NAME))
+ 
+ $(LIBXMLRPCPP_SH): $(LIBXMLRPCPP_MODS:%=%.osh) \
+-  $(LIBXMLRPC)
++  $(LIBXMLRPC) \
++  $(LIBXMLRPC_UTIL)
+ $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
+-$(LIBXMLRPCPP_SH): LIBDEP = -Lblddir/src -lxmlrpc
++$(LIBXMLRPCPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
++
+ 
+ LIBXMLRPC_SERVERPP_SH = $(call shlibfn, libxmlrpc_server++)
+ 
+ $(LIBXMLRPC_SERVERPP_SH): $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) \
+   $(LIBXMLRPC_SERVER) \
++  $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
++  $(LIBXMLRPC_UTIL) \
+   $(LIBXMLRPC)
+ $(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh)
+-$(LIBXMLRPC_SERVERPP_SH): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc
++$(LIBXMLRPC_SERVERPP_SH): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -l$(LIBXMLRPCPP_NAME)
+ 
+ LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++)
+ 
+ $(LIBXMLRPC_SERVER_ABYSSPP_SH): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) \
+   $(LIBXMLRPC_ABYSS) \
+@@ -142,38 +147,46 @@
+ 
+ LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
+ 
+ $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \
+   $(call shliblefn, libxmlrpc_server++) \
+-  $(call shliblefn, libxmlrpc++) \
++  $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
+   $(LIBXMLRPC)
+ $(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh)
+ $(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \
+-  -L. -lxmlrpc_server++ -lxmlrpc++ -Lblddir/src -lxmlrpc
++  -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -Lblddir/src -lxmlrpc
+ 
+ LIBXMLRPC_SERVER_PSTREAMPP_SH = $(call shlibfn, libxmlrpc_server_pstream++)
+ 
+ $(LIBXMLRPC_SERVER_PSTREAMPP_SH): $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) \
+   $(LIBXMLRPC_SERVER) \
+-  $(call shliblefn, libxmlrpc_packetsocket)
++  $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
++  $(call shliblefn, libxmlrpc_packetsocket) \
++  $(call shliblefn, libxmlrpc_server++)
+ $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh)
+ $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \
+-  -Lblddir/src -lxmlrpc_server -L. -lxmlrpc_packetsocket
++  -Lblddir/src -lxmlrpc_server -L. -lxmlrpc_packetsocket -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME)
+ 
+ LIBXMLRPC_CLIENTPP_SH = $(call shlibfn, libxmlrpc_client++)
+ 
+ $(LIBXMLRPC_CLIENTPP_SH): $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) \
++  $(LIBXMLRPC_UTIL) \
++  $(call shliblefn, libxmlrpc_packetsocket) \
+   $(call shliblefn, libxmlrpc++) \
++  $(LIBXMLRPC) \
++  $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
+   $(LIBXMLRPC_CLIENT)
+ $(LIBXMLRPC_CLIENTPP_SH): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh)
+ $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \
+-  -L. -l$(LIBXMLRPCPP_NAME) -Lblddir/src -lxmlrpc_client
++  -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket -Lblddir/src -lxmlrpc_client -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+ 
+ LIBXMLRPC_PACKETSOCKET_SH = $(call shlibfn, libxmlrpc_packetsocket)
+ 
+-$(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
++$(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) \
++  $(call shliblefn, lib$(LIBXMLRPCPP_NAME))
+ $(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
++$(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = -L. -l$(LIBXMLRPCPP_NAME)
+ 
+ libxmlrpc_cpp.a: XmlRpcCpp.o
+ libxmlrpc_cpp.a: LIBOBJECTS = XmlRpcCpp.o
+ 
+ lib$(LIBXMLRPCPP_NAME).a: $(LIBXMLRPCPP_MODS:%=%.o)
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.16.04.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06.ebuild
index f9d5aa1592b6..13896e84b671 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.16.04.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06.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.16.04.ebuild,v 1.1 2008/11/29 17:18:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06.ebuild,v 1.1 2008/12/03 00:41:47 loki_val Exp $
 
 EAPI=1
 
@@ -28,10 +28,7 @@ pkg_setup() {
 #FAIL
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch"
-	"${FILESDIR}/${P}-compile.patch"
-	"${FILESDIR}/${P}-linking-order.patch"
-	"${FILESDIR}/${P}-cpplinking.patch" )
+PATCHES=( "${FILESDIR}/${P}-no-undefined.patch" )
 
 src_unpack() {
 	base_src_unpack