remove obsolete apr_config/apu_config

(Portage version: 2.1.4)

3 files changed, 17 insertions, 13 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/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) \