Fix bug 251850, parallel make issue that would cause xmlrpc.h to not be installed. Thanks to Diego for the report.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-rc9 x86_64)

3 files changed, 112 insertions, 2 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index ca9ead081199..8c39e7226c3f 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2008/12/03 13:30:17 loki_val Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.76 2009/01/02 20:49:08 loki_val Exp $
+
+*xmlrpc-c-1.16.06-r1 (02 Jan 2009)
+
+  02 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.16.06-parallel-make.patch, +xmlrpc-c-1.16.06-r1.ebuild:
+  Fix bug 251850, parallel make issue that would cause xmlrpc.h to not be
+  installed. Thanks to Diego for the report.
 
   03 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
   xmlrpc-c-1.16.06.ebuild:
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-parallel-make.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-parallel-make.patch
new file mode 100644
index 000000000000..9f9d0569f612
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.16.06-parallel-make.patch
@@ -0,0 +1,16 @@
+diff -NrU5 xmlrpc-c-1.16.06.orig/include/Makefile xmlrpc-c-1.16.06/include/Makefile
+--- xmlrpc-c-1.16.06.orig/include/Makefile	2009-01-02 21:01:23.000000000 +0100
++++ xmlrpc-c-1.16.06/include/Makefile	2009-01-02 21:03:41.000000000 +0100
+@@ -117,11 +117,11 @@
+ default: all
+ 
+ all:
+ 
+ .PHONY: install-compat-hdr
+-install-compat-hdr:
++install-compat-hdr: install-headers
+ # Install old names of header files for backward compatibility
+ 	cd $(DESTDIR)$(HEADERINST_DIR); \
+ 	  rm -f xmlrpc.h xmlrpc_client.h xmlrpc_server.h xmlrpc_cgi.h \
+                 xmlrpc_server_abyss.h xmlrpc_abyss.h \
+ 		xmlrpc_server_w32httpsys.h \
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06-r1.ebuild
new file mode 100644
index 000000000000..03d038b938cf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.16.06-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 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.06-r1.ebuild,v 1.1 2009/01/02 20:49:08 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}-no-undefined.patch"
+	"${FILESDIR}/${P}-parallel-make.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 || 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 DESTDIR="${D}" install || die "installation failed"
+
+	dodoc README doc/CREDITS doc/DEVELOPING doc/HISTORY doc/SECURITY doc/TESTING \
+		doc/TODO || die "installing docs failed"
+}