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.

Package-Manager: portage-2.2_rc5/cvs/Linux 2.6.25.8 i686

4 files changed, 14 insertions, 19 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/Manifest b/dev-libs/xmlrpc-c/Manifest
index 5657047dc1ca..05f4294ddaa9 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -9,7 +9,6 @@ AUX xmlrpc-c-1.06.27-abyss-header-fixup.patch 896 RMD160 a9e536a19d78dad7040f945
 AUX xmlrpc-c-1.06.27-curl-easy-setopt.patch 800 RMD160 477121a69fbd1e4f923ec6e38cb86411d27e104b SHA1 17b92331be7d01854dcdb43b25fb0ce7733c4b7c SHA256 988cb420a9bac9bb62038158174c0d1b75ab4249526b71c202b7b55cee468961
 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.14.07-multilib.patch 532 RMD160 ca7841ca8560aed4e3993e2fdd65eddbd81e548e SHA1 4dac66629cdd34adc4a933bfc3317d244996f38d SHA256 422da6e37019cce823d23fd48e45a4752ba18af6517c5152b9d6f6ee08623b29
 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.06.09.tgz 680245 RMD160 0f8678f1f643ae6d78d445d96e7205e89b4d07c5 SHA1 9a6b902c61e9d8a76d66527562caa1d397c6addd SHA256 3dd759bb3fc2df519c51cfac605144f973e28603c1d9e028211212dc3dfd3f22
@@ -18,8 +17,8 @@ DIST xmlrpc-c-1.15.02.tar.bz2 565062 RMD160 e11ba444f9b03ccbe27772801b2016df4b6d
 DIST xmlrpc-c-1.15.03.tar.bz2 565107 RMD160 9c069e4c48e444f6148a626420cd9c3d90d75fcd SHA1 65eee4c492d33296b074e82c73753f4b6b889a1d SHA256 a019575b16aaa2f713df36dac1ffe2c382fe06fd918baf38db2a20a8db9d2f43
 EBUILD xmlrpc-c-1.06.09-r2.ebuild 1869 RMD160 a3a1393f2fb32f42b213b1156059e60537561d27 SHA1 deab9d879bd08e323b1b2528ba0328350f86cb1d SHA256 7c9c9a2f9fa6f9d3aa08dfed2eb3c5f847da8b1ab1dce18356ab1502c68737a7
 EBUILD xmlrpc-c-1.06.27.ebuild 2219 RMD160 af307ffc06ab4fd8a50b5fb7382caba7193a43cf SHA1 d2ab882d704f22a02858245c059aed7ae98bd8a8 SHA256 dac9bcff647d37be6f638e9f000333e334238eb855d505030475c82b4c613d9d
-EBUILD xmlrpc-c-1.14.07.ebuild 2150 RMD160 2244a291836e43452f72801e8206214e28358aa0 SHA1 16c4e40b14bd80b01ed5608336d8e256ac66d348 SHA256 fc12d602b8c50290914c3703d4816fafab9a46711f8226b8dbb441e4eb9a41b3
+EBUILD xmlrpc-c-1.14.07-r1.ebuild 2118 RMD160 fc0beb6dbdc08efd2eb35bfad57b7c3f601481ea SHA1 8a25e247959a4252156f17b893ef6de4c6ed60de SHA256 b6e4a3a4c50ccd5c9763b5819a8c7323fd2b2c13be8fb425ee6fc19bd3a1bb5a
 EBUILD xmlrpc-c-1.15.02.ebuild 2052 RMD160 746dc536fc10cf3b7e736f8f99042f5bc4b266ab SHA1 502beedb51b5940a0c031ea2c9d90d38429c575e SHA256 7bbacd441f7a7bcce652f14250cf49e17a5da8f410dd6f2a975fedb5d242bece
 EBUILD xmlrpc-c-1.15.03.ebuild 2052 RMD160 2b9a9084245f0214f7cbeff4e0b287646e12ade4 SHA1 d2a65fbbf5b9a0fbf9fe2a05dcaab0c61d6d8575 SHA256 9800b17f7c456bb046191076f2dd9143bad6a57bd7368cbab0aa2c5c207eef9a
-MISC ChangeLog 9897 RMD160 7ef7b951e3fc343514053523adaf0995ec6b56c9 SHA1 b534b9e3d403d2c897b4346fa719068b51970d67 SHA256 69724cc3b3b4950ca357ab67d5755f04ad3f3bbdc79ebbdd349909cf71b6ed81
+MISC ChangeLog 10254 RMD160 2f8808e76d6fe8aa7d9c9d2e180a234148fc4795 SHA1 7fa166d4ec8dd059f9cf0f9fc0ec13259242bade SHA256 cea5bc8e27718a684338cf093c4dec6e377e8314feef995bae15a0cd911f566d
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
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