Fixing the usage of ${ROOT}'ed apr/apr-util in src_compile.

Package-Manager: portage-2.1.3_rc1

4 files changed, 26 insertions, 22 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 30c15197e838..fc81989510ac 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.262 2007/06/15 09:04:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.263 2007/06/15 09:09:34 phreak Exp $
+
+  15 Jun 2007; Christian Heim <phreak@gentoo.org>
+  subversion-1.4.3-r1.ebuild, subversion-1.4.4.ebuild:
+  Fixing the usage of ${ROOT}'ed apr/apr-util in src_compile.
 
   15 Jun 2007; Christian Heim <phreak@gentoo.org>
   subversion-1.4.3-r1.ebuild, subversion-1.4.4.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 406ea7980141..f94bcefacef7 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -98,22 +98,22 @@ EBUILD subversion-1.3.2-r4.ebuild 11840 RMD160 ad4e27111f737de7320faaebb69e6f7aa
 MD5 aa2e43caba0c3041aa00ed17532a1d60 subversion-1.3.2-r4.ebuild 11840
 RMD160 ad4e27111f737de7320faaebb69e6f7aa6189a8b subversion-1.3.2-r4.ebuild 11840
 SHA256 df91bff38d24a5cf059eb18e145f17096859fc34fd9c3ac97c60c72af326296b subversion-1.3.2-r4.ebuild 11840
-EBUILD subversion-1.4.3-r1.ebuild 12073 RMD160 ace8e1c2deb2b738315821246a9bd0478a0011aa SHA1 ad3a144fdff0ef8ce32b14aae85ce3321ee22a27 SHA256 db2a1162f852b7798704cf9bc3ea01ad3374d770304072fb599b5ac312eab74c
-MD5 a6e84ac6ed8d36c6d6cc71e54d31b326 subversion-1.4.3-r1.ebuild 12073
-RMD160 ace8e1c2deb2b738315821246a9bd0478a0011aa subversion-1.4.3-r1.ebuild 12073
-SHA256 db2a1162f852b7798704cf9bc3ea01ad3374d770304072fb599b5ac312eab74c subversion-1.4.3-r1.ebuild 12073
+EBUILD subversion-1.4.3-r1.ebuild 12061 RMD160 2ddb72f2ac2af9d4f3e618d6fc490bfa8d82064e SHA1 f930dcbf9c8298fe3dd7b5e03ac0e0c72f280f46 SHA256 1ab1d3a997d2b8fc50efa96fdd2bea3fa28525ad704432635f8e6ce854abaeba
+MD5 0a85c1d43f7c8d5fb084ba695cca8d83 subversion-1.4.3-r1.ebuild 12061
+RMD160 2ddb72f2ac2af9d4f3e618d6fc490bfa8d82064e subversion-1.4.3-r1.ebuild 12061
+SHA256 1ab1d3a997d2b8fc50efa96fdd2bea3fa28525ad704432635f8e6ce854abaeba subversion-1.4.3-r1.ebuild 12061
 EBUILD subversion-1.4.3.ebuild 11792 RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c SHA1 14864bde84ade301c3b1b4b363b1079d6b5431f6 SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4
 MD5 9169e73dc9f8990ff1c07605753347cc subversion-1.4.3.ebuild 11792
 RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c subversion-1.4.3.ebuild 11792
 SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4 subversion-1.4.3.ebuild 11792
-EBUILD subversion-1.4.4.ebuild 12024 RMD160 d8b0cb40a006e6bb7c49a75c2804db0f30192d61 SHA1 4275dc59142a8f95f1ee9b25bc66af643199d5f9 SHA256 41456e604299366d67ff4d096f114a369ab020ce35b97e65ddd4892b350c7ea7
-MD5 6e98c908c3737f1f174d3d0889accac6 subversion-1.4.4.ebuild 12024
-RMD160 d8b0cb40a006e6bb7c49a75c2804db0f30192d61 subversion-1.4.4.ebuild 12024
-SHA256 41456e604299366d67ff4d096f114a369ab020ce35b97e65ddd4892b350c7ea7 subversion-1.4.4.ebuild 12024
-MISC ChangeLog 45443 RMD160 380631233808b95a2ecb8d2682099c53ad9a215e SHA1 6f809dc6fcd6834f8eb49a07b268157e31da2955 SHA256 986fe045dc25742f561f01add840b577e2f06150c7801cff4b9db97aef294561
-MD5 7b8027c0b9625fe0434715bf65a4159f ChangeLog 45443
-RMD160 380631233808b95a2ecb8d2682099c53ad9a215e ChangeLog 45443
-SHA256 986fe045dc25742f561f01add840b577e2f06150c7801cff4b9db97aef294561 ChangeLog 45443
+EBUILD subversion-1.4.4.ebuild 12012 RMD160 f8489a78a51756d2ae597736645ec51d63c55da9 SHA1 3c555182b07895dfadb7cad264a2747a7838c1d7 SHA256 e1238e58ac19d3c435686d28719c2097f0e9c91cb7c11e10189b05aa97155b7e
+MD5 07e33c1a1bdcdf1cfbe094797713900d subversion-1.4.4.ebuild 12012
+RMD160 f8489a78a51756d2ae597736645ec51d63c55da9 subversion-1.4.4.ebuild 12012
+SHA256 e1238e58ac19d3c435686d28719c2097f0e9c91cb7c11e10189b05aa97155b7e subversion-1.4.4.ebuild 12012
+MISC ChangeLog 45611 RMD160 ea72cc2a0da34871be066e9fa2a2f3600bb05e8f SHA1 0689e8f2ca71046eefba17e0be2e35e8a075599a SHA256 b3ee0401f3026222c25ce7e0e85d1fa009339792f37a7584cef298a4573cf9a8
+MD5 d3ca014cf6d1d1db8e25b27a46c3b2bd ChangeLog 45611
+RMD160 ea72cc2a0da34871be066e9fa2a2f3600bb05e8f ChangeLog 45611
+SHA256 b3ee0401f3026222c25ce7e0e85d1fa009339792f37a7584cef298a4573cf9a8 ChangeLog 45611
 MISC metadata.xml 224 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd SHA1 e096d8a898bd3b957d86654e0e7fb835e2a6a0df SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec
 MD5 9d26ecca44906061085842dba1505615 metadata.xml 224
 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd metadata.xml 224
@@ -142,7 +142,7 @@ SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGclZMyuNVb5qfaOYRAsFEAJ4r1fFSaWzHTaP8WLhKxdcP3/QcEgCgsHFL
-0xAs8bja6iuRb8Xu337BaGc=
-=P6Se
+iD8DBQFGcldlyuNVb5qfaOYRAu9oAKCzVBR5plfsKqrBpi+BMv3823DlUQCgtidP
+srjJ/ZtMQEDxPHHB5QJw8Jo=
+=RCVu
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.3-r1.ebuild b/dev-util/subversion/subversion-1.4.3-r1.ebuild
index 22234ea15a52..7b441d7b7b06 100644
--- a/dev-util/subversion/subversion-1.4.3-r1.ebuild
+++ b/dev-util/subversion/subversion-1.4.3-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-util/subversion/subversion-1.4.3-r1.ebuild,v 1.2 2007/06/15 09:04:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3-r1.ebuild,v 1.3 2007/06/15 09:09:34 phreak Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 multilib
 
@@ -113,8 +113,8 @@ src_compile() {
 		$(use_with berkdb berkeley-db) \
 		$(use_with python) \
 		$(use_enable nls) \
-		--with-apr="${ROOT}usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="${ROOT}usr/bin/apu${apr_suffix}-config" \
+		--with-apr="/usr/bin/apr${apr_suffix}-config" \
+		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
 		--disable-experimental-libtool \
 		--disable-mod-activation || die "econf failed"
 
diff --git a/dev-util/subversion/subversion-1.4.4.ebuild b/dev-util/subversion/subversion-1.4.4.ebuild
index 8fe01317052b..bbac0c92055c 100644
--- a/dev-util/subversion/subversion-1.4.4.ebuild
+++ b/dev-util/subversion/subversion-1.4.4.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-util/subversion/subversion-1.4.4.ebuild,v 1.2 2007/06/15 09:04:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4.ebuild,v 1.3 2007/06/15 09:09:34 phreak Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -113,8 +113,8 @@ src_compile() {
 		$(use_with berkdb berkeley-db) \
 		$(use_with python) \
 		$(use_enable nls) \
-		--with-apr="${ROOT}usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="${ROOT}usr/bin/apu${apr_suffix}-config" \
+		--with-apr="/usr/bin/apr${apr_suffix}-config" \
+		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
 		--disable-experimental-libtool \
 		--disable-mod-activation || die "econf failed"