From 83fb01d7b61b033f0d8e535c2421731839e13642 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@gentoo.org>
Date: Sun, 9 Oct 2005 08:40:20 +0000
Subject: [PATCH] Actually fixing PHP depends Package-Manager:
 portage-2.0.53_rc3

---
 www-apps/ampache/Manifest                  |  6 +--
 www-apps/mythweb/ChangeLog                 |  6 ++-
 www-apps/mythweb/Manifest                  | 16 ++++----
 www-apps/mythweb/files/digest-mythweb-0.17 |  1 -
 www-apps/mythweb/mythweb-0.17.ebuild       | 48 ----------------------
 www-apps/mythweb/mythweb-0.18.1.ebuild     | 15 +++----
 6 files changed, 20 insertions(+), 72 deletions(-)
 delete mode 100644 www-apps/mythweb/files/digest-mythweb-0.17
 delete mode 100644 www-apps/mythweb/mythweb-0.17.ebuild

diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 1828f6e5bc18..e5accba60754 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,5 +1,5 @@
-MD5 4e6a6bd603ad67aec60ccd3e3cf15d22 ampache-3.3.1.4.ebuild 788
-MD5 710e0d3dbb9c7ee8d2f6eab9079bdddf ChangeLog 1447
-MD5 46ab575d4d218ddb1fe7500850065f03 metadata.xml 257
+MD5 3ab405a4374ae32387c4d2ebf3f55ad9 ChangeLog 1553
+MD5 82bd9de456e80fa7ff67a985a8672498 ampache-3.3.1.4.ebuild 776
 MD5 bca60999fc1787d45fa77e621731126c files/ampache-3.3.1.4-webinstall.txt 1376
 MD5 49d2f119dd0a765786d25674bc06cbcf files/digest-ampache-3.3.1.4 68
+MD5 46ab575d4d218ddb1fe7500850065f03 metadata.xml 257
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/Manifest b/www-apps/mythweb/Manifest
index 467287702342..565b4f720446 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d34f05c8df3acad241e61d62286571b3 ChangeLog 4280
-MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 4ec4255d2b21b1220d9d81490a29fc5e mythweb-0.17.ebuild 1396
-MD5 87fc2579ce3a02a03347c46751d64ddb mythweb-0.18.1.ebuild 1455
-MD5 67c131deae039971648b7a6921fbf7d2 files/postinstall-en.txt 381
-MD5 571d8572a1c374567a581ee138a196f1 files/digest-mythweb-0.17 65
+MD5 7b01673a4752018496a86b0820cb9002 ChangeLog 4405
 MD5 8739e9d1295223762426254acdc96551 files/digest-mythweb-0.18.1 72
+MD5 67c131deae039971648b7a6921fbf7d2 files/postinstall-en.txt 381
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
+MD5 41eef79e469581ba557daa7ac3224646 mythweb-0.18.1.ebuild 1140
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDM3TaArHZZzCEUG0RAibKAJ9BIAhJUtqtPkgRm1Nb/xIX1F3hfgCdEA33
-isleYNqv0kHRpsJaUX378GE=
-=OW66
+iD8DBQFDSNeIBtvusYtCZMsRAq7wAKCLIsCaQ2UUnZMBoTTQiQsKrH40mACaAw0U
+u80z/0O8zq4r7zJ1KmeZqKk=
+=xmPG
 -----END PGP SIGNATURE-----
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
 }
 
-- 
2.26.2