Install tools, bug 242154. Install abyss server, bug 251718. Fix parallel make, bug 255440. Also, bump bug 256253.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 112 insertions, 3 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 1ed122f7fde4..979514653368 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.79 2009/04/11 08:37:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.80 2009/04/27 01:12:27 loki_val Exp $
+
+*xmlrpc-c-1.18.02 (27 Apr 2009)
+
+  27 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.18.02/dumpvalue.patch, +xmlrpc-c-1.18.02.ebuild:
+  Install tools, bug 242154. Install abyss server, bug 251718. Fix parallel
+  make, bug 255440. Also, bump bug 256253.
 
   11 Apr 2009; Joshua Kinard <kumba@gentoo.org> xmlrpc-c-1.16.06-r1.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index abba1f714e58..68a6e47bf0f8 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -11,15 +11,18 @@ AUX xmlrpc-c-1.06.27-gcc43-test-fix.patch 1045 RMD160 e86d11e2279fea066fd7709a68
 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-1.18.02/dumpvalue.patch 520 RMD160 63947d91c5498bd603db30cc7efa85440eefbe46 SHA1 343d0ead6deada7eba40ebf832fe2f21222e1cac SHA256 a53f6b2fb44db2775e704bacee04fbcf8b2d2ab6eea27407e2de44213f933404
 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.06.tar.bz2 570303 RMD160 11a6c3ac97a3c62d06ef297970a8df728c40210d SHA1 59dd0acdcc647a8e6eb99b3782d150ab1f965e67 SHA256 59c5cb4f4cfd5fdeb374afbd33d5ef6b229b35f127dcb632627544ca55186e04
+DIST xmlrpc-c-1.18.02.tar.bz2 552233 RMD160 efe2f03ae37512636d33c7d285c46d9050e9296b SHA1 b815899dff10d245b31257f434230f8e45f2446a SHA256 b59845ebbad959f86a349873fda75af02a69105a4e5c6a7eb40225358677411a
 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 2175 RMD160 7e82dfc8a0f25fad42c34c3d7120808cebff6ff3 SHA1 08100617507139e9c43ca9635378f6f19f584f11 SHA256 40a2138fb2820907a23d7f23ab548f963e7341e19b04425db089ffb8b1f844a6
 EBUILD xmlrpc-c-1.16.06.ebuild 2129 RMD160 e452fbfaa4b5be6e1214a4d60d48cfa5e057324a SHA1 bf646c6fefea588bbddea44ba6c1d792307e5751 SHA256 35159199349a31f0c8b2d38af9fbe08c4caa17122d20248c34578629e3e99eaa
-MISC ChangeLog 12869 RMD160 ab4e93c8ce45e2635dc73790498f1aecc8932b34 SHA1 f9227ba8fecbd37392af4992cd2aaec7c9ee1231 SHA256 2c5d14d1b67159439a90b7f8cd8c6a16092edf5ac3e33f25d2743aaaff6c3a7d
-MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
+EBUILD xmlrpc-c-1.18.02.ebuild 2269 RMD160 e8e1953d6c9f5d1e74d576e1775a0a38e1a59a88 SHA1 5cdf750f403a3999c2811fe48feedf5dc6b73b77 SHA256 18766c37b71774d54fdd28d91838c6b4549c98b723adf3a5a8096b5d70e504b3
+MISC ChangeLog 13147 RMD160 cc2866aea5cfb3e1cf5ac290ebe1f8125df5af11 SHA1 3b20dc21571616a989ed37cf762371724fdb59b9 SHA256 825c377642cfe98a76a1746af35aa8ed9fb60f4e04c39c23e63e55081f8b1151
+MISC metadata.xml 499 RMD160 f9d1d3c58837e9713d01117b860658db99565b11 SHA1 66be7900342b06c05c2d951643d83f054a89924e SHA256 d012b1b4909db4b540a1c8f3f27732cf2feef8e3060d63e2ac211ae0880a7e8d
diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml
index 762741c0ab18..495fab96191f 100644
--- a/dev-libs/xmlrpc-c/metadata.xml
+++ b/dev-libs/xmlrpc-c/metadata.xml
@@ -6,4 +6,9 @@
 		<email>loki_val@gentoo.org</email>
 		<name>Peter Alfredsen</name>
 	</maintainer>
+	<use>
+		<flag name='tools'>Build the xmlrpc* tools.</flag>
+		<flag name='abyss'>Build the Abyss mini web-server.</flag>
+		<flag name='threads'>Controls whether to build the Abyss web-server with pthreads or fork 'threading'.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
new file mode 100644
index 000000000000..ef5b226fc018
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
@@ -0,0 +1,94 @@
+# 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.18.02.ebuild,v 1.1 2009/04/27 01:12:27 loki_val Exp $
+
+EAPI=2
+
+inherit eutils multilib base autotools
+
+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=" ~amd64 ~arm ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="+curl +cxx +tools +cgi abyss threads"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="dev-libs/libxml2
+	tools? ( dev-perl/frontier-rpc )
+	curl? ( net-misc/curl )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use curl
+	then
+		ewarn "Curl support disabled: No client library will be be built"
+	fi
+}
+
+#Bug 214137: We need to filter this.
+unset SRCDIR
+
+PATCHES=( "${FILESDIR}/${P}/dumpvalue.patch" )
+
+src_prepare() {
+	base_src_util autopatch
+
+	# 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
+	eautoconf
+}
+
+src_configure() {
+	# Respect the user's LDFLAGS.
+	export LADD=${LDFLAGS}
+	econf	--disable-wininet-client \
+		--disable-libwww-client \
+		--enable-libxml2-backend \
+		$(use_enable tools) \
+		$(use_enable threads abyss-threads) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable curl curl-client) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "Compiling failed"
+}
+
+src_test() {
+	if use abyss
+	then
+		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"
+
+		if use cpp
+		then
+			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"
+		fi
+	else
+		elog "Running of tests in ${PN} fails unless USE='abyss' is set."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+}