use apr-1 instead of apr-0

Package-Manager: portage-2.1.4_rc11

3 files changed, 24 insertions, 23 deletions

diff --git a/www-apache/mod_auth_nufw/ChangeLog b/www-apache/mod_auth_nufw/ChangeLog
index 948433a25828..b042f77691ed 100644
--- a/www-apache/mod_auth_nufw/ChangeLog
+++ b/www-apache/mod_auth_nufw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_auth_nufw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.3 2007/09/21 21:07:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.4 2007/12/28 16:42:59 hollow Exp $
+
+  28 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
+  mod_auth_nufw-2.2.0.ebuild:
+  use apr-1 instead of apr-0
 
   21 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
   mod_auth_nufw-2.2.0.ebuild:
diff --git a/www-apache/mod_auth_nufw/Manifest b/www-apache/mod_auth_nufw/Manifest
index 3378625ba38d..5b0955f6010d 100644
--- a/www-apache/mod_auth_nufw/Manifest
+++ b/www-apache/mod_auth_nufw/Manifest
@@ -10,14 +10,14 @@ MD5 fb078cf917fe304f04ed71b4042d91ae files/mod_auth_nufw-2.2.0-configure_in.patc
 RMD160 caeb6b9c6ead11bf9ee53836799441779b43cd7f files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 SHA256 c02cea50dde1c26ceeef3dcbf66508d02d648493cd7f780711068a26e3577e2a files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 DIST mod_auth_nufw-2.2.0.tar.gz 42703 RMD160 75469adb58e24dd06837eea1256cf2069e76ac93 SHA1 46a37b29d5c2e1bce320505cd8221a582d3cc0d8 SHA256 e97379c4b032bb8109df048ca675646ff9c9df934c3089c882ba2f1fef49e173
-EBUILD mod_auth_nufw-2.2.0.ebuild 1570 RMD160 9dfabe016e5189e2d078eb33a8995d63ff842058 SHA1 815569426b007d2acce158c0cfb434b1e7169c16 SHA256 84fb1ad57a54eaa1dea9334297bc3ff78d90e33df44ac8c86a63198eb1f9f77e
-MD5 878e8aa4372c26d33a7a95fb9d22b109 mod_auth_nufw-2.2.0.ebuild 1570
-RMD160 9dfabe016e5189e2d078eb33a8995d63ff842058 mod_auth_nufw-2.2.0.ebuild 1570
-SHA256 84fb1ad57a54eaa1dea9334297bc3ff78d90e33df44ac8c86a63198eb1f9f77e mod_auth_nufw-2.2.0.ebuild 1570
-MISC ChangeLog 1394 RMD160 2b2eea3adb891891e329ee137c3d365e42bd58f2 SHA1 197f89b5a4de712577325362868f494af52f1a63 SHA256 e8416bb57d24a21a710b1483a1c4a5f522fc2ae361b59039fbd492e6674cc413
-MD5 b4ebc87203dbbe490d6e8a9ba01357a4 ChangeLog 1394
-RMD160 2b2eea3adb891891e329ee137c3d365e42bd58f2 ChangeLog 1394
-SHA256 e8416bb57d24a21a710b1483a1c4a5f522fc2ae361b59039fbd492e6674cc413 ChangeLog 1394
+EBUILD mod_auth_nufw-2.2.0.ebuild 1569 RMD160 1e916d0359839804a9a8069553e0ed71d33d4b19 SHA1 0b24c8083f17f25c4ee4e3b545ac9449dfc2026b SHA256 816ee01a3f06f0c497e6f4e8ec55b3c7afe1ab04426ba013dc44b994f7d826eb
+MD5 704ac3b506c3c8f3b97022f502edb3d7 mod_auth_nufw-2.2.0.ebuild 1569
+RMD160 1e916d0359839804a9a8069553e0ed71d33d4b19 mod_auth_nufw-2.2.0.ebuild 1569
+SHA256 816ee01a3f06f0c497e6f4e8ec55b3c7afe1ab04426ba013dc44b994f7d826eb mod_auth_nufw-2.2.0.ebuild 1569
+MISC ChangeLog 1504 RMD160 6440426fe95692e84d21a8652bac803e71096820 SHA1 05ad14cbabde7c1e6471cf956858faab73cbf7bf SHA256 396020f8e24da58cd2111f29e0e0c6ff7753e5f4165068614d5449bcc5a8d9e1
+MD5 bf3a70b730f84758ccad7eb38c644d35 ChangeLog 1504
+RMD160 6440426fe95692e84d21a8652bac803e71096820 ChangeLog 1504
+SHA256 396020f8e24da58cd2111f29e0e0c6ff7753e5f4165068614d5449bcc5a8d9e1 ChangeLog 1504
 MISC metadata.xml 298 RMD160 42658edeb89d62bf18bc9562280953153dcb182a SHA1 d9e6e505b41289470f4f5ff83db6768b0dbda994 SHA256 3f0c5e1607b53756bf87acea7196a98866f254aaec52a86001eb949d3d96bccc
 MD5 6139eed6578304a312c52508728fde77 metadata.xml 298
 RMD160 42658edeb89d62bf18bc9562280953153dcb182a metadata.xml 298
@@ -26,9 +26,9 @@ MD5 2bd7a0b4020a8dd098d0de86ec309ce1 files/digest-mod_auth_nufw-2.2.0 256
 RMD160 b5c1c516320c8dd74c0e591014b8b4c28c5d4177 files/digest-mod_auth_nufw-2.2.0 256
 SHA256 0575961c3411e6e8adfb250393a98eb6588757cf24b22a22b5b41c3e055bf872 files/digest-mod_auth_nufw-2.2.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG9DKFmPFBzbX68WERAmEuAKCYaJSALEjMLZJTXLRF/PD41PQYJwCggFM7
-diN6fy+ey/yF6d9shi23m+U=
-=ia1t
+iD8DBQFHdSermPFBzbX68WERAvkFAJsFf3S1uP0R/ZXb5QPk3I5bkdA6HACfSpcB
+XpVUeCRTCWzOgc1eKjf9b20=
+=7VM3
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
index d2a811171bef..c8272216618f 100644
--- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
+++ b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.2 2007/09/21 21:07:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.3 2007/12/28 16:42:59 hollow Exp $
 
 inherit eutils apache-module autotools
 
 DESCRIPTION="A NuFW authentication module for Apache."
-HOMEPAGE="http://www.inl.fr/mod-auth-nufw.html"
+HOMEPAGE="http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw"
 SRC_URI="http://software.inl.fr/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="ldap mysql postgres"
 
-DEPEND="=dev-libs/apr-0*
-	ldap? ( net-nds/openldap )
+DEPEND="ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )"
 RDEPEND="${DEPEND}"
@@ -25,7 +24,7 @@ APACHE2_MOD_DEFINE="AUTH_NUFW"
 
 DOCFILES="doc/mod_auth_nufw.html"
 
-need_apache
+need_apache2_2
 
 pkg_setup() {
 	local cnt=0
@@ -49,13 +48,11 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
-
-	econf --with-apache20 \
+	CPPFLAGS="-I$(/usr/bin/apr-1-config --includedir) ${CPPFLAGS}" \
+	econf --with-apache22 \
+		--with-apxs=${APXS2} \
 		$(use_with ldap ldap-uids) \
 		$(use_with mysql) \
-		--with-apxs=${APXS2} \
-		CPPFLAGS="-I$($(apr_config) --includedir) ${CPPFLAGS}" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }