From eb1673e1e6913518ce9241e318982e54908e0835 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sun, 5 Jul 2009 18:42:59 +0000 Subject: fix #273167 (Portage version: 2.2_rc33/cvs/Linux i686) --- www-apache/mod_auth_nufw/ChangeLog | 9 +++- .../files/mod_auth_nufw-2.2.0-configure_in.patch | 21 -------- .../mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild | 58 ---------------------- .../mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild | 10 ++-- 4 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 www-apache/mod_auth_nufw/files/mod_auth_nufw-2.2.0-configure_in.patch delete mode 100644 www-apache/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild (limited to 'www-apache/mod_auth_nufw') 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 + -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 mod_auth_nufw-2.2.0.ebuild, mod_auth_nufw-2.2.1.ebuild: 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 )" -- cgit v1.2.3-65-gdbad