summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-02-25 19:44:37 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-02-25 19:44:37 +0000
commit6e7058f645abef42a2d1049c5f733e648143879e (patch)
treed4e3a7a24bee0188fd8552c704e500e3a36a3187 /www-apache/mod_extract_forwarded
parentVersion bump (diff)
downloadgentoo-2-6e7058f645abef42a2d1049c5f733e648143879e.tar.gz
gentoo-2-6e7058f645abef42a2d1049c5f733e648143879e.tar.bz2
gentoo-2-6e7058f645abef42a2d1049c5f733e648143879e.zip
Make the mod_proxy dependency optional, bug 347703.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'www-apache/mod_extract_forwarded')
-rw-r--r--www-apache/mod_extract_forwarded/ChangeLog8
-rw-r--r--www-apache/mod_extract_forwarded/metadata.xml3
-rw-r--r--www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild16
3 files changed, 21 insertions, 6 deletions
diff --git a/www-apache/mod_extract_forwarded/ChangeLog b/www-apache/mod_extract_forwarded/ChangeLog
index 9c872756e4eb..84612793dcac 100644
--- a/www-apache/mod_extract_forwarded/ChangeLog
+++ b/www-apache/mod_extract_forwarded/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_extract_forwarded
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_extract_forwarded/ChangeLog,v 1.3 2009/09/17 10:42:19 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_extract_forwarded/ChangeLog,v 1.4 2011/02/25 19:44:37 idl0r Exp $
+
+ 25 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
+ mod_extract_forwarded-2.0.2.ebuild metadata.xml:
+ Make the mod_proxy dependency optional, bug 347703.
17 Sep 2009; Benedikt Böhm <hollow@gentoo.org>
mod_extract_forwarded-2.0.2.ebuild:
diff --git a/www-apache/mod_extract_forwarded/metadata.xml b/www-apache/mod_extract_forwarded/metadata.xml
index 64a719ea1bfd..f9164300678d 100644
--- a/www-apache/mod_extract_forwarded/metadata.xml
+++ b/www-apache/mod_extract_forwarded/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>apache</herd>
+ <use>
+ <flag name="mod_proxy">Enable support for Apache's internal proxy</flag>
+ </use>
</pkgmetadata>
diff --git a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild
index b0c9a002993a..26867d0cfd2b 100644
--- a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild
+++ b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild,v 1.2 2009/09/17 10:42:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild,v 1.3 2011/02/25 19:44:37 idl0r Exp $
+
+EAPI="3"
inherit apache-module
@@ -11,10 +13,10 @@ SRC_URI="http://www.openinfo.co.uk/apache/extract_forwarded-${PV}.tar.gz"
LICENSE="Apache-1.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="mod_proxy"
DEPEND=""
-RDEPEND=""
+RDEPEND="mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
S="${WORKDIR}/extract_forwarded"
@@ -22,3 +24,9 @@ APACHE2_MOD_CONF="98_${PN}"
APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
need_apache2
+
+src_prepare() {
+ if ! use mod_proxy; then
+ sed -i -e 's:#define USING_proxy_http_module .*::' mod_extract_forwarded.c || die
+ fi
+}