4 files changed, 10 insertions, 60 deletions
diff --git a/www-apps/mythweb/ChangeLog b/www-apps/mythweb/ChangeLog
index f71bede22ec1..97e3a81d6b60 100644
--- a/www-apps/mythweb/ChangeLog
+++ b/www-apps/mythweb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/mythweb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.15 2005/09/23 02:03:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.16 2005/10/09 08:40:20 cardoe Exp $
+
+  09 Oct 2005; Doug Goldstein <cardoe@gentoo.org> -mythweb-0.17.ebuild,
+  mythweb-0.18.1.ebuild:
+  Actually fix the PHP depends
 
   23 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
   mythweb-0.17.ebuild, mythweb-0.18.1.ebuild:
diff --git a/www-apps/mythweb/files/digest-mythweb-0.17 b/www-apps/mythweb/files/digest-mythweb-0.17
deleted file mode 100644
index eefac964189a..000000000000
--- a/www-apps/mythweb/files/digest-mythweb-0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a282a778751d25991bb46455afa2481 mythweb-0.17.tar.bz2 311889
diff --git a/www-apps/mythweb/mythweb-0.17.ebuild b/www-apps/mythweb/mythweb-0.17.ebuild
deleted file mode 100644
index b17505a1ad2b..000000000000
--- a/www-apps/mythweb/mythweb-0.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.17.ebuild,v 1.2 2005/09/23 02:03:54 eradicator Exp $
-
-inherit webapp
-
-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"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND=">=virtual/httpd-php-4.2"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if has_version \>=dev-php/mod_php-5 ; then
-		local modphp_use="$(</var/db/pkg/`best_version =dev-php/mod_php`/USE)"
-	        if ! has session ${modphp_use} ; then
-	                eerror "mod_php is missing session support. Please add"
-	                eerror "'session' to your USE flags, and re-emerge mod_php and php."
-	                die "mod_php needs session support"
-	        fi
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README TODO
-
-	keepdir ${MY_HTDOCSDIR}/video_dir
-	keepdir ${MY_HTDOCSDIR}/image_cache
-	keepdir ${MY_HTDOCSDIR}/php_sessions
-
-	cp -R [[:lower:]]* .htaccess ${D}${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/video_dir
-	webapp_serverowned ${MY_HTDOCSDIR}/image_cache
-	webapp_serverowned ${MY_HTDOCSDIR}/php_sessions
-
-	webapp_configfile ${MY_HTDOCSDIR}/config/conf.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/mythweb/mythweb-0.18.1.ebuild b/www-apps/mythweb/mythweb-0.18.1.ebuild
index 4c92f63a59f8..e167def5969c 100644
--- a/www-apps/mythweb/mythweb-0.18.1.ebuild
+++ b/www-apps/mythweb/mythweb-0.18.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.18.1.ebuild,v 1.5 2005/09/23 02:03:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.18.1.ebuild,v 1.6 2005/10/09 08:40:20 cardoe Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
 HOMEPAGE="http://www.mythtv.org/"
@@ -11,20 +11,15 @@ IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc x86"
 
-RDEPEND=">=virtual/httpd-php-4.2"
+RDEPEND="virtual/httpd-php"
 
 S="${WORKDIR}/mythplugins-${PV}/${PN}"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	if has_version \>=dev-php/mod_php-5 ; then
-		local modphp_use="$(</var/db/pkg/`best_version =dev-php/mod_php`/USE)"
-	        if ! has session ${modphp_use} ; then
-	                eerror "mod_php is missing session support. Please add"
-	                eerror "'session' to your USE flags, and re-emerge mod_php and php."
-	                die "mod_php needs session support"
-	        fi
+	if has_version 'dev-lang/php' ; then
+	    require_php_with_use session
 	fi
 }