fix #273167

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 15 insertions, 90 deletions

diff --git a/www-apache/mod_auth_nufw/ChangeLog b/www-apache/mod_auth_nufw/ChangeLog
index b32956ea4d6a..d0a935abe606 100644
--- a/www-apache/mod_auth_nufw/ChangeLog
+++ b/www-apache/mod_auth_nufw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_auth_nufw
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.7 2008/05/19 20:39:03 dev-zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.8 2009/07/05 18:42:59 hollow Exp $
+
+  05 Jul 2009; Benedikt Böhm <hollow@gentoo.org>
+  -files/mod_auth_nufw-2.2.0-configure_in.patch,
+  -mod_auth_nufw-2.2.0.ebuild, mod_auth_nufw-2.2.1.ebuild:
+  fix #273167
 
   19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   mod_auth_nufw-2.2.0.ebuild, mod_auth_nufw-2.2.1.ebuild:
diff --git a/www-apache/mod_auth_nufw/Manifest b/www-apache/mod_auth_nufw/Manifest
index 7a2f0174e5e9..2236c685b105 100644
--- a/www-apache/mod_auth_nufw/Manifest
+++ b/www-apache/mod_auth_nufw/Manifest
@@ -1,8 +1,5 @@
 AUX 50_mod_auth_nufw.conf 112 RMD160 baeacc8ce03361ffee89ea5a806bdc6a148de978 SHA1 602f6d38e39411d60bdda3841da16c721992d0b8 SHA256 d7e56dd4916e1996eb947fbd99de14d3baa088a6fa56d4cc1be362ec74dba798
-AUX mod_auth_nufw-2.2.0-configure_in.patch 1937 RMD160 caeb6b9c6ead11bf9ee53836799441779b43cd7f SHA1 d28bfc59f40126479d101a2be74625193c23fa6e SHA256 c02cea50dde1c26ceeef3dcbf66508d02d648493cd7f780711068a26e3577e2a
-DIST mod_auth_nufw-2.2.0.tar.gz 42703 RMD160 75469adb58e24dd06837eea1256cf2069e76ac93 SHA1 46a37b29d5c2e1bce320505cd8221a582d3cc0d8 SHA256 e97379c4b032bb8109df048ca675646ff9c9df934c3089c882ba2f1fef49e173
 DIST mod_auth_nufw-2.2.1.tar.gz 104300 RMD160 87b5e86f50fa169ed9e9224405f1dd27bcc504f0 SHA1 ebb1837b7d7f86d6e21fe840cfaff9b834b51011 SHA256 fee066dd68c602dd5082691e19e419c4e451a631158611d5992e52e91df154b9
-EBUILD mod_auth_nufw-2.2.0.ebuild 1578 RMD160 23f9abc365c6b35629a933a233e8c1eb656dcbea SHA1 ec7366508f9543a3ff35ce9f69c8e6d190e16d41 SHA256 e2ad848526261dcbc9cee0fecad69076de3894b19f8bb225c4229abd18e79920
-EBUILD mod_auth_nufw-2.2.1.ebuild 1423 RMD160 ca5dcc7a4a84cb863b908be90d403a799bfcce4d SHA1 3100569a159ec268a746c961349f733ac9cde26b SHA256 85f271c0466bafb343e66d2d91b9b72eb84e77758b5be50ffe539dc1504e2c34
-MISC ChangeLog 2052 RMD160 c529dabae710dfd5e3935bfd1a7e0013b519919b SHA1 fe8821beecf9a7e09e9a3942a436d738a65aeecc SHA256 fa31387325312251c544d86d5ce5f5d42da94cbc641f39e4ce80d42016ba99bd
+EBUILD mod_auth_nufw-2.2.1.ebuild 1422 RMD160 cfdaf2421c043973e72f1c40e6d7679da5ba4c26 SHA1 93e5437e6dcd699f4ac7bcf3572202c5fa965df8 SHA256 7d214bc0af6bf935f2c184ad8cec576c548252206c19bbe271c8ad77c56e3892
+MISC ChangeLog 2223 RMD160 44983b89d80a53ecbbeb790fc6a9f14f2f2e2860 SHA1 428b44576d7bfcc16b5c792920e7aab51115974d SHA256 f7cc5802e6413b0338057c6ad6b15fdafec917ede92d869d96483b98849b840d
 MISC metadata.xml 298 RMD160 42658edeb89d62bf18bc9562280953153dcb182a SHA1 d9e6e505b41289470f4f5ff83db6768b0dbda994 SHA256 3f0c5e1607b53756bf87acea7196a98866f254aaec52a86001eb949d3d96bccc
diff --git a/www-apache/mod_auth_nufw/files/mod_auth_nufw-2.2.0-configure_in.patch b/www-apache/mod_auth_nufw/files/mod_auth_nufw-2.2.0-configure_in.patch
deleted file mode 100644
index 22232bce97d2..000000000000
--- a/www-apache/mod_auth_nufw/files/mod_auth_nufw-2.2.0-configure_in.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur mod_auth_nufw-2.2.0/configure.in mod_auth_nufw-2.2.0.new/configure.in
---- mod_auth_nufw-2.2.0/configure.in	2006-05-12 09:22:02.000000000 +0200
-+++ mod_auth_nufw-2.2.0.new/configure.in	2006-06-29 19:39:22.000000000 +0200
-@@ -3,12 +3,12 @@
- AC_PROG_CC
- 
- AC_ARG_WITH(apxs,          --with-apxs                   Path to Apache's apxs command, test $withval = no || APXS=$withval)
--AC_ARG_WITH(apache20,  [--with-apache20           Compile module for Apache 2.0], apache_20="yes",apache_20="")
--AC_ARG_WITH(apache22,  [--with-apache22           Compile module for Apache 2.2], apache_22="yes",apache_22="")
-+AC_ARG_WITH(apache20,  [--with-apache20           Compile module for Apache 2.0], apache_20=$withval,apache_20="")
-+AC_ARG_WITH(apache22,  [--with-apache22           Compile module for Apache 2.2], apache_22=$withval,apache_22="")
- 
--AC_ARG_WITH(mysql,   [--with-mysql                  Use Mysql as backend (PostgreSQL is selected if not Mysql)],db_mysql="yes", db_mysql="") 
--AC_ARG_WITH(ldap-uids,   [--with-ldap-uids          Resolve numeric uids on a ldap tree],ldap_uid="yes", ldap_uid="") 
--AC_ARG_WITH(ldap-uids-cache,   [--with-ldap-uids-cache     Cache numeric resolution of uids on a ldap tree],ldap_uid_cache="yes", ldap_uid_cache="") 
-+AC_ARG_WITH(mysql,   [--with-mysql                  Use Mysql as backend (PostgreSQL is selected if not Mysql)],db_mysql=$withval, db_mysql="") 
-+AC_ARG_WITH(ldap-uids,   [--with-ldap-uids          Resolve numeric uids on a ldap tree],ldap_uid=$withval, ldap_uid="") 
-+AC_ARG_WITH(ldap-uids-cache,   [--with-ldap-uids-cache     Cache numeric resolution of uids on a ldap tree],ldap_uid_cache=$withval, ldap_uid_cache="") 
- #, test $withval = yes && DB_TYPE_MYSQL=1)
- #AC_ARG_WITH(sdk-directory, --with-sdk-headers            Specify the path to the LDAP SDK header files)
- #AC_ARG_WITH(sdk-directory, --with-sdk-libs               Specify the path to the LDAP SDK libraries)
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
deleted file mode 100644
index 42b9b21b4f8b..000000000000
--- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 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.5 2008/05/19 20:39:03 dev-zero Exp $
-
-inherit eutils apache-module autotools
-
-DESCRIPTION="A NuFW authentication module for Apache."
-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"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ldap mysql postgres"
-
-DEPEND="ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="mod_auth_nufw.so"
-APACHE2_MOD_CONF="50_${PN}"
-APACHE2_MOD_DEFINE="AUTH_NUFW"
-
-DOCFILES="doc/mod_auth_nufw.html"
-
-need_apache2_2
-
-pkg_setup() {
-	local cnt=0
-	use mysql && cnt="$((${cnt} + 1))"
-	use postgres && cnt="$((${cnt} + 1))"
-	if [[ "${cnt}" -ne 1 ]] ; then
-		eerror "You have set ${P} to use multiple SQL engines."
-		eerror "I don't know which to use!"
-		eerror "You can use /etc/portage/package.use to	set per-package USE flags."
-		eerror "Set it so only one SQL engine type, mysql or postgres, is enabled."
-		die "Please set only one SQL engine type!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-configure_in.patch"
-	eautoreconf
-}
-
-src_compile() {
-	CPPFLAGS="-I$(/usr/bin/apr-1-config --includedir) ${CPPFLAGS}" \
-	econf --with-apache22 \
-		--with-apxs=${APXS} \
-		$(use_with ldap ldap-uids) \
-		$(use_with mysql) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild
index c962ff21d3e2..33b9047bb946 100644
--- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild
+++ b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1.ebuild,v 1.3 2008/05/19 20:39:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild,v 1.4 2009/07/05 18:42:59 hollow Exp $
 
-inherit eutils apache-module autotools
+EAPI="1"
+
+inherit eutils apache-module
 
 DESCRIPTION="A NuFW authentication module for Apache."
 HOMEPAGE="http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw"
@@ -11,7 +13,7 @@ SRC_URI="http://software.inl.fr/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres"
+IUSE="+mysql postgres"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )"