summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-01-29 18:25:19 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-01-29 18:25:19 +0000
commit0d0928c3e1e29d9577c199c9df1722f12bc0d8fd (patch)
tree94713000f9e747fc29dd374f309bccb5b829d683 /www-apache
parentalpha/ia64/sparc stable wrt #207634 (diff)
downloadgentoo-2-0d0928c3e1e29d9577c199c9df1722f12bc0d8fd.tar.gz
gentoo-2-0d0928c3e1e29d9577c199c9df1722f12bc0d8fd.tar.bz2
gentoo-2-0d0928c3e1e29d9577c199c9df1722f12bc0d8fd.zip
fix depend.apache usage wrt #208033; update metadata; cleanup
(Portage version: 2.1.4)
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/libapreq2/ChangeLog6
-rw-r--r--www-apache/libapreq2/files/76_mod_apreq.conf16
-rw-r--r--www-apache/libapreq2/libapreq2-2.08.ebuild10
-rw-r--r--www-apache/libapreq2/metadata.xml5
4 files changed, 18 insertions, 19 deletions
diff --git a/www-apache/libapreq2/ChangeLog b/www-apache/libapreq2/ChangeLog
index 4cc8ad5181f7..84b882de0b99 100644
--- a/www-apache/libapreq2/ChangeLog
+++ b/www-apache/libapreq2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/libapreq2
# Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/ChangeLog,v 1.30 2008/01/27 15:58:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/ChangeLog,v 1.31 2008/01/29 18:25:18 hollow Exp $
+
+ 29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/76_mod_apreq.conf,
+ metadata.xml, libapreq2-2.08.ebuild:
+ fix depend.apache usage wrt #208033; update metadata; cleanup
27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
-files/libapreq2-2.0-binloc.patch, -files/libapreq2-2.0-sandbox.patch,
diff --git a/www-apache/libapreq2/files/76_mod_apreq.conf b/www-apache/libapreq2/files/76_mod_apreq.conf
index 2ae509d89e94..15d925d404f8 100644
--- a/www-apache/libapreq2/files/76_mod_apreq.conf
+++ b/www-apache/libapreq2/files/76_mod_apreq.conf
@@ -1,13 +1,13 @@
<IfDefine APREQ>
- LoadModule apreq_module modules/mod_apreq2.so
+LoadModule apreq_module modules/mod_apreq2.so
- # load the Perl modules
- # uncomment the ones you require
- #PerlModule APR::Request::Apache2
- #PerlModule APR::Request::CGI
- #PerlModule APR::Request::Cookie
- #PerlModule Apache2::Cookie
- #PerlModule Apache2::Request
+# load the Perl modules
+# uncomment the ones you require
+#PerlModule APR::Request::Apache2
+#PerlModule APR::Request::CGI
+#PerlModule APR::Request::Cookie
+#PerlModule Apache2::Cookie
+#PerlModule Apache2::Request
</IfDefine>
# vim: ts=4 filetype=apache
diff --git a/www-apache/libapreq2/libapreq2-2.08.ebuild b/www-apache/libapreq2/libapreq2-2.08.ebuild
index 347136debb55..3f8737c87471 100644
--- a/www-apache/libapreq2/libapreq2-2.08.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/libapreq2-2.08.ebuild,v 1.1 2007/08/19 11:36:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/libapreq2-2.08.ebuild,v 1.2 2008/01/29 18:25:18 hollow Exp $
inherit perl-module depend.apache multilib
@@ -21,7 +21,7 @@ DEPEND="${DEPEND}
RDEPEND="${DEPEND}"
mydoc="TODO README CHANGES INSTALL"
-myconf="--with-apache2-apxs=${APXS2} --libdir=/usr/$(get_libdir)"
+myconf="--with-apache2-apxs=${APXS} --libdir=/usr/$(get_libdir)"
SRC_TEST="skip"
need_apache2
@@ -63,7 +63,7 @@ src_install() {
# install the html docs
dohtml ${S}/docs/html/*.html
- insinto ${APACHE2_MODULES_CONFDIR}
+ insinto ${APACHE_MODULES_CONFDIR}
doins ${FILESDIR}/76_mod_apreq.conf
fixlocalpod
@@ -86,7 +86,7 @@ pkg_postinst() {
einfo "To enable ${PN}, you need to edit your /etc/conf.d/apache2 file and"
einfo "add '-D APREQ' to APACHE2_OPTS."
einfo "Configuration file installed as"
- einfo " ${APACHE2_MODULES_CONFDIR}/76_mod_apreq.conf"
+ einfo " ${APACHE_MODULES_CONFDIR}/76_mod_apreq.conf"
einfo "You may want to edit it before turning the module on in /etc/conf.d/apache2"
einfo
diff --git a/www-apache/libapreq2/metadata.xml b/www-apache/libapreq2/metadata.xml
index e6ad803fee9d..64a719ea1bfd 100644
--- a/www-apache/libapreq2/metadata.xml
+++ b/www-apache/libapreq2/metadata.xml
@@ -2,9 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>apache</herd>
- <maintainer>
- <email>hollow@gentoo.org</email>
- <name>Benedikt Böhm</name>
- <description>Primary Maintainer</description>
- </maintainer>
</pkgmetadata>