fix trunk and 0.20.2 svn mythweb install issues. remove old trunk builds. add new trunk.

Package-Manager: portage-2.1.3.7

9 files changed, 49 insertions, 145 deletions

diff --git a/www-apps/mythweb/ChangeLog b/www-apps/mythweb/ChangeLog
index cbf6f9c8b82f..1aedda116e6e 100644
--- a/www-apps/mythweb/ChangeLog
+++ b/www-apps/mythweb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/mythweb
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.44 2007/08/25 23:54:52 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.45 2007/08/27 14:37:33 cardoe Exp $
+
+*mythweb-0.21_pre14235 (27 Aug 2007)
+
+  27 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  mythweb-0.20.2_p14282.ebuild, -mythweb-0.21_pre13285.ebuild,
+  -mythweb-0.21_pre13775.ebuild, -mythweb-0.21_pre14151.ebuild,
+  +mythweb-0.21_pre14235.ebuild:
+  fix trunk and 0.20.2 svn mythweb install issues. remove old trunk builds
+  add new trunk
 
 *mythweb-0.20.2_p14282 (25 Aug 2007)
 
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 312aca46bdec..42bc4e5ae934 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en-0.20.txt 576 RMD160 b627a3df85d93938df920ad248358cbeaa329d89 SHA1 c62eb7594adaa82332d2dc44528fa431468f3ce4 SHA256 b58cd5a6deb07daedaa96a78cebfa70b001ebae1611394ab9a1bce7b3db01ee2
 MD5 92ce82da8177a4ae23237543b634de0d files/postinstall-en-0.20.txt 576
 RMD160 b627a3df85d93938df920ad248358cbeaa329d89 files/postinstall-en-0.20.txt 576
@@ -19,26 +22,18 @@ EBUILD mythweb-0.20.1_p14269.ebuild 1107 RMD160 2f5da7d299e628d1fcbdf4ea46db7b02
 MD5 54a715868cc4b8d9d487127e5e7c5ba4 mythweb-0.20.1_p14269.ebuild 1107
 RMD160 2f5da7d299e628d1fcbdf4ea46db7b021db526ac mythweb-0.20.1_p14269.ebuild 1107
 SHA256 167126096dc15beea03591fa9ef513ceca0610261b54585b0f666b090c13d29f mythweb-0.20.1_p14269.ebuild 1107
-EBUILD mythweb-0.20.2_p14282.ebuild 1112 RMD160 d611fb1378ed984682e3e7066b1cef5e6a595113 SHA1 1badb6518f5f1a54ca5e5fee57581076f62e5fb7 SHA256 ed7380a2b52167cc4acdc48dc6dca9b02b1a1941ecd2ece2920930ec38bf5aee
-MD5 76142e39ffe499f05ce1048f837c61dc mythweb-0.20.2_p14282.ebuild 1112
-RMD160 d611fb1378ed984682e3e7066b1cef5e6a595113 mythweb-0.20.2_p14282.ebuild 1112
-SHA256 ed7380a2b52167cc4acdc48dc6dca9b02b1a1941ecd2ece2920930ec38bf5aee mythweb-0.20.2_p14282.ebuild 1112
-EBUILD mythweb-0.21_pre13285.ebuild 983 RMD160 1f330b67a4c3010c9c89b9c3395becbb16edf823 SHA1 54150c415c0c0ca6b5bd3e0a8ddb0e50585f76bd SHA256 e3a1aaa19d8a698cfa2259bfbe5cbf0ed63f8e0103a84319b60a4ca0f8ca70aa
-MD5 1c73bec1961e4999450c3ea01cefa41c mythweb-0.21_pre13285.ebuild 983
-RMD160 1f330b67a4c3010c9c89b9c3395becbb16edf823 mythweb-0.21_pre13285.ebuild 983
-SHA256 e3a1aaa19d8a698cfa2259bfbe5cbf0ed63f8e0103a84319b60a4ca0f8ca70aa mythweb-0.21_pre13285.ebuild 983
-EBUILD mythweb-0.21_pre13775.ebuild 989 RMD160 c243f39e7d62b7b79030861ceb8166097e8342bf SHA1 f48cf7a77d6ebf965622de818446b98ca57864a0 SHA256 4864a713d07bd29d0f23294c0255b9102b2182ac3e29779fb8f30bd0e562f72a
-MD5 97c37bbb6ec3bf08d5aefb21ab821342 mythweb-0.21_pre13775.ebuild 989
-RMD160 c243f39e7d62b7b79030861ceb8166097e8342bf mythweb-0.21_pre13775.ebuild 989
-SHA256 4864a713d07bd29d0f23294c0255b9102b2182ac3e29779fb8f30bd0e562f72a mythweb-0.21_pre13775.ebuild 989
-EBUILD mythweb-0.21_pre14151.ebuild 1111 RMD160 b8c3cfb3fdf9e9693d5113495e5b6de9b3ca476e SHA1 d18b5d4e0fc3d0913b7456171e5c0a70fb79f46a SHA256 e797ea3ac2f6a0f2cbdbc465831291eb2166589fee17812ac4c5ee8496b93b4f
-MD5 68643bee1b6c7ec2d641dce9bcc6eb41 mythweb-0.21_pre14151.ebuild 1111
-RMD160 b8c3cfb3fdf9e9693d5113495e5b6de9b3ca476e mythweb-0.21_pre14151.ebuild 1111
-SHA256 e797ea3ac2f6a0f2cbdbc465831291eb2166589fee17812ac4c5ee8496b93b4f mythweb-0.21_pre14151.ebuild 1111
-MISC ChangeLog 8814 RMD160 10ed23cdbc69fcffd5cbf5a0af7f6fc0afa6440d SHA1 d1381077d58763751e2860f7c6b277b1f3bcd29d SHA256 2a35752a2394ba19db2cb12518c4cab17988ec5d55bf318ed0dbe7e65128c6ae
-MD5 ea1f75d6c94b5eb5313f95fe6b5fd9e3 ChangeLog 8814
-RMD160 10ed23cdbc69fcffd5cbf5a0af7f6fc0afa6440d ChangeLog 8814
-SHA256 2a35752a2394ba19db2cb12518c4cab17988ec5d55bf318ed0dbe7e65128c6ae ChangeLog 8814
+EBUILD mythweb-0.20.2_p14282.ebuild 944 RMD160 3ba922ac6b60c393b258bd4d8eedc05dea9d62d3 SHA1 b74b6018ce096457bea0057e9f1f3f1c613dfb59 SHA256 fbe7b7b96c336ebcf78f9426a48b29e1867c6ae967866f4d47b5cab503455fb7
+MD5 1987c33776b9807fb5c9ecaf1082dd4a mythweb-0.20.2_p14282.ebuild 944
+RMD160 3ba922ac6b60c393b258bd4d8eedc05dea9d62d3 mythweb-0.20.2_p14282.ebuild 944
+SHA256 fbe7b7b96c336ebcf78f9426a48b29e1867c6ae967866f4d47b5cab503455fb7 mythweb-0.20.2_p14282.ebuild 944
+EBUILD mythweb-0.21_pre14235.ebuild 984 RMD160 b90f8beb4026ea36e721140193c978ab7da3e08e SHA1 6aca8a1931d132bdd643266a6908fb9caaeec125 SHA256 8f0ee353245a7bf5fe311900694876c39faab5084985b6618498a371b5a1bda3
+MD5 2c7a5c42c3b7ca4e7bd2ae3fd7f7f4f3 mythweb-0.21_pre14235.ebuild 984
+RMD160 b90f8beb4026ea36e721140193c978ab7da3e08e mythweb-0.21_pre14235.ebuild 984
+SHA256 8f0ee353245a7bf5fe311900694876c39faab5084985b6618498a371b5a1bda3 mythweb-0.21_pre14235.ebuild 984
+MISC ChangeLog 9153 RMD160 b2eedbf3edd2a2a956c8d6035ffe1351d1fd2eb4 SHA1 10d126abe052a013a65e248f435f1284dbe26f57 SHA256 d3014478433919139cc06d7671ca234e1bba55e4a0881d170a1a441e4ad2dd45
+MD5 79e6719f9b54243c46f9379f35cdb976 ChangeLog 9153
+RMD160 b2eedbf3edd2a2a956c8d6035ffe1351d1fd2eb4 ChangeLog 9153
+SHA256 d3014478433919139cc06d7671ca234e1bba55e4a0881d170a1a441e4ad2dd45 ChangeLog 9153
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -55,12 +50,13 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythweb-0.20.2_p14282 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythweb-0.20.2_p14282 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythweb-0.20.2_p14282 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythweb-0.21_pre13285 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythweb-0.21_pre13285 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythweb-0.21_pre13285 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythweb-0.21_pre13775 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythweb-0.21_pre13775 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythweb-0.21_pre13775 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythweb-0.21_pre14151 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythweb-0.21_pre14151 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythweb-0.21_pre14151 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythweb-0.21_pre14235 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythweb-0.21_pre14235 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythweb-0.21_pre14235 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG0uG4oeSe8B0zEfwRAqSvAKCF/fjO8ajBAE6jTXu9PGP0EUAAdACeP63C
+IUW48gBLDC6bzjLqk57bTlY=
+=MNS6
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mythweb/files/digest-mythweb-0.21_pre13775 b/www-apps/mythweb/files/digest-mythweb-0.21_pre13775
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/www-apps/mythweb/files/digest-mythweb-0.21_pre13775
+++ /dev/null
diff --git a/www-apps/mythweb/files/digest-mythweb-0.21_pre14151 b/www-apps/mythweb/files/digest-mythweb-0.21_pre14151
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/www-apps/mythweb/files/digest-mythweb-0.21_pre14151
+++ /dev/null
diff --git a/www-apps/mythweb/files/digest-mythweb-0.21_pre13285 b/www-apps/mythweb/files/digest-mythweb-0.21_pre14235
index e69de29bb2d1..e69de29bb2d1 100644
--- a/www-apps/mythweb/files/digest-mythweb-0.21_pre13285
+++ b/www-apps/mythweb/files/digest-mythweb-0.21_pre14235
diff --git a/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild b/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild
index ceed43ba48dd..797caae0d687 100644
--- a/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild
+++ b/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild,v 1.1 2007/08/25 23:54:52 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.20.2_p14282.ebuild,v 1.2 2007/08/27 14:37:33 cardoe Exp $
+
+ESVN_PROJECT="mythplugins"
 
 inherit mythtv webapp depend.php subversion
 
@@ -29,21 +31,17 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
+	cd "${S}/mythweb"
 	dodoc README TODO
 
 	dodir ${MY_HTDOCSDIR}/data
 
-	cp -R ${S}/[[:lower:]]* ${D}${MY_HTDOCSDIR}
-	cp ${S}/mythweb.conf.apache ${MY_SERVERCONFIGDIR}/
-	cp ${S}/mythweb.conf.lighttpd ${MY_SERVERCONFIGDIR}/
+	cp -R [[:lower:]]* .htaccess ${D}${MY_HTDOCSDIR}
 
 	webapp_serverowned ${MY_HTDOCSDIR}/data
+	webapp_serverowned ${MY_HTDOCSDIR}/.htaccess
 
-	# should these be uncommented?
-	#webapp_configfile ${MY_SERVERCONFIGDIR}/mythweb.conf.apache
-	#webapp_configfile ${MY_SERVERCONFIGDIR}/mythweb.conf.lighttpd
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.21.txt
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.20.txt
 
 	webapp_src_install
 }
diff --git a/www-apps/mythweb/mythweb-0.21_pre13285.ebuild b/www-apps/mythweb/mythweb-0.21_pre13285.ebuild
deleted file mode 100644
index eb20781599ac..000000000000
--- a/www-apps/mythweb/mythweb-0.21_pre13285.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.21_pre13285.ebuild,v 1.2 2007/04/23 03:26:49 cardoe Exp $
-
-inherit mythtv webapp depend.php subversion
-
-DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="virtual/httpd-php
-		dev-perl/DBI
-		dev-perl/DBD-mysql"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if has_version 'dev-lang/php' ; then
-		require_php_with_use session mysql pcre posix
-	fi
-}
-
-src_unpack() {
-	subversion_src_unpack
-}
-
-src_compile() {
-	echo ""
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README TODO
-
-	dodir ${MY_HTDOCSDIR}/data
-
-	cp -R ${S}/${PN}/[[:lower:]]* .htaccess ${D}${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/data
-
-	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.20.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/mythweb/mythweb-0.21_pre13775.ebuild b/www-apps/mythweb/mythweb-0.21_pre13775.ebuild
deleted file mode 100644
index 64a90645559c..000000000000
--- a/www-apps/mythweb/mythweb-0.21_pre13775.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.21_pre13775.ebuild,v 1.1 2007/06/28 19:13:20 cardoe Exp $
-
-inherit mythtv webapp depend.php subversion
-
-DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="virtual/httpd-php
-		dev-perl/DBI
-		dev-perl/DBD-mysql"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if has_version 'dev-lang/php' ; then
-		require_php_with_use session mysql pcre posix
-	fi
-}
-
-src_unpack() {
-	subversion_src_unpack
-}
-
-src_compile() {
-	echo ""
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README TODO
-
-	dodir ${MY_HTDOCSDIR}/data
-
-	cp -R ${S}/${PN}/[[:lower:]]* ${D}${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/data
-
-	webapp_configfile ${MY_SERVERCONFIGDIR}/mythweb.conf.apache
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.21.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/mythweb/mythweb-0.21_pre14151.ebuild b/www-apps/mythweb/mythweb-0.21_pre14235.ebuild
index dfea25304384..0fe103f8e23f 100644
--- a/www-apps/mythweb/mythweb-0.21_pre14151.ebuild
+++ b/www-apps/mythweb/mythweb-0.21_pre14235.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.21_pre14151.ebuild,v 1.3 2007/08/15 13:43:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.21_pre14235.ebuild,v 1.1 2007/08/27 14:37:33 cardoe Exp $
+
+ESVN_PROJECT="mythplugins"
 
 inherit mythtv webapp depend.php subversion
 
@@ -29,20 +31,17 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
+	cd "${S}/mythweb"
 	dodoc README TODO
 
 	dodir ${MY_HTDOCSDIR}/data
 
-	cp -R ${S}/[[:lower:]]* ${D}${MY_HTDOCSDIR}
-	cp ${S}/mythweb.conf.apache ${MY_SERVERCONFIGDIR}/
-	cp ${S}/mythweb.conf.lighttpd ${MY_SERVERCONFIGDIR}/
+	cp -R [[:lower:]]* ${D}${MY_HTDOCSDIR}
+	cp mythweb.conf.apache ${MY_SERVERCONFIGDIR}/
+	cp mythweb.conf.lighttpd ${MY_SERVERCONFIGDIR}/
 
 	webapp_serverowned ${MY_HTDOCSDIR}/data
 
-	# should these be uncommented?
-	#webapp_configfile ${MY_SERVERCONFIGDIR}/mythweb.conf.apache
-	#webapp_configfile ${MY_SERVERCONFIGDIR}/mythweb.conf.lighttpd
-
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en-0.21.txt
 
 	webapp_src_install