summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-07-31 17:38:35 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-07-31 17:38:35 +0000
commitb110b506ebeb6bf2b641ef7a6631a27aecf07d46 (patch)
treede2dbeb30009544ad6592084a6e5cfd1f89e9815
parentapp-misc category done wrt GLEP 56. (diff)
downloadgentoo-2-b110b506ebeb6bf2b641ef7a6631a27aecf07d46.tar.gz
gentoo-2-b110b506ebeb6bf2b641ef7a6631a27aecf07d46.tar.bz2
gentoo-2-b110b506ebeb6bf2b641ef7a6631a27aecf07d46.zip
Reverse the damage I've done, multilib patch caused libs to be installed into /usr/usr/lib64 on amd64, see bug 233468. This is not strict-multilib, but we'll deal with that later.
(Portage version: 2.2_rc5/cvs/Linux 2.6.25.8 i686)
-rw-r--r--dev-libs/xmlrpc-c/ChangeLog11
-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-r1.ebuild (renamed from dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild)5
3 files changed, 12 insertions, 16 deletions
diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index a198d4adc70d..41f5a191b8f4 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,15 @@
# 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.66 2008/07/30 08:41:19 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.67 2008/07/31 17:38:35 loki_val Exp $
+
+*xmlrpc-c-1.14.07-r1 (31 Jul 2008)
+
+ 31 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+ -files/xmlrpc-c-1.14.07-multilib.patch, -xmlrpc-c-1.14.07.ebuild,
+ +xmlrpc-c-1.14.07-r1.ebuild:
+ Reverse the damage I've done, multilib patch installed into /usr/usr/lib64
+ on amd64, see bug 233468. This is not strict-multilib, but we'll deal with
+ that later.
30 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+files/xmlrpc-c-1.14.07-multilib.patch, xmlrpc-c-1.14.07.ebuild:
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
deleted file mode 100644
index 5a2fea59bb41..000000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-r1.ebuild
index e132a9bd8b36..487d33148661 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07-r1.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.4 2008/07/30 08:41:19 loki_val Exp $
+# $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 $
EAPI=1
@@ -29,8 +29,7 @@ pkg_setup() {
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch"
- "${FILESDIR}/${P}-multilib.patch" )
+PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch" )
src_unpack() {
base_src_unpack