Fix some stupid mistakes in the apache-2.2 support

Package-Manager: portage-2.1.2.2

3 files changed, 15 insertions, 22 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 6fa1fbbba0c1..b2844e2c0c51 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,9 @@
 # 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.251 2007/03/07 04:52:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.252 2007/03/18 19:18:07 pauldv Exp $
+
+  18 Mar 2007; Paul de Vrieze <pauldv@gentoo.org> subversion-1.4.3.ebuild:
+  Fix a stupid bug from the apache2.2 detection from bug #152746
 
   07 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   subversion-1.4.3.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index f37a45cd2be6..f1253fe36b52 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70svn-gentoo.el 210 RMD160 3c25e6d04b6ac431e030fc0d76080f8a0bb3ba08 SHA1 47b4e7758086439390a23cc0eb76e5038392a08b SHA256 5828272d4c5c97351b31b487ba563b64451e3ec402f18623acbca5fadc9d29d2
 MD5 9af6c8e0c660d202b70b82b2049bdf4a files/70svn-gentoo.el 210
 RMD160 3c25e6d04b6ac431e030fc0d76080f8a0bb3ba08 files/70svn-gentoo.el 210
@@ -85,14 +82,14 @@ EBUILD subversion-1.3.2-r3.ebuild 11713 RMD160 98d7bebdf4cf2c5e9ac67244c21628799
 MD5 4f493a6c3589b4f1d66f5c2a259dbd89 subversion-1.3.2-r3.ebuild 11713
 RMD160 98d7bebdf4cf2c5e9ac67244c216287994d0dbb5 subversion-1.3.2-r3.ebuild 11713
 SHA256 8154a3d1fb49dce52d50e2dff3d6ac1293c65b67d40952ea4cdebe29e722d8a2 subversion-1.3.2-r3.ebuild 11713
-EBUILD subversion-1.4.3.ebuild 11798 RMD160 38a783ebd1e7324e9bbed474fa21cb5e8d32db18 SHA1 c373477211539e1cefe4c8f949f9f1d03145fae9 SHA256 26b1f32a74d7a13886569a2b6fcec1f6163f4897338f5366fff9b1fe592e4c3d
-MD5 73424dfaa7167624ce067873a1c4df23 subversion-1.4.3.ebuild 11798
-RMD160 38a783ebd1e7324e9bbed474fa21cb5e8d32db18 subversion-1.4.3.ebuild 11798
-SHA256 26b1f32a74d7a13886569a2b6fcec1f6163f4897338f5366fff9b1fe592e4c3d subversion-1.4.3.ebuild 11798
-MISC ChangeLog 43252 RMD160 df2fd24a0d40a17f6254aef5df0c22871f153b55 SHA1 c44d38bb668215e90397346c7e2808a7b5d676aa SHA256 87a4073531710212b0153a62339fcaa1f5ba44629dacab1946f499dc5af70f14
-MD5 f1f89045aaaf8dc5662f1c3609c212c9 ChangeLog 43252
-RMD160 df2fd24a0d40a17f6254aef5df0c22871f153b55 ChangeLog 43252
-SHA256 87a4073531710212b0153a62339fcaa1f5ba44629dacab1946f499dc5af70f14 ChangeLog 43252
+EBUILD subversion-1.4.3.ebuild 11821 RMD160 11393733dcaa6225be114a7b296361bb55c792eb SHA1 f6c8cf083a64c7c665994d75cc94a4dcdbf75fa7 SHA256 78279ff0f6f018ff73734ae1d7a0efe2b3cca33ef02b756e388ff3f3e13e7968
+MD5 d618ee5be7a0bf10ef5b87d645cf049d subversion-1.4.3.ebuild 11821
+RMD160 11393733dcaa6225be114a7b296361bb55c792eb subversion-1.4.3.ebuild 11821
+SHA256 78279ff0f6f018ff73734ae1d7a0efe2b3cca33ef02b756e388ff3f3e13e7968 subversion-1.4.3.ebuild 11821
+MISC ChangeLog 43394 RMD160 866886c2c03c48288c63bd7abcbba512575dc184 SHA1 e2ae30ea1269d7f450d2ec763043962ee72f5197 SHA256 18368d544ea830d9d3b5782870bee1652e216d04fa72b2d8a01439fa418e84d3
+MD5 4afcf87fb7642305e06bda4510f3de2d ChangeLog 43394
+RMD160 866886c2c03c48288c63bd7abcbba512575dc184 ChangeLog 43394
+SHA256 18368d544ea830d9d3b5782870bee1652e216d04fa72b2d8a01439fa418e84d3 ChangeLog 43394
 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222
@@ -109,10 +106,3 @@ SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/di
 MD5 dbe03357818a0675ab3ff9a0d6afa1fa files/digest-subversion-1.4.3 256
 RMD160 062f9c03c0ce5ec74e40294938f796e03d6fa41e files/digest-subversion-1.4.3 256
 SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/digest-subversion-1.4.3 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF7kTKNQqtfCuFneMRAvs/AJ9Zg4cCPtEw4KKHHCQ5TZ+KAk291wCgjP5n
-8LKU1Zr1urbfFD4fPzFIzVg=
-=ZYXN
------END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild
index 20ad36847809..a599a022e5e6 100644
--- a/dev-util/subversion/subversion-1.4.3.ebuild
+++ b/dev-util/subversion/subversion-1.4.3.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.ebuild,v 1.7 2007/03/07 04:52:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.8 2007/03/18 19:18:07 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -80,7 +80,7 @@ src_compile() {
 
 	if use apache2; then
 		myconf="--with-apxs=${APXS2}"
-		apache_minor="(best_version apache | cut -d. -f2)"
+		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
 		if [ ${apache_minor} -gt 0 ]; then
 			apr_suffix="-1"
 		fi
@@ -106,7 +106,7 @@ src_compile() {
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags `/usr/bin/apr-config --cppflags`
+	append-flags `/usr/bin/apr-config${apr_suffix} --cppflags`
 
 	econf ${myconf} \
 		$(use_with berkdb berkeley-db) \