remove obsolete apr_config/apu_config

Package-Manager: portage-2.1.4

4 files changed, 32 insertions, 28 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 8df075bc688d..0888bf2ce5b2 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.288 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.289 2008/01/27 21:10:49 hollow Exp $
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.5.ebuild,
+  subversion-1.4.6.ebuild:
+  remove obsolete apr_config/apu_config
 
   27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
   -files/subversion-1.3.1-neon-0.26.patch, -files/subversion-db4.patch,
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index a97da827f844..937f51540644 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -51,18 +51,18 @@ RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 files/vc-svn.el 16847
 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa files/vc-svn.el 16847
 DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 SHA1 acc80381cb670736ad626fee1eb04f36ba7e5fc8 SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
-EBUILD subversion-1.4.5.ebuild 13753 RMD160 1e95696186fe8fc4ec754d6f3cb6671049114ad2 SHA1 2359a8d410f543a170bc7e512061fa46391ac37b SHA256 595d4bfc9b7d366a60e68148221e5e426316261e913c38f7de63186b0290ec69
-MD5 93cd74cb6e16aaa611f16bea96c93892 subversion-1.4.5.ebuild 13753
-RMD160 1e95696186fe8fc4ec754d6f3cb6671049114ad2 subversion-1.4.5.ebuild 13753
-SHA256 595d4bfc9b7d366a60e68148221e5e426316261e913c38f7de63186b0290ec69 subversion-1.4.5.ebuild 13753
-EBUILD subversion-1.4.6.ebuild 13810 RMD160 63642bf2daa3e816b4898f5c55f0a784dbfea0e6 SHA1 4dbe800dc4559bf84a98597bf6b4fdd007cbe132 SHA256 4b7f8f0d972871842e2b5b079b0a5dce2465eda5ff874c53f4a52af798dbfe1f
-MD5 8aa17e592a49348f1d995595ea0314c1 subversion-1.4.6.ebuild 13810
-RMD160 63642bf2daa3e816b4898f5c55f0a784dbfea0e6 subversion-1.4.6.ebuild 13810
-SHA256 4b7f8f0d972871842e2b5b079b0a5dce2465eda5ff874c53f4a52af798dbfe1f subversion-1.4.6.ebuild 13810
-MISC ChangeLog 50041 RMD160 201c15dae9bfd9e6445d99725e7d655c1928e088 SHA1 47b1c4238b806ae50c33f01098cc0918c1cb68dd SHA256 0d08f7e019badc80719afddc32ae70927d6b84c50187839c4794fa84a83838be
-MD5 b6a9b2f24c5607ced7d980ea94f518cb ChangeLog 50041
-RMD160 201c15dae9bfd9e6445d99725e7d655c1928e088 ChangeLog 50041
-SHA256 0d08f7e019badc80719afddc32ae70927d6b84c50187839c4794fa84a83838be ChangeLog 50041
+EBUILD subversion-1.4.5.ebuild 13748 RMD160 45708e0a97437f566a6ae0652e2c03dbf9604671 SHA1 993339b7345ca82ce94a6cf5ca24ed879bd0c0bd SHA256 57d6ecc718906c9238f9393bfc00256ad38919005574ecf7ddc58eef4f1011d7
+MD5 89994cdebda91aa6c24948c94ad10a92 subversion-1.4.5.ebuild 13748
+RMD160 45708e0a97437f566a6ae0652e2c03dbf9604671 subversion-1.4.5.ebuild 13748
+SHA256 57d6ecc718906c9238f9393bfc00256ad38919005574ecf7ddc58eef4f1011d7 subversion-1.4.5.ebuild 13748
+EBUILD subversion-1.4.6.ebuild 13805 RMD160 163baea75bd14249349f70d57862b8c6899ff597 SHA1 3f29091e467e4ee0eb63096f9d09b076cc199437 SHA256 3e367c59d9fd9e39508521ff7357cb73a4ed22e76fb7290acb0a6ee9638cc512
+MD5 545d7de0014fd9f2d34cbbba9ebafe83 subversion-1.4.6.ebuild 13805
+RMD160 163baea75bd14249349f70d57862b8c6899ff597 subversion-1.4.6.ebuild 13805
+SHA256 3e367c59d9fd9e39508521ff7357cb73a4ed22e76fb7290acb0a6ee9638cc512 subversion-1.4.6.ebuild 13805
+MISC ChangeLog 50184 RMD160 d66534cb8568a5c61b851dc9ffa6cd793313bcff SHA1 4ecb0ecc7716c6806730d0fdbe6ff76c7828c4fc SHA256 7847f154ecc8f59f104dc81589f9d8759aa8f6b9298fb512da836bfbea15c974
+MD5 48f2b7f6a611a15a57ffc78c36276a18 ChangeLog 50184
+RMD160 d66534cb8568a5c61b851dc9ffa6cd793313bcff ChangeLog 50184
+SHA256 7847f154ecc8f59f104dc81589f9d8759aa8f6b9298fb512da836bfbea15c974 ChangeLog 50184
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 MD5 5eede8f5b73ba3c19b1bee203033a5cf metadata.xml 160
 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa metadata.xml 160
@@ -76,7 +76,7 @@ SHA256 e44b60f81aa4681befae8d05887ada22969bdf70c2c4d1096f1d5521a98c1221 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeczFgACgkQmPFBzbX68WFMrgCgi8RjYlKQDK8pNAKIt6tniQs+
-qfsAnRivhIg9yuH09nqfultFrsO8kkp3
-=32sb
+iEYEARECAAYFAkec82MACgkQmPFBzbX68WF2bwCggMUsrJjmPVmbhwLG0uUOlsrq
+cfAAnAudDu8nr3rvOe7bTOxgfcnH089e
+=yL4V
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.5.ebuild b/dev-util/subversion/subversion-1.4.5.ebuild
index 7d2a0e72514f..5a8ed104ce59 100644
--- a/dev-util/subversion/subversion-1.4.5.ebuild
+++ b/dev-util/subversion/subversion-1.4.5.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-util/subversion/subversion-1.4.5.ebuild,v 1.10 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.11 2008/01/27 21:10:49 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -84,8 +84,8 @@ src_unpack() {
 	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
 		-i configure.in
 
-	sed -e "s:apr-config:$(apr_config):g" \
-		-e "s:apu-config:$(apu_config):g" \
+	sed -e "s:apr-config:apr-1-config:g" \
+		-e "s:apu-config:apu-1-config:g" \
 		-i build/ac-macros/{find_,}ap*
 
 	export WANT_AUTOCONF=2.5
@@ -116,11 +116,11 @@ src_compile() {
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags $(/usr/bin/$(apr_config) --cppflags)
+	append-flags $(/usr/bin/apr-1-config --cppflags)
 
 	econf ${myconf} \
-		--with-apr=/usr/bin/$(apr_config) \
-		--with-apr-util=/usr/bin/$(apu_config) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
 		$(use_with apache2 apxs ${APXS2}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \
diff --git a/dev-util/subversion/subversion-1.4.6.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
index 7649438d0414..d9bd47749670 100644
--- a/dev-util/subversion/subversion-1.4.6.ebuild
+++ b/dev-util/subversion/subversion-1.4.6.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-util/subversion/subversion-1.4.6.ebuild,v 1.4 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.5 2008/01/27 21:10:49 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -84,8 +84,8 @@ src_unpack() {
 	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
 		-i configure.in
 
-	sed -e "s:apr-config:$(apr_config):g" \
-		-e "s:apu-config:$(apu_config):g" \
+	sed -e "s:apr-config:apr-1-config:g" \
+		-e "s:apu-config:apu-1-config:g" \
 		-i build/ac-macros/{find_,}ap*
 
 	export WANT_AUTOCONF=2.5
@@ -116,11 +116,11 @@ src_compile() {
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags $(/usr/bin/$(apr_config) --cppflags)
+	append-flags $(/usr/bin/apr-1-config --cppflags)
 
 	econf ${myconf} \
-		--with-apr=/usr/bin/$(apr_config) \
-		--with-apr-util=/usr/bin/$(apu_config) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
 		$(use_with apache2 apxs ${APXS2}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \