Cleanup, add apache herd.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/net-www/mod_auth_nufw/ChangeLog b/net-www/mod_auth_nufw/ChangeLog
index bee7d95bc2dbf24423d418804bfc87582da6adb9..4f4f705bf8148f365772803bdb43efca6630a450 100644 (file)
--- a/net-www/mod_auth_nufw/ChangeLog
+++ b/net-www/mod_auth_nufw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_auth_nufw
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_nufw/ChangeLog,v 1.1 2006/12/31 16:15:43 cedk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_nufw/ChangeLog,v 1.2 2007/01/13 20:38:16 chtekk Exp $
+
+  13 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_auth_nufw-2.2.0.ebuild:
+  This is an Apache module, add apache as herd. Cleanup, don't need to add the
+  apache2 USE flag, eclass does that.
 
 *mod_auth_nufw-2.2.0 (31 Dec 2006)
 

diff --git a/net-www/mod_auth_nufw/Manifest b/net-www/mod_auth_nufw/Manifest
index f97c0585d50639aa5d22c6e2efc1c9ad10a9f0d7..9147732a0dc889a4143bcf6446097db3fcc440b0 100644 (file)
--- a/net-www/mod_auth_nufw/Manifest
+++ b/net-www/mod_auth_nufw/Manifest
@@ -7,18 +7,18 @@ 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 1795 RMD160 b58ed892599f8e93ea46daff47324ff00c053169 SHA1 61acfe52bd325f070d7f68e64aa9ead3984d5527 SHA256 b487afb3ff1e6a382ee639fd37c40897bd9c2324cc5776cfb61041b23622dbe8
-MD5 89cf84067f8840b91fc5f3f03338fe2d mod_auth_nufw-2.2.0.ebuild 1795
-RMD160 b58ed892599f8e93ea46daff47324ff00c053169 mod_auth_nufw-2.2.0.ebuild 1795
-SHA256 b487afb3ff1e6a382ee639fd37c40897bd9c2324cc5776cfb61041b23622dbe8 mod_auth_nufw-2.2.0.ebuild 1795
-MISC ChangeLog 450 RMD160 e1765efc5716f5fb1fad1f5e6dfe74477ae610f6 SHA1 f0f9926a8c7e2ec4c08dee86bef6fe3c3a01fdd0 SHA256 8945d61ed03fd431f1450ba3612fe0f0db4ac6c40595381e785ac211f796c4fd
-MD5 c98574e8fd0630bbd687b1e0b92b2008 ChangeLog 450
-RMD160 e1765efc5716f5fb1fad1f5e6dfe74477ae610f6 ChangeLog 450
-SHA256 8945d61ed03fd431f1450ba3612fe0f0db4ac6c40595381e785ac211f796c4fd ChangeLog 450
-MISC metadata.xml 295 RMD160 6dcdfb258553897f412d8032e74d92fa07189c14 SHA1 e72b7ae09ede2dad6048cb786517553aff82eb2d SHA256 6f1daee6e129b85cae02879e1309037a398a81ba5bf62e6e51b73d1318714d14
-MD5 bb55854edd27897b79ffe8fc85cfb5e4 metadata.xml 295
-RMD160 6dcdfb258553897f412d8032e74d92fa07189c14 metadata.xml 295
-SHA256 6f1daee6e129b85cae02879e1309037a398a81ba5bf62e6e51b73d1318714d14 metadata.xml 295
+EBUILD mod_auth_nufw-2.2.0.ebuild 1811 RMD160 a4af9b7976802372dd3b28ee5d17c8fcfc814ed6 SHA1 32baa99c14cec3627f5c35bc4ef961b12dfe7e46 SHA256 63ba8f83d20f7e084b510f5835746cbbd4b38ef57f701148fe1a3ffb6b05798b
+MD5 b0fe8b15752ae0865b3d6b07ed4dd78e mod_auth_nufw-2.2.0.ebuild 1811
+RMD160 a4af9b7976802372dd3b28ee5d17c8fcfc814ed6 mod_auth_nufw-2.2.0.ebuild 1811
+SHA256 63ba8f83d20f7e084b510f5835746cbbd4b38ef57f701148fe1a3ffb6b05798b mod_auth_nufw-2.2.0.ebuild 1811
+MISC ChangeLog 665 RMD160 e9c2f422539ccb6280ec7c5436bb1146901fc263 SHA1 86d02381f76f557e21292e23d80d9dc914c9ad83 SHA256 ff4559a1d786ca4e123bcadb824965814a97bb092f4058edf4fe6fb97fbb125f
+MD5 6dc01e02a10765c24a061b30e0ba7fd3 ChangeLog 665
+RMD160 e9c2f422539ccb6280ec7c5436bb1146901fc263 ChangeLog 665
+SHA256 ff4559a1d786ca4e123bcadb824965814a97bb092f4058edf4fe6fb97fbb125f ChangeLog 665
+MISC metadata.xml 293 RMD160 d392e09680990922e6ac9cff8cbc39f148e4d79e SHA1 c717200b77f5aa07f2cf00a29662a8c1ec62640d SHA256 2d64a4379f05f5ce874668506fd4003a1a7a6bc28c5c6266ede96a24585e1930
+MD5 f9ee57c7872fc908096533f210a3b0b0 metadata.xml 293
+RMD160 d392e09680990922e6ac9cff8cbc39f148e4d79e metadata.xml 293
+SHA256 2d64a4379f05f5ce874668506fd4003a1a7a6bc28c5c6266ede96a24585e1930 metadata.xml 293
 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

diff --git a/net-www/mod_auth_nufw/metadata.xml b/net-www/mod_auth_nufw/metadata.xml
index 0148d2b54e90df43bc14e2856d444128ca0df587..0f7f786aa587c909b8190b7235238623cb3b9009 100644 (file)
--- a/net-www/mod_auth_nufw/metadata.xml
+++ b/net-www/mod_auth_nufw/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>apache</herd>
 <maintainer>
-  <email>cedk@gentoo.org</email>
+       <email>cedk@gentoo.org</email>
 </maintainer>
 <longdescription>A NuFW authentication module for apache</longdescription>
 </pkgmetadata>

diff --git a/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild b/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
index af961bb4fb888c3fb7127b05d405333d6d851ef9..c4d39b16ac1399691173e5099e80b4ee06f0286b 100644 (file)
--- a/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
+++ b/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.1 2006/12/31 16:15:43 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_nufw/mod_auth_nufw-2.2.0.ebuild,v 1.2 2007/01/13 20:38:16 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
+
 inherit eutils apache-module autotools
 
-DESCRIPTION="mod_auth_nufw A NuFW authentication module for apache"
+KEYWORDS="~x86"
+
+DESCRIPTION="A NuFW authentication module for Apache."
 HOMEPAGE="http://www.inl.fr/mod-auth-nufw.html"
 SRC_URI="http://software.inl.fr/releases/${PN}/${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="apache2 mysql postgres ldap"
+IUSE="ldap mysql postgres"
 
 DEPEND="dev-libs/apr
-       mysql? ( virtual/mysql )
-       postgres? ( dev-db/postgresql )
-       ldap? ( net-nds/openldap )"
-RDEPEND=""
+               ldap? ( net-nds/openldap )
+               mysql? ( virtual/mysql )
+               postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_FILE="mod_auth_nufw.so"
 
@@ -38,11 +39,11 @@ pkg_setup() {
        use mysql && cnt="$((${cnt} + 1))"
        use postgres && cnt="$((${cnt} + 1))"
        if [[ "${cnt}" -ne 1 ]] ; then
-               eerror "You have set ${P} to use multiple sql engine."
+               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, postgres"
-               die "Please set only one sql engine type"
+               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
 }
 
@@ -57,7 +58,7 @@ src_compile() {
        cd "${S}"
 
        local apx
-       if [ ${APACHE_VERSION} -eq '1' ]; then
+       if [[ ${APACHE_VERSION} -eq '1' ]] ; then
                apx=${APXS1}
        else
                apx=${APXS2}
@@ -68,8 +69,8 @@ src_compile() {
        eautoreconf
        econf \
                $(use_with apache2 apache20) \
-               $(use_with mysql) \
                $(use_with ldap ldap-uids) \
+               $(use_with mysql) \
                --with-apxs=${apx} \
                CPPFLAGS="${APR_INCLUDE} ${CPPFLAGS}" \
                || die "econf failed"