fix php detection

Package-Manager: portage-2.1.3.7

3 files changed, 33 insertions, 20 deletions

diff --git a/www-apache/mod_vhs/ChangeLog b/www-apache/mod_vhs/ChangeLog
index df2d6e088f0f..6ecbcdb6a454 100644
--- a/www-apache/mod_vhs/ChangeLog
+++ b/www-apache/mod_vhs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/mod_vhs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/ChangeLog,v 1.2 2007/09/10 10:25:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/ChangeLog,v 1.3 2007/09/11 12:13:10 hollow Exp $
+
+  11 Sep 2007; Benedikt Böhm <hollow@gentoo.org> mod_vhs-1.0.32.ebuild:
+  fix php detection
 
   10 Sep 2007; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   fix metadata
diff --git a/www-apache/mod_vhs/Manifest b/www-apache/mod_vhs/Manifest
index c5b3bf9a6135..4d85cb5fcb04 100644
--- a/www-apache/mod_vhs/Manifest
+++ b/www-apache/mod_vhs/Manifest
@@ -6,14 +6,14 @@ MD5 ee7fe21a431a1b2c37bcf7ea4008c2d1 files/99_mod_vhs.conf 109
 RMD160 fd7f6e673cbfb9341df38f13697cae90b72969c8 files/99_mod_vhs.conf 109
 SHA256 2f97f05dd6900ddd3abe567ac823cfd6edc6f99319af951f8bfaf51e7b1ab1bc files/99_mod_vhs.conf 109
 DIST mod_vhs-1.0.32.tar.gz 20129 RMD160 5c317ee60fc88c1ad997ac4be9c172dfca578f36 SHA1 f4214fac8d80e3a7de708a9805a3981d275206c1 SHA256 f2c8b72393a06532239965b7a9fdd63dd881ab8fd6f9084ffc1e839b039741a5
-EBUILD mod_vhs-1.0.32.ebuild 1000 RMD160 ff4ddf360b6300ae81666fec05fcd79b654a43b0 SHA1 9ac63f5a23f39bc75cc101b21c3d8870a95c1156 SHA256 a93abf7fafd444d9c54cfe6be4c3d0bc9a0e4898b2b165d1e3830fadfc8f6d83
-MD5 454f23d909fe7d9674427bc18cdb84d3 mod_vhs-1.0.32.ebuild 1000
-RMD160 ff4ddf360b6300ae81666fec05fcd79b654a43b0 mod_vhs-1.0.32.ebuild 1000
-SHA256 a93abf7fafd444d9c54cfe6be4c3d0bc9a0e4898b2b165d1e3830fadfc8f6d83 mod_vhs-1.0.32.ebuild 1000
-MISC ChangeLog 463 RMD160 587420c34a1b22dd605e58254a898c8729cfb527 SHA1 4f4fbe7061424379ad69f0d066fd774540fb6e62 SHA256 a45ae762ac28d3742f77d428ac516a5ce2ecc4e422e51edddeb6de43b4375071
-MD5 52566901806cbe09771cd616647d9a0d ChangeLog 463
-RMD160 587420c34a1b22dd605e58254a898c8729cfb527 ChangeLog 463
-SHA256 a45ae762ac28d3742f77d428ac516a5ce2ecc4e422e51edddeb6de43b4375071 ChangeLog 463
+EBUILD mod_vhs-1.0.32.ebuild 1104 RMD160 41d351eb7c5226094c4f96cbefd784fcfec6bf1f SHA1 1dac98cd05fdd35d552019cf92fac3189596b250 SHA256 97331ca4b6c3dbee739a850141e49d9c31f5e3bf5feb2cb69cb176e90abf6e43
+MD5 95d81e331dd4d1c0be46b0891ec38c13 mod_vhs-1.0.32.ebuild 1104
+RMD160 41d351eb7c5226094c4f96cbefd784fcfec6bf1f mod_vhs-1.0.32.ebuild 1104
+SHA256 97331ca4b6c3dbee739a850141e49d9c31f5e3bf5feb2cb69cb176e90abf6e43 mod_vhs-1.0.32.ebuild 1104
+MISC ChangeLog 557 RMD160 3c4fd60ddf2691ba5eb34c7583cf584114af9ee5 SHA1 61feece3613aae7c55c27a144141df5c350cbf29 SHA256 5b7ce7c853e0f3f58c812cb177e1ccc1bf26c4bce17de53d8f714884d7b63881
+MD5 5f2a8e14a8072f79c2f3a902e9682c94 ChangeLog 557
+RMD160 3c4fd60ddf2691ba5eb34c7583cf584114af9ee5 ChangeLog 557
+SHA256 5b7ce7c853e0f3f58c812cb177e1ccc1bf26c4bce17de53d8f714884d7b63881 ChangeLog 557
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -24,7 +24,7 @@ SHA256 187df20457f1eb2e6e837fef92fa33712a7ebbffb578f07f47eb78111b82669b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG5RuqmPFBzbX68WERAnIgAKCBwCHymunRG2fkk3oLt7l4xKDm+wCfcSuh
-tBpIubSk2VSnbwoEZ8pL70E=
-=PNJm
+iD8DBQFG5oZemPFBzbX68WERAgU3AJ4wSPfqZTITC0hYVQLOWGSJvdnMtgCfbzoL
+K4Nn8aFdc1VolEpvKn1+76M=
+=/vi8
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild b/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild
index 59d1b0a7f728..a1d8d911839f 100644
--- a/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild
+++ b/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild,v 1.1 2007/09/09 09:46:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild,v 1.2 2007/09/11 12:13:10 hollow Exp $
 
-inherit eutils apache-module
+inherit apache-module depend.php eutils
 
 DESCRIPTION="Mass Virtual Hosting System for Apache 2"
 HOMEPAGE="http://www.oav.net/projects/mod_vhs/"
@@ -17,12 +17,6 @@ DEPEND="dev-libs/libhome
 	php? ( dev-lang/php )
 	suphp? ( www-apache/mod_suphp )"
 
-myconf="-I/usr/include/home -lhome"
-use php && myconf="${myconf} $(/usr/bin/php-config --includes) -DHAVE_MOD_PHP_SUPPORT"
-use suphp && myconf="${myconf} -DHAVE_MOD_SUPHP_SUPPORT"
-use debug myconf="${myconf} -DVH_DEBUG"
-
-APXS2_ARGS="-a -c ${myconf} ${PN}.c"
 APACHE2_MOD_CONF="99_${PN}"
 APACHE2_MOD_DEFINE="VHS"
 
@@ -30,6 +24,22 @@ S="${WORKDIR}/${PN}"
 
 need_apache2
 
+pkg_setup() {
+	myconf="-I/usr/include/home -lhome"
+
+	if use php; then
+		has_php
+		require_php_sapi_from apache2
+		myconf="${myconf} $(${PHPCONFIG} --includes) -DHAVE_MOD_PHP_SUPPORT"
+	fi
+
+	use suphp && myconf="${myconf} -DHAVE_MOD_SUPHP_SUPPORT"
+	use debug myconf="${myconf} -DVH_DEBUG"
+
+	APXS2_ARGS="-c ${myconf} ${PN}.c"
+	apache-module_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"