Adding a sed to change the config.layout, as it screws up our PREFIX.

Package-Manager: portage-2.1.2.1

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index ab15c015cc004feb0727f37f930c4e29284ddbbd..2841bd227d2f4148d8d8814d6a768242d2d8d57e 100644 (file)
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.73 2007/03/07 09:12:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.74 2007/03/07 09:31:49 phreak Exp $
+
+  07 Mar 2007; Christian Heim <phreak@gentoo.org> apr-util-0.9.12-r1.ebuild:
+  Adding a sed to change the config.layout, as it screws up our PREFIX.
 
   07 Mar 2007; Christian Heim <phreak@gentoo.org> apr-util-0.9.12-r1.ebuild:
   Minor syn, whitespace cleanup.

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 9988c1a05e116505d8a23bc5f46c07b11d91cfad..c1277e9e1b8298437a6e55754d9dd411bf281bc1 100644 (file)
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -12,10 +12,10 @@ SHA256 57c40f62214094ab36b5e940e07bfbee5555ad6a08ab63947fd7f8e5c5875472 files/ap
 DIST apr-util-0.9.12.tar.gz 592364 RMD160 a4554def22f29f56aab34cacddc7fa65c412f446 SHA1 402969874b301d11252acd6eaf0bb01aad3e2908 SHA256 5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3
 DIST apr-util-0.9.13.tar.gz 593575 RMD160 34d6e517de6cb64e0b1aef45a99ee64f9ceba130 SHA1 079384f68d4efce2e74a3033adaae6bfc2bc3bad SHA256 8c5a2c9e0434a391360bbf3573a403a3f4f326d1b562f64276cbd4f92066da7f
 DIST apr-util-1.2.8.tar.gz 646379 RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 SHA1 49260d98b863756974bd83cd28bc39338d4f3a82 SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
-EBUILD apr-util-0.9.12-r1.ebuild 2006 RMD160 ef11c7c7ab653d125068ee0f17ad1be24394e232 SHA1 c47a4f28c2e7c6d933ef99c6195f9e3570b0e926 SHA256 9b7d5a7bb340ab3d46b612b9d676a2fa31ab521b07861f36e313104b3fedcaa5
-MD5 aaf313c90671c2666fdb00df97358b29 apr-util-0.9.12-r1.ebuild 2006
-RMD160 ef11c7c7ab653d125068ee0f17ad1be24394e232 apr-util-0.9.12-r1.ebuild 2006
-SHA256 9b7d5a7bb340ab3d46b612b9d676a2fa31ab521b07861f36e313104b3fedcaa5 apr-util-0.9.12-r1.ebuild 2006
+EBUILD apr-util-0.9.12-r1.ebuild 2174 RMD160 11fed1b52f1bf01e0e9eb1dbecf66e782594da4b SHA1 d97798ab5fbc2d11449a8c7fcfe23544d6bd4a09 SHA256 ecb5fcfd309b02fe09e75361c3eb8ebc5acfdf580b19deb95eee77ed3ec7289a
+MD5 2d3573fa52dd1c79d9f9cb8448c6b12f apr-util-0.9.12-r1.ebuild 2174
+RMD160 11fed1b52f1bf01e0e9eb1dbecf66e782594da4b apr-util-0.9.12-r1.ebuild 2174
+SHA256 ecb5fcfd309b02fe09e75361c3eb8ebc5acfdf580b19deb95eee77ed3ec7289a apr-util-0.9.12-r1.ebuild 2174
 EBUILD apr-util-0.9.12.ebuild 1981 RMD160 f8061b4fddeed4353b1eabc3ba78e454e4242591 SHA1 df898c90235b53f788c0b003f0f1abd7f397fa9a SHA256 7d49dbc3f06d894124688771a9a05ae16ed0d2b57a8d4ff4625eceaa794e65f8
 MD5 f8b63a33d21be99d441962fbd622c64f apr-util-0.9.12.ebuild 1981
 RMD160 f8061b4fddeed4353b1eabc3ba78e454e4242591 apr-util-0.9.12.ebuild 1981
@@ -28,10 +28,10 @@ EBUILD apr-util-1.2.8.ebuild 1868 RMD160 0a2845c7293b7e8a937645236d60badffad7020
 MD5 51bb66b6c92b93cc1d2004ba6b14bf77 apr-util-1.2.8.ebuild 1868
 RMD160 0a2845c7293b7e8a937645236d60badffad70200 apr-util-1.2.8.ebuild 1868
 SHA256 c781f5f97513abd704d03591d836b2e0a181d7c49e33d627a32f8e2e065d9d66 apr-util-1.2.8.ebuild 1868
-MISC ChangeLog 9575 RMD160 6cc659b32514f8be20a3e173dc43827683ee6716 SHA1 98360400ae52e044bc8c9967c689680f2344e1b0 SHA256 708cbc56ee26da00b24968f89760fa49f7466fe6bce8ec12fed250ba06e721fa
-MD5 601c081496815356a4bedc09ba3d42a8 ChangeLog 9575
-RMD160 6cc659b32514f8be20a3e173dc43827683ee6716 ChangeLog 9575
-SHA256 708cbc56ee26da00b24968f89760fa49f7466fe6bce8ec12fed250ba06e721fa ChangeLog 9575
+MISC ChangeLog 9725 RMD160 1f98c96c4f8bb0cc9d19e4fe8a0b8cbbd5ef12b3 SHA1 6232141e2290812437089d29d03935c96be08a6d SHA256 18d0fefe3861628261350b96bfff0186c521ad3ff30e01a15f70bda738ee88f1
+MD5 a54da0b6958398ac1eba19c1011f5c58 ChangeLog 9725
+RMD160 1f98c96c4f8bb0cc9d19e4fe8a0b8cbbd5ef12b3 ChangeLog 9725
+SHA256 18d0fefe3861628261350b96bfff0186c521ad3ff30e01a15f70bda738ee88f1 ChangeLog 9725
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -51,7 +51,7 @@ SHA256 a7c1a1dbe44c46c939a97e41af609777b572f8b6e389622588b65cfd710c4649 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF7oH+yuNVb5qfaOYRAg8gAKCcOZM5B4T9oNco+vEs/k2vRJ52uACeP79b
-b8YZkqQbKELU+q21nqsfLlc=
-=/oJO
+iD8DBQFF7oaUyuNVb5qfaOYRAnt/AKDI/Fw2imwNZCb2PsWy1ooFXK042wCgp9ZZ
+BuzFdcwnjTjkpqDYCfJbMcw=
+=JYUT
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild b/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
index a80002313be3d09fede343a56c718f95279397b9..80585508c91a32a34b45ac3b783928fe75f71848 100644 (file)
--- a/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
+++ b/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild,v 1.2 2007/03/07 09:12:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12-r1.ebuild,v 1.3 2007/03/07 09:31:49 phreak Exp $
 
 inherit autotools eutils flag-o-matic libtool db-use
 
@@ -26,6 +26,13 @@ src_unpack() {
 
        epatch "${FILESDIR}"/${P}-linking.patch
        epatch "${FILESDIR}"/${P}-db-4.5.patch
+
+       # Fix the config.layout
+       ebegin "Applying ${P}-config.layout.patch"
+       sed -i "s,prefix:        /usr/local/apr,prefix:        /usr," \
+               "${S}"/config.layout
+       eend $?
+
        eautoreconf
 }