summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-07-30 08:41:19 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-07-30 08:41:19 +0000
commit2f861faf5ed76ddd53cee58f593db943ae60bd69 (patch)
treefca068ceccb42e9a4480c08a246f72bab90e43ed /dev-libs/xmlrpc-c
parentVersion bump. (diff)
downloadgentoo-2-2f861faf5ed76ddd53cee58f593db943ae60bd69.tar.gz
gentoo-2-2f861faf5ed76ddd53cee58f593db943ae60bd69.tar.bz2
gentoo-2-2f861faf5ed76ddd53cee58f593db943ae60bd69.zip
Fixup for multilib, bug #233143.
(Portage version: 2.2_rc4/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'dev-libs/xmlrpc-c')
-rw-r--r--dev-libs/xmlrpc-c/ChangeLog6
-rw-r--r--dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-multilib.patch12
-rw-r--r--dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild5
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 3cf4c69c3be7..a198d4adc70d 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,10 @@
# 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.65 2008/07/28 14:29:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.66 2008/07/30 08:41:19 loki_val Exp $
+
+ 30 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/xmlrpc-c-1.14.07-multilib.patch, xmlrpc-c-1.14.07.ebuild:
+ Fixup for multilib, bug #233143.
28 Jul 2008; Raúl Porcel <armin76@gentoo.org> xmlrpc-c-1.06.27.ebuild:
alpha/ia64/x86 stable wrt #233123
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-multilib.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-multilib.patch
new file mode 100644
index 000000000000..5a2fea59bb41
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-multilib.patch
@@ -0,0 +1,12 @@
+diff -urN xmlrpc-c-1.14.07.old/Makefile.config.in xmlrpc-c-1.14.07/Makefile.config.in
+--- xmlrpc-c-1.14.07.old/Makefile.config.in 2008-03-27 14:17:42.000000000 -0400
++++ xmlrpc-c-1.14.07/Makefile.config.in 2008-07-27 23:52:02.241422830 -0400
+@@ -292,7 +292,7 @@
+ # PREFIX is designed to be overridden at make time if the user decides
+ # he doesn't like the default specified at 'configure' time.
+
+-LIBINST_DIR = $(PREFIX)/lib
++LIBINST_DIR = $(PREFIX)/@libdir@
+ HEADERINST_DIR = $(PREFIX)/include
+ PROGRAMINST_DIR = $(PREFIX)/bin
+
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
index 16fff2195c8b..e132a9bd8b36 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.3 2008/07/27 20:55:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild,v 1.4 2008/07/30 08:41:19 loki_val Exp $
EAPI=1
@@ -29,7 +29,8 @@ pkg_setup() {
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch" )
+PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch"
+ "${FILESDIR}/${P}-multilib.patch" )
src_unpack() {
base_src_unpack