version bump; fix #142231

Package-Manager: portage-2.1.1_pre2-r7

6 files changed, 104 insertions, 3 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index ba13a8eb6f6e..b997187b10ff 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.15 2006/07/06 00:13:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.16 2006/07/31 06:35:57 hollow Exp $
+
+*xmlrpc-c-1.06.02 (31 Jul 2006)
+
+  31 Jul 2006; Benedikt Böhm <hollow@gentoo.org>
+  +files/xmlrpc-c-1.06.02-strsol.patch,
+  +files/xmlrpc-c-1.06.02-threadupdatestatus.patch,
+  -xmlrpc-c-1.03.14.ebuild, -xmlrpc-c-1.05.ebuild, -xmlrpc-c-1.05-r1.ebuild,
+  xmlrpc-c-1.05-r2.ebuild, +xmlrpc-c-1.06.02.ebuild:
+  version bump; fix #142231
 
 *xmlrpc-c-1.05-r2 (06 Jul 2006)
 
diff --git a/dev-libs/xmlrpc-c/files/digest-xmlrpc-c-1.06.02 b/dev-libs/xmlrpc-c/files/digest-xmlrpc-c-1.06.02
new file mode 100644
index 000000000000..4844349a0739
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/digest-xmlrpc-c-1.06.02
@@ -0,0 +1,3 @@
+MD5 6f5862419622c012a51ed660cc02240b xmlrpc-c-1.06.02.tgz 694938
+RMD160 11f4242e2ab8b090392fdda7289a61af3c6374ee xmlrpc-c-1.06.02.tgz 694938
+SHA256 5306ed297ba66279dddb8bf36ecc75a4aaa8535cadd0dd1aa5dc288ec581acb7 xmlrpc-c-1.06.02.tgz 694938
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch
new file mode 100644
index 000000000000..5de5751b8450
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch
@@ -0,0 +1,22 @@
+Index: xmlrpc-c-1.06.02/tools/Makefile.common
+===================================================================
+--- xmlrpc-c-1.06.02.orig/tools/Makefile.common
++++ xmlrpc-c-1.06.02/tools/Makefile.common
+@@ -1,6 +1,8 @@
+ # -*-makefile-*-    <-- an Emacs control
+ 
+-CLIENT_LDLIBS = -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc
++CLIENT_LDLIBS = -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util
++
++CLIENT_LDLIBS += -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc
+ 
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+   CLIENT_LDLIBS += $(shell libwww-config --libs)
+@@ -14,7 +16,6 @@ endif
+ 
+ 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/files/xmlrpc-c-1.06.02-threadupdatestatus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-threadupdatestatus.patch
new file mode 100644
index 000000000000..b52647316a6a
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-threadupdatestatus.patch
@@ -0,0 +1,16 @@
+Index: xmlrpc-c-1.06.02/lib/abyss/src/thread_fork.c
+===================================================================
+--- xmlrpc-c-1.06.02.orig/lib/abyss/src/thread_fork.c
++++ xmlrpc-c-1.06.02/lib/abyss/src/thread_fork.c
+@@ -281,11 +281,6 @@ ThreadForks(void) {
+ 
+ 
+ 
+-void
+-ThreadUpdateStatus(TThread * const threadP) {
+-    /* Necessary only for primitive Unix forking */
+-}
+-
+ 
+ /*********************************************************************
+ ** Mutex
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.05-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.05-r2.ebuild
index 3151e727c770..450d9986a410 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.05-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.05-r2.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.05-r2.ebuild,v 1.1 2006/07/06 00:13:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.05-r2.ebuild,v 1.2 2006/07/31 06:35:57 hollow Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/xmlrpc-c/${P}.tgz"
 HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
 
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="curl libwww"
+IUSE="curl libwww threads"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -40,6 +40,7 @@ src_unpack() {
 
 src_compile() {
 	econf --disable-wininet-client \
+		$(use_enable threads abyss-threads) \
 		$(use_enable curl curl-client) \
 		$(use_enable libwww libwww-client) || die "econf failed"
 	emake || die "emake failed"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.02.ebuild
new file mode 100644
index 000000000000..15d89754b0e4
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.02.ebuild
@@ -0,0 +1,50 @@
+# 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.02.ebuild,v 1.1 2006/07/31 06:35:57 hollow Exp $
+
+inherit eutils
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+SRC_URI="mirror://sourceforge/xmlrpc-c/${P}.tgz"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="curl libwww threads"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libc
+	dev-libs/libxml2
+	libwww? ( net-libs/libwww )
+	curl? ( net-misc/curl )"
+
+pkg_setup() {
+	# paralell make doesn't work
+	MAKEOPTS="-j1"
+
+	if ! use curl && ! use libwww; then
+		ewarn "Neither CURL nor libwww support was selected"
+		ewarn "No client library will be be built"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.05-pic.patch
+	epatch "${FILESDIR}"/${PN}-1.06.02-threadupdatestatus.patch
+	epatch "${FILESDIR}"/${PN}-1.06.02-strsol.patch
+}
+
+src_compile() {
+	econf --disable-wininet-client --enable-libxml2-backend \
+		$(use_enable threads abyss-threads) \
+		$(use_enable curl curl-client) \
+		$(use_enable libwww libwww-client) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}