[gentoo-commits] gentoo-x86 commit in www-apache/mod_vhs: ChangeLog mod_vhs-1.0.32.ebuild

[Benedikt Boehm (hollow)]

hollow      07/09/11 12:13:10

  Modified:             ChangeLog mod_vhs-1.0.32.ebuild
  Log:
  fix php detection
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.3                  www-apache/mod_vhs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	10 Sep 2007 10:25:36 -0000	1.2
+++ ChangeLog	11 Sep 2007 12:13:10 -0000	1.3
@@ -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@g.o> mod_vhs-1.0.32.ebuild:
+  fix php detection
 
   10 Sep 2007; Benedikt Böhm <hollow@g.o> metadata.xml:
   fix metadata



1.2                  www-apache/mod_vhs/mod_vhs-1.0.32.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild?r1=1.1&r2=1.2

Index: mod_vhs-1.0.32.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_vhs/mod_vhs-1.0.32.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_vhs-1.0.32.ebuild	9 Sep 2007 09:46:49 -0000	1.1
+++ mod_vhs-1.0.32.ebuild	11 Sep 2007 12:13:10 -0000	1.2
@@ -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 @@
 	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 @@
 
 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}"



-- 
gentoo-commits@g.o mailing list