Make the mod_proxy dependency optional, bug 347703.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 38 insertions, 9 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/Manifest b/www-apache/mod_extract_forwarded/Manifest
index 0af0e935b4e4..5c2906cb1658 100644
--- a/www-apache/mod_extract_forwarded/Manifest
+++ b/www-apache/mod_extract_forwarded/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 98_mod_extract_forwarded.conf 197 RMD160 1f7f100b0b1b0dc308632b79500007443cbc7d7d SHA1 99e3e751c9230a813d256366d35e4e004e76b6f7 SHA256 b2292a7ad2afa9aa8e19b054143bd5c6fbf9473eae566f29ef074ccca18f7195
 DIST extract_forwarded-2.0.2.tar.gz 13812 RMD160 789d8785b744c1ab01845a64a248fcebd6783495 SHA1 fd11ce90db5a33aa125502aaf1eea337c48a90ad SHA256 934e2da02a2a71dd40a6050e884ac034174a1bfee0d0d4aeeeb68b942d94cafb
-EBUILD mod_extract_forwarded-2.0.2.ebuild 707 RMD160 0fb238f41822a423ae8da1809f167796fb29f47c SHA1 898a73513134eabbccf736ca2dc8263074614061 SHA256 fd51520754a3bdfb8b0f1f9c6c53642324a178fa425b3eef9ad0bf27193cf76c
-MISC ChangeLog 696 RMD160 cbf22b5e55c9406b389a70f94fbc2cf34ec8b3f5 SHA1 df4de5fc34693c5823842d8579cb348baaa5cc3d SHA256 958fc46e9aed77dc26dfca6454dbfd63ae73ebd8a092d4ba83486e6dde8cebb7
-MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+EBUILD mod_extract_forwarded-2.0.2.ebuild 922 RMD160 92bb99c846bc525e27cd2deab30a7b60d556f429 SHA1 6b8410f534f63e0dbb6d1acbb587058938e2b501 SHA256 1e048454a3657f64ef9748ca84689b62ba236c7576d7f8b7e2026937945deed5
+MISC ChangeLog 853 RMD160 8998ba17f35166f6d16a9528e3c9c492e1af9356 SHA1 81a2cb131c4bc39b5bcd5643cc0455ebb7011f7d SHA256 2fd91601c261b8591c122308e81aee16cf13a3067205379b3947a342b40bc37d
+MISC metadata.xml 250 RMD160 e660cdff142e4ed359c1e2568b0ead444c726b1d SHA1 adf7c57de78922e8a135750c91d385529a563328 SHA256 fa3ef4582dbdbead0e6052eeffe10cb9dd47b622eabf4b5d95070d2bb78753cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJNaAarAAoJEMOx0zmdw4Z19FsIAK59iCvayZw2c6uu+W7FSe3E
+cEbf05gX67P7BmBxjYas1ilh+k7VJJw04KZm5tGAPla1SKXYgSL8INEIeGSsrDUB
+Vt4KGBw1JPkTav91vlKI9+zd4Pr8Inmdp5xOhtU3LyjSbuS74Dfw7NnB6eAFp4s+
+i1Xwjp7zlS7P3RP9TaF+33BFJOd0PxxmERTn9OUYbIHvxhnx7H1Kab38pQTZ0lJR
+JGvpZ/pVynqQ6ZiHcvqprfeIzQlc/wly2RBbmSOhl7nM5YMoligMCBttJQ5Psra0
+arTTjZJQkCI1ezdI51KDBYQIOP4J1Ne/Xqwv0pHiB+vBZIOeinxWALoZUjjRTf8=
+=3OAS
+-----END PGP SIGNATURE-----
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
+}