Make >=xmlrpc-c-1.14.07 multilib-strict safe. For real this time. Bug #233468, thanks to en.ABCD@gmail.com. Re-enable cxx useflag for >=xmlrpc-c-1.15.02. Disable running unneeded autotools, bug #233436, thanks to gentoobugsie@gmail.com.

(Portage version: 2.2_rc6/cvs/Linux 2.6.25.8 i686)

4 files changed, 29 insertions, 14 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index c77f45dbf765..8df9dc87b337 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,14 @@
 # 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.69 2008/08/02 21:43:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.70 2008/08/06 20:04:42 loki_val Exp $
+
+  06 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  xmlrpc-c-1.14.07-r1.ebuild, xmlrpc-c-1.15.02.ebuild,
+  xmlrpc-c-1.15.03.ebuild:
+  Make >=xmlrpc-c-1.14.07 multilib-strict safe. For real this time. Bug
+  #233468, thanks to en.ABCD@gmail.com. Re-enable cxx useflag for
+  >=xmlrpc-c-1.15.02. Disable running unneeded autotools, bug #233436,
+  thanks to gentoobugsie@gmail.com.
 
   02 Aug 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.27.ebuild:
   Stable on ppc64; bug #233123
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.ebuild
index 487d33148661..20ba22dbea98 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.14.07-r1.ebuild,v 1.1 2008/07/31 17:38:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.ebuild,v 1.2 2008/08/06 20:04:42 loki_val Exp $
 
 EAPI=1
 
-inherit eutils autotools base
+inherit eutils multilib base
 
 DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
 SRC_URI="mirror://gentoo/${PN}/${P}.tar.bz2"
@@ -40,7 +40,9 @@ src_unpack() {
 		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
 		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
 		"${S}"/Makefile.common
-	eautoreconf
+	sed -i \
+		-e "/^LIBINST_DIR = / s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" \
+		Makefile.config.in
 }
 
 src_compile() {
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.15.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.15.02.ebuild
index 9bffd6184828..f960cdc585b0 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.15.02.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.15.02.ebuild
@@ -1,17 +1,17 @@
 # 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.15.02.ebuild,v 1.1 2008/07/20 20:18:18 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.15.02.ebuild,v 1.2 2008/08/06 20:04:42 loki_val Exp $
 
 EAPI=1
 
-inherit eutils autotools base
+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"
+IUSE="+curl +cxx"
 LICENSE="BSD"
 SLOT="0"
 
@@ -39,7 +39,9 @@ src_unpack() {
 		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
 		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
 		"${S}"/common.mk || die "404. File not found while sedding"
-	eautoreconf
+	sed -i \
+		-e "/^LIBINST_DIR = / s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" \
+		config.mk.in
 }
 
 src_compile() {
@@ -54,7 +56,7 @@ src_compile() {
 		--disable-abyss-server \
 		--enable-cgi-server \
 		--disable-abyss-threads \
-		--enable-cplusplus \
+		$(use_enable cxx cplusplus) \
 		$(use_enable curl curl-client) \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.15.03.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.15.03.ebuild
index 6308fdb71a18..8d64f0cd2775 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.15.03.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.15.03.ebuild
@@ -1,17 +1,17 @@
 # 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.15.03.ebuild,v 1.1 2008/07/27 20:52:18 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.15.03.ebuild,v 1.2 2008/08/06 20:04:42 loki_val Exp $
 
 EAPI=1
 
-inherit eutils autotools base
+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"
+IUSE="+curl +cxx"
 LICENSE="BSD"
 SLOT="0"
 
@@ -39,7 +39,10 @@ src_unpack() {
 		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
 		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
 		"${S}"/common.mk || die "404. File not found while sedding"
-	eautoreconf
+
+	sed -i \
+		-e "/^LIBINST_DIR = / s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" \
+		config.mk.in
 }
 
 src_compile() {
@@ -54,7 +57,7 @@ src_compile() {
 		--disable-abyss-server \
 		--enable-cgi-server \
 		--disable-abyss-threads \
-		--enable-cplusplus \
+		$(use_enable cxx cplusplus) \
 		$(use_enable curl curl-client) \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"