ebuild cleanup wrt #208584; remove old version

Package-Manager: portage-2.1.4.4

4 files changed, 23 insertions, 57 deletions

diff --git a/www-apps/zina/ChangeLog b/www-apps/zina/ChangeLog
index 72c5ef8b2747..142f8e43ff8c 100644
--- a/www-apps/zina/ChangeLog
+++ b/www-apps/zina/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/zina
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/ChangeLog,v 1.8 2008/02/05 14:09:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/ChangeLog,v 1.9 2008/02/19 13:46:04 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> -zina-1.0_rc2.ebuild,
+  zina-1.0_rc3.ebuild:
+  ebuild cleanup wrt #208584; remove old version
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> zina-1.0_rc2.ebuild,
   zina-1.0_rc3.ebuild:
diff --git a/www-apps/zina/Manifest b/www-apps/zina/Manifest
index 080bad1f1814..6f0dae4386d6 100644
--- a/www-apps/zina/Manifest
+++ b/www-apps/zina/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX postinstall-en.txt 851 RMD160 b956fdbc280594e30fb9c5e3630f445de0c9eee6 SHA1 354ac49fcec45e30ce496a748ee7bce19e3ecc11 SHA256 866ef4c522e1a4e6ae1ec27d3909a513f995f892a2179d5374bc79692f7daa03
-DIST zina-1.0rc2.tar.gz 198213 RMD160 fb0f3f6a0a58ce379c80b83371bdd60ea42b09e9 SHA1 d5bf9bcf77a80cc200e6616ea2cb2776f2f91bfa SHA256 68597a5f09782feed22b59767d23293f0bf370e683a9e81f3fa37dc7f5f1539f
 DIST zina-1.0rc3.tar.gz 199109 RMD160 3a0c5bf48734724746c3ea9d75ef113c2acabb2a SHA1 6740693ccbac65bd0a53793cf53253cc74e30157 SHA256 c0b87567207e37f4a14aedc3ff6f9db7692f011526a5ca5397e94f5b42250ffd
-EBUILD zina-1.0_rc2.ebuild 919 RMD160 2aeba42e2ed67bc7412823e1565ad942c95ac10b SHA1 7cfb11321ac61a5f2944f1e5a2d5783bcbce0a49 SHA256 ee9fd68153b6b467b4824817f178c630c3cae3d90a84a8958205de6cb5df4885
-EBUILD zina-1.0_rc3.ebuild 926 RMD160 65f41df784d8c0ac0cc896ced8429b10e06e645d SHA1 081a5eecdddade2a4148384e99a065b71847e2a1 SHA256 7d187d71effb0a2a087edd53322baca0b2248cd70f5f57b74e79c68af13c2061
-MISC ChangeLog 1510 RMD160 bbd82539e8fda6185c65fb02ddf6f9b46c37fb1e SHA1 bc8343636ee2126ce5297780c6bc7863f63eeef5 SHA256 09e1f1d8ef85ecf35adbfeb00c5e85b0b16dff2121ebebc5ece1194ce97ff76b
+EBUILD zina-1.0_rc3.ebuild 930 RMD160 114635f2b2afeb7b875534e08fc1ece01281f6e6 SHA1 2035667f820388ed56dd9aed6cdac31daf411dc2 SHA256 fa4b77a87fbcad426e26341062b63c791ac433e66ef404695cb9b5b84d58fef0
+MISC ChangeLog 1655 RMD160 64e52912bab852658146bfda6929d55379f38939 SHA1 ea1e5a8be2f66778ab0a0198352dd5f75c7ae7c0 SHA256 b94f288ab8a5a44b993fb471809e23a856c8b4ae5e616bd587573464b8edb78b
 MISC metadata.xml 300 RMD160 bf586296c9109dde24954321b649d4209515a655 SHA1 4d51a604920a4063599ce594e66c89bade642e2b SHA256 ede26e0fd846cfff8f6fbe5207a5f62606d3fdd8b7dd36fbc7eca81f5059c9e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeobg0ACgkQmPFBzbX68WEpKgCfXQlOefdV7NzJA/yyIfKTm3FJ
-cc8AnimiYVxp5ddGaz7ILzjzHOpXm3f7
-=TUxL
+iEYEARECAAYFAke63asACgkQmPFBzbX68WHHhwCfYSW81KjL3M7Of6ySayLA2bJm
+MuQAn3MXz4U52lwUMkFosFRYT9ugu2zq
+=rxbv
 -----END PGP SIGNATURE-----
diff --git a/www-apps/zina/zina-1.0_rc2.ebuild b/www-apps/zina/zina-1.0_rc2.ebuild
deleted file mode 100644
index 6e458d7891fb..000000000000
--- a/www-apps/zina/zina-1.0_rc2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/zina-1.0_rc2.ebuild,v 1.5 2008/02/05 14:09:06 hollow Exp $
-
-inherit webapp depend.apache
-
-MY_P=${P/_/}
-
-DESCRIPTION="Zina (Zina Is Not Andromeda) is a digital audio streaming jukebox via a web interface."
-HOMEPAGE="http://www.pancake.org/zina/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php"
-
-need_apache
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-
-	touch "${S}"/zina.ini.php
-
-	cp -R . "${D}"${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/zina.ini.php
-	webapp_serverowned ${MY_HTDOCSDIR}/zina.ini.php
-
-	keepdir ${MY_HTDOCSDIR}/_zina/cache
-	webapp_serverowned ${MY_HTDOCSDIR}/_zina/cache
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/zina/zina-1.0_rc3.ebuild b/www-apps/zina/zina-1.0_rc3.ebuild
index 484c7afd3fb2..22688e6331d3 100644
--- a/www-apps/zina/zina-1.0_rc3.ebuild
+++ b/www-apps/zina/zina-1.0_rc3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/zina-1.0_rc3.ebuild,v 1.3 2008/02/05 14:09:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/zina/zina-1.0_rc3.ebuild,v 1.4 2008/02/19 13:46:04 hollow Exp $
 
-inherit webapp depend.apache
+inherit webapp depend.php
 
 MY_P=${P/_/}
 
@@ -14,24 +14,26 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-php"
+DEPEND=""
+RDEPEND=""
 
-need_apache
+need_php_httpd
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_install() {
 	webapp_src_preinst
 
-	touch "${S}"/zina.ini.php
+	touch zina.ini.php
 
-	cp -R . "${D}"${MY_HTDOCSDIR}
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
-	webapp_configfile ${MY_HTDOCSDIR}/zina.ini.php
-	webapp_serverowned ${MY_HTDOCSDIR}/zina.ini.php
+	webapp_configfile "${MY_HTDOCSDIR}"/zina.ini.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/zina.ini.php
 
-	keepdir ${MY_HTDOCSDIR}/_zina/cache
-	webapp_serverowned ${MY_HTDOCSDIR}/_zina/cache
+	keepdir "${MY_HTDOCSDIR}"/_zina/cache
+	webapp_serverowned "${MY_HTDOCSDIR}"/_zina/cache
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install