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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-rc9 x86_64

4 files changed, 115 insertions, 3 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/Manifest b/dev-libs/xmlrpc-c/Manifest
index 5a818d5dae70..8b7eedab0115 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -10,6 +10,7 @@ AUX xmlrpc-c-1.06.27-curl-easy-setopt.patch 800 RMD160 477121a69fbd1e4f923ec6e38
 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.06-no-undefined.patch 4156 RMD160 43f01e103184ccb852edea8b8e48bcba43b6a81e SHA1 f5fad59e19a890b7fd90d2decfb851e710f75cb0 SHA256 ea17a1033716982efeb4fef65dadf3e70fb2ced48d2f24b29266deec01cd10dd
+AUX xmlrpc-c-1.16.06-parallel-make.patch 623 RMD160 0aae3d0d180d1ba225609ebe0972e6a7ee445f37 SHA1 f9248d404bf5aaaa6dce86381ead78b82570f10b SHA256 91a9fc9523217d1cd548ece5d6682f3d29ed7c3d77bf9e22810b9d561221d7ba
 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
@@ -18,6 +19,7 @@ DIST xmlrpc-c-1.16.06.tar.bz2 570303 RMD160 11a6c3ac97a3c62d06ef297970a8df728c40
 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
+EBUILD xmlrpc-c-1.16.06-r1.ebuild 2172 RMD160 d6fdd0e62b44bee0b6079223a67a7dfcfd6be1f7 SHA1 560eec7d7bcefed5a442f9c8d5ec3246dc763437 SHA256 e8154666c3e296e064d9d30888ea1464b1c55172e60143cc3bc999f424b3dbdd
 EBUILD xmlrpc-c-1.16.06.ebuild 2129 RMD160 e452fbfaa4b5be6e1214a4d60d48cfa5e057324a SHA1 bf646c6fefea588bbddea44ba6c1d792307e5751 SHA256 35159199349a31f0c8b2d38af9fbe08c4caa17122d20248c34578629e3e99eaa
-MISC ChangeLog 12176 RMD160 54cedf5e32eb4e5224378c57e17d8717f038a85d SHA1 f94ca697ac19ebcb9d12eefc7eadee6b99c67f08 SHA256 bc3456feafbf4d76234243f081288660c3248bc1d06b102572b4f349465b7205
+MISC ChangeLog 12461 RMD160 b5dd08e4c49156284700fae3dcbb486516224e16 SHA1 7b19055ec401cff25a74c3ed9b9324faf19fbdcf SHA256 d81c2355d3a117b309d7c7822bda3e94a13d67ab7d50ec0128a16d3e2365e915
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
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"
+}