moving webapp-detect into pkg_setup. closes 48354

4 files changed, 15 insertions, 11 deletions

diff --git a/net-www/mythweb/ChangeLog b/net-www/mythweb/ChangeLog
index aa247ec5b120..e0e19ca500eb 100644
--- a/net-www/mythweb/ChangeLog
+++ b/net-www/mythweb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mythweb
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/ChangeLog,v 1.9 2004/04/11 17:26:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/ChangeLog,v 1.10 2004/04/21 19:47:48 mholzer Exp $
+
+  21 Apr 2004; Martin Holzer <mholzer@gentoo.org> mythweb-0.14-r1.ebuild,
+  mythweb-0.14.ebuild:
+  moving webapp-detect into pkg_setup. closes 48354
 
 *mythweb-0.14-r1 (11 Apr 2004)
 
diff --git a/net-www/mythweb/Manifest b/net-www/mythweb/Manifest
index ca8a0d9fca89..e886442d54c9 100644
--- a/net-www/mythweb/Manifest
+++ b/net-www/mythweb/Manifest
@@ -1,6 +1,6 @@
-MD5 92c0843c3148d9337eef94acf596064c ChangeLog 1803
+MD5 553b46fea8c2c2b06e379943284a2448 ChangeLog 1957
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 86260ef577185be360005a2beb720104 mythweb-0.14.ebuild 1009
-MD5 b7afdf7de921634d46a11a26bf14fd19 mythweb-0.14-r1.ebuild 1148
+MD5 702abb913ba5f5816e2370b10c39f5b2 mythweb-0.14.ebuild 1027
+MD5 f1ff9018b3a91148705492f2869710df mythweb-0.14-r1.ebuild 1166
 MD5 7ed0401bccae5ab3c413c6463fae929f files/digest-mythweb-0.14 65
 MD5 7ed0401bccae5ab3c413c6463fae929f files/digest-mythweb-0.14-r1 65
diff --git a/net-www/mythweb/mythweb-0.14-r1.ebuild b/net-www/mythweb/mythweb-0.14-r1.ebuild
index 1bf4c5b8ae15..e270a4299560 100644
--- a/net-www/mythweb/mythweb-0.14-r1.ebuild
+++ b/net-www/mythweb/mythweb-0.14-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/mythweb-0.14-r1.ebuild,v 1.1 2004/04/11 17:26:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/mythweb-0.14-r1.ebuild,v 1.2 2004/04/21 19:47:48 mholzer Exp $
 
 inherit webapp-apache
 
+IUSE="apache2"
 DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
 HOMEPAGE="http://www.mythtv.org/"
 SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
@@ -14,9 +15,8 @@ KEYWORDS="~x86"
 
 RDEPEND=">=dev-php/mod_php-4.2"
 
-webapp-detect || NO_WEBSERVER=1
-
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 #	webapp-pkg_setup "${NO_WEBSERVER}"
 #	webapp-check-php mysql
 	einfo "Installing ${PN} into ${HTTPD_ROOT}"
diff --git a/net-www/mythweb/mythweb-0.14.ebuild b/net-www/mythweb/mythweb-0.14.ebuild
index 715e39ae3106..6f9ba4b13924 100644
--- a/net-www/mythweb/mythweb-0.14.ebuild
+++ b/net-www/mythweb/mythweb-0.14.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/mythweb-0.14.ebuild,v 1.1 2004/02/02 18:00:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/mythweb-0.14.ebuild,v 1.2 2004/04/21 19:47:48 mholzer Exp $
 
 inherit webapp-apache
 
+IUSE="apache2"
 DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
 HOMEPAGE="http://www.mythtv.org/"
 SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
@@ -14,9 +15,8 @@ KEYWORDS="~x86"
 
 RDEPEND=">=dev-php/mod_php-4.2"
 
-webapp-detect || NO_WEBSERVER=1
-
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	webapp-check-php mysql
 	einfo "Installing ${PN} into ${HTTPD_ROOT}"