fix depend.apache usage wrt #208033

Package-Manager: portage-2.1.4

6 files changed, 47 insertions, 42 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index a8e150790ce7..b2f351ce780f 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_caucho
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.31 2007/12/14 16:11:21 nelchael Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.32 2008/01/29 16:25:35 hollow Exp $
+
+  29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> mod_caucho-3.0.24.ebuild,
+  mod_caucho-3.0.25.ebuild, mod_caucho-3.1.3.ebuild,
+  mod_caucho-3.1.4.ebuild:
+  fix depend.apache usage wrt #208033
 
   14 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   mod_caucho-3.1.4.ebuild:
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index d6725fa676b2..8b321b1b245b 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -13,26 +13,26 @@ DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5b
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.3.tar.bz2 3516 RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc SHA1 9cfd0514cb74ef88f659ad69a0337cab8e2a991e SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63
 DIST resin-gentoo-patches-3.1.4-r2.tar.bz2 3560 RMD160 4049201161d5414d3db886310184a4b977653d38 SHA1 04dab3d984b3c742525d17a01900820d6cdfc182 SHA256 53340a55609f9ef5e3d1ed7010ad6ef04f11122f673f9c90936a2fe5c0039d28
-EBUILD mod_caucho-3.0.24.ebuild 1271 RMD160 4ae2980ee56f1f5309494741ab91d33e821ecad1 SHA1 6f8968805f6106da014ba0365e2e3a93ced8d39f SHA256 0ebc0a2b402a39f5e2d8b6f0c681fc9aaba52b0a2dbddb210fcc3619ec3e5fd3
-MD5 0de9a2f6e9f31b0aac27c3c6149d5e18 mod_caucho-3.0.24.ebuild 1271
-RMD160 4ae2980ee56f1f5309494741ab91d33e821ecad1 mod_caucho-3.0.24.ebuild 1271
-SHA256 0ebc0a2b402a39f5e2d8b6f0c681fc9aaba52b0a2dbddb210fcc3619ec3e5fd3 mod_caucho-3.0.24.ebuild 1271
-EBUILD mod_caucho-3.0.25.ebuild 1274 RMD160 6f3cf473ea9882610ab650cd232205f224253a4f SHA1 6fbd7f24d74d9f3909d1e0205e6fa2dec0c77e14 SHA256 115de32d736e406cf265d3ee42ecded67e651b5d6049893542dfb46eef8a6b9b
-MD5 f7e658cd5dcc418a6f2682f4f4b58aa9 mod_caucho-3.0.25.ebuild 1274
-RMD160 6f3cf473ea9882610ab650cd232205f224253a4f mod_caucho-3.0.25.ebuild 1274
-SHA256 115de32d736e406cf265d3ee42ecded67e651b5d6049893542dfb46eef8a6b9b mod_caucho-3.0.25.ebuild 1274
-EBUILD mod_caucho-3.1.3.ebuild 1301 RMD160 54af97d2d71bf1040aa4e151c7b74025ec305565 SHA1 892c29e7e73de4fe2ef18a3e6a14eff6113b2e79 SHA256 19e15dc93bc0ae769c94163b72cc89e4db19f6ce7949ae41d06f2e98ef9b0dfd
-MD5 6d44b2aade5eb182ad52cc2b5223e622 mod_caucho-3.1.3.ebuild 1301
-RMD160 54af97d2d71bf1040aa4e151c7b74025ec305565 mod_caucho-3.1.3.ebuild 1301
-SHA256 19e15dc93bc0ae769c94163b72cc89e4db19f6ce7949ae41d06f2e98ef9b0dfd mod_caucho-3.1.3.ebuild 1301
-EBUILD mod_caucho-3.1.4.ebuild 1304 RMD160 4712922a234a19f4befcff00737ac47ce51bac12 SHA1 7c64e17e62e020ba20dba113b795a569212c09a8 SHA256 0f77af68521551fcebc7c680654067cdd89fc37185282d95b2788353f9333d40
-MD5 f591b23070e7ba186eb7bc91a2901280 mod_caucho-3.1.4.ebuild 1304
-RMD160 4712922a234a19f4befcff00737ac47ce51bac12 mod_caucho-3.1.4.ebuild 1304
-SHA256 0f77af68521551fcebc7c680654067cdd89fc37185282d95b2788353f9333d40 mod_caucho-3.1.4.ebuild 1304
-MISC ChangeLog 6890 RMD160 4573ee3ee98fe588240327d275773230a44b6b26 SHA1 9da6c59635df52a3394b87c00dc877cb205ef2b8 SHA256 15756ff759b5e0d2a106709128048ab3cacd5354834a6e307d3f3cd9de56051d
-MD5 71ca1f24f3e841ee84d7841ebf5bf4be ChangeLog 6890
-RMD160 4573ee3ee98fe588240327d275773230a44b6b26 ChangeLog 6890
-SHA256 15756ff759b5e0d2a106709128048ab3cacd5354834a6e307d3f3cd9de56051d ChangeLog 6890
+EBUILD mod_caucho-3.0.24.ebuild 1268 RMD160 6babb4c1047c32ddca93ef2a9231e05e9938fba2 SHA1 94dac5d0b5a46bdb65896f2c748d1b5e00903677 SHA256 ab1863a48e8b59c56aff28281b1da2edf4bd0396060cd5ee6e143850a67e5a37
+MD5 58a97127a20821cfe4c8747835846193 mod_caucho-3.0.24.ebuild 1268
+RMD160 6babb4c1047c32ddca93ef2a9231e05e9938fba2 mod_caucho-3.0.24.ebuild 1268
+SHA256 ab1863a48e8b59c56aff28281b1da2edf4bd0396060cd5ee6e143850a67e5a37 mod_caucho-3.0.24.ebuild 1268
+EBUILD mod_caucho-3.0.25.ebuild 1270 RMD160 e64b6330b6ede44a4ccd297b96ec42707534fe90 SHA1 848dcfc0168971dcfbe1956130af1e5f20bfe303 SHA256 13b58ebd989917f80267ab4550e22deca51e5257371f9417a131966916c87686
+MD5 2dd5306b9ce43a2ce189064dcb2db18b mod_caucho-3.0.25.ebuild 1270
+RMD160 e64b6330b6ede44a4ccd297b96ec42707534fe90 mod_caucho-3.0.25.ebuild 1270
+SHA256 13b58ebd989917f80267ab4550e22deca51e5257371f9417a131966916c87686 mod_caucho-3.0.25.ebuild 1270
+EBUILD mod_caucho-3.1.3.ebuild 1297 RMD160 4e50750248747084a88bdb265e8e6c61e8d1bacd SHA1 e9da039ffdc3d6bfdfbcd30fc4f4527121fa368e SHA256 8fa312a45af22ff51e627e39bbaead1621394cc633aa0789685dae83afd06750
+MD5 f2f064bad6b6bd6cd3a5f6dc25459afd mod_caucho-3.1.3.ebuild 1297
+RMD160 4e50750248747084a88bdb265e8e6c61e8d1bacd mod_caucho-3.1.3.ebuild 1297
+SHA256 8fa312a45af22ff51e627e39bbaead1621394cc633aa0789685dae83afd06750 mod_caucho-3.1.3.ebuild 1297
+EBUILD mod_caucho-3.1.4.ebuild 1300 RMD160 9fc7c2a59117560330e6fb9f82228e22a29fa304 SHA1 e54a69100dd1ceff6eaaf344a24bb17fbe919e3c SHA256 0f2286aa73a96aca263659d4da564cc6fcbd1edf957e379516783dae1ca1df36
+MD5 3c6584a924584c59cae2de20c35c8ba2 mod_caucho-3.1.4.ebuild 1300
+RMD160 9fc7c2a59117560330e6fb9f82228e22a29fa304 mod_caucho-3.1.4.ebuild 1300
+SHA256 0f2286aa73a96aca263659d4da564cc6fcbd1edf957e379516783dae1ca1df36 mod_caucho-3.1.4.ebuild 1300
+MISC ChangeLog 7083 RMD160 bad6e3cf148b39709216a067210dd0e38fe2496c SHA1 43e15ee71394ca653e81baa043e8e861a7b35f5e SHA256 cc2f7d4bfcd2ad13dd59f49db646d4a44530f859368e98ce445d46fac46fdd54
+MD5 fd57ba85c3b500d3854efe1c31b8347d ChangeLog 7083
+RMD160 bad6e3cf148b39709216a067210dd0e38fe2496c ChangeLog 7083
+SHA256 cc2f7d4bfcd2ad13dd59f49db646d4a44530f859368e98ce445d46fac46fdd54 ChangeLog 7083
 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245
 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245
@@ -50,9 +50,9 @@ MD5 8ce726f5c664e51c74863decbf6be96a files/digest-mod_caucho-3.1.4 530
 RMD160 df86b6b757a9ee9acb5e5e1ebf1faf753867d579 files/digest-mod_caucho-3.1.4 530
 SHA256 61e00cb08701c414b46893c31bdf29eaa06390f88fae71aefd4857ebe867f399 files/digest-mod_caucho-3.1.4 530
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHYqswgo/w9rxVVVERAh2pAJwKgEFu+uZEET+BWTXYabC+lhG4AACfS+/E
-Sihcug1WJenUFS7+OSobVHI=
-=+kVk
+iEYEARECAAYFAkefU4kACgkQmPFBzbX68WEKIQCfSv1V/7jUQKZGgkckiT4Sjn+7
+nOIAnA7uAG9xXFCFOT70Uft7DMf9Kp1L
+=qXPI
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
index 0e1fc12daf56..a56cdeac219c 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.24.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_caucho/mod_caucho-3.0.24.ebuild,v 1.9 2007/11/10 20:57:51 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.10 2008/01/29 16:25:35 hollow Exp $
 
 inherit eutils apache-module autotools
 
@@ -37,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
@@ -46,7 +46,7 @@ src_install() {
 	cd "${S}/modules/c/src/apache2"
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 	|| die "internal ebuild error: ${APACHE2_MOD_CONF} not found."
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild
index 2228e7fc4325..7fe728b9ebd2 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.25.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_caucho/mod_caucho-3.0.25.ebuild,v 1.1 2007/12/14 09:44:56 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.25.ebuild,v 1.2 2008/01/29 16:25:35 hollow Exp $
 
 inherit eutils apache-module autotools
 
@@ -37,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
@@ -46,7 +46,7 @@ src_install() {
 	cd "${S}/modules/c/src/apache2"
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 	|| die "internal ebuild error: ${APACHE2_MOD_CONF} not found."
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild
index b6427ee6998c..4602a5183bef 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.3.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_caucho/mod_caucho-3.1.3.ebuild,v 1.2 2007/11/10 12:47:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild,v 1.3 2008/01/29 16:25:35 hollow Exp $
 
 inherit eutils apache-module autotools
 
@@ -45,7 +45,7 @@ src_unpack() {
 
 src_compile() {
 
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 
 }
@@ -55,7 +55,7 @@ src_install() {
 	cd "${S}/modules/c/src/apache2"
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 		|| die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
 
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.4.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.4.ebuild
index 6e20e8813fc5..470a544d725a 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.4.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.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_caucho/mod_caucho-3.1.4.ebuild,v 1.3 2007/12/14 16:11:21 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.4.ebuild,v 1.4 2008/01/29 16:25:35 hollow Exp $
 
 inherit eutils apache-module autotools
 
@@ -45,7 +45,7 @@ src_unpack() {
 
 src_compile() {
 
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 
 }
@@ -55,7 +55,7 @@ src_install() {
 	cd "${S}/modules/c/src/apache2"
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 		|| die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."