summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-01-10 15:57:18 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-01-10 15:57:18 +0000
commit92892049c77c0fa6a0c1634c6101e09f1afbdd2b (patch)
treecf577c13d70409074ba8f6d93d16d80458f25049
parentMarked stable on amd64 for bug #204466 (diff)
downloadgentoo-2-92892049c77c0fa6a0c1634c6101e09f1afbdd2b.tar.gz
gentoo-2-92892049c77c0fa6a0c1634c6101e09f1afbdd2b.tar.bz2
gentoo-2-92892049c77c0fa6a0c1634c6101e09f1afbdd2b.zip
fix #205170
(Portage version: 2.1.4_rc11)
-rw-r--r--www-apache/mod_cplusplus/ChangeLog8
-rw-r--r--www-apache/mod_cplusplus/files/51_mod_cplusplus.conf12
-rw-r--r--www-apache/mod_cplusplus/mod_cplusplus-1.5.4.ebuild13
3 files changed, 21 insertions, 12 deletions
diff --git a/www-apache/mod_cplusplus/ChangeLog b/www-apache/mod_cplusplus/ChangeLog
index 4d380c6cac1f..c6939b4fa060 100644
--- a/www-apache/mod_cplusplus/ChangeLog
+++ b/www-apache/mod_cplusplus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_cplusplus
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cplusplus/ChangeLog,v 1.2 2007/09/10 10:19:07 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cplusplus/ChangeLog,v 1.3 2008/01/10 15:57:17 hollow Exp $
+
+ 10 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+ files/51_mod_cplusplus.conf, mod_cplusplus-1.5.4.ebuild:
+ fix #205170
10 Sep 2007; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
fix metadata
diff --git a/www-apache/mod_cplusplus/files/51_mod_cplusplus.conf b/www-apache/mod_cplusplus/files/51_mod_cplusplus.conf
index 10791ca829a9..0ee2bb146d0b 100644
--- a/www-apache/mod_cplusplus/files/51_mod_cplusplus.conf
+++ b/www-apache/mod_cplusplus/files/51_mod_cplusplus.conf
@@ -1,10 +1,8 @@
<IfDefine CPLUSPLUS>
- <IfModule !mod_cplusplus.c>
- LoadModule cplusplus_module /usr/lib/apache2/modules/mod_cplusplus.so
- </IfModule>
+LoadModule cplusplus_module /usr/lib/apache2/modules/mod_cplusplus.so
- <IfModule mod_cplusplus.c>
- # Add your module here
- # LoadCPPHandler mod_yourmod /usr/lib/apache2/modules/yourmod.so
- </IfModule>
+# Add your module here
+# LoadCPPHandler mod_yourmod /usr/lib/apache2/modules/yourmod.so
</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_cplusplus/mod_cplusplus-1.5.4.ebuild b/www-apache/mod_cplusplus/mod_cplusplus-1.5.4.ebuild
index c491c83c4166..f15905361c89 100644
--- a/www-apache/mod_cplusplus/mod_cplusplus-1.5.4.ebuild
+++ b/www-apache/mod_cplusplus/mod_cplusplus-1.5.4.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/mod_cplusplus/mod_cplusplus-1.5.4.ebuild,v 1.1 2007/09/08 18:48:09 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cplusplus/mod_cplusplus-1.5.4.ebuild,v 1.2 2008/01/10 15:57:17 hollow Exp $
inherit apache-module autotools
@@ -25,8 +25,15 @@ need_apache2
S="${WORKDIR}/${PN}"
-src_compile() {
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ sed -i -e 's/-Werror //g' configure.in
eautoreconf
+}
+
+src_compile() {
econf --with-apxs=${APXS2} || die "econf failed"
emake || die "emake failed"
}