remove ebuilds wrt bug #297709, fix doc install location wrt bug #365581, drop unneeded depend.php usage

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

6 files changed, 20 insertions, 113 deletions

diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index 53a2214c4fc1..0b4a36bc3705 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/ampache
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.50 2010/12/09 10:01:47 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.51 2012/06/22 21:24:02 mabi Exp $
+
+  22 Jun 2012; Matti Bickel <mabi@gentoo.org> -ampache-3.4.4.ebuild,
+  -ampache-3.5.3.ebuild, ampache-3.5.3-r1.ebuild, ampache-3.5.4.ebuild:
+  remove ebuilds wrt bug #297709, fix doc install location wrt bug #365581, drop
+  unneeded depend.php usage
 
 *ampache-3.5.4 (09 Dec 2010)
 
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 6027030651e4..12eba5866d3f 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,26 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX installdoc.txt 223 RMD160 204d2be3f0c8838a4bfa168824d34014b685da0c SHA1 3e40f1855deae4a8226689957a394625707ee533 SHA256 ad163088081a596b3fb1b08ae1c606dbea558f839377d6a19268f4e958acf53e
 DIST ampache-3.4.3.tar.gz 1414765 RMD160 e11eeac971c1f6e52c5d1ed85fc043244ffb5c59 SHA1 87fd031f0e424a273f4e4bb7f2405cc72a5e0d00 SHA256 001b34abb77a830ce5f67d9823b8fbeba75a517b577c650349843854deb8d0eb
-DIST ampache-3.4.4.tar.gz 1411732 RMD160 218a92d5a0c4917745db56b4f6cb2d8050f70755 SHA1 63334f03521625a834144254e33ef4172f5d047a SHA256 7247b0dd6152dc7ddcb95322db445cf9ee74dbc5a295ec7469350db687d183bf
 DIST ampache-3.5.3.tar.gz 1962048 RMD160 b5525793c97f3881d9293c98fe2d7a5cccc7e8a5 SHA1 c9eb9ed7034e7c1d822fee34a74e74311900133e SHA256 b4c0d58754007c19dc959659cf43442d9f0cf3ebdbeb35b8e2845870bca0ca4c
 DIST ampache-3.5.4.tar.gz 1961555 RMD160 cb702c95788985365bdc84e19621feb3b977f530 SHA1 60f44983c3dfed92cc249fef24ba5685f69cb38c SHA256 f5ee6906d2af60ea8dcbd1b3a18119ffbe6b92c21c0b0c59a1ba01e5bead5f74
 EBUILD ampache-3.4.3.ebuild 843 RMD160 f8d5555c8ebe386f77aa1ac85557d4c87005021e SHA1 357c297d179a087c6e58f49af25dbb255f3f6f71 SHA256 98ba5d94d105be387c1226b7dfa29380e66bd4183bdf0066973bad01c524d92b
-EBUILD ampache-3.4.4.ebuild 850 RMD160 9ed0369e4298405a41a8a411972ca797aaa82dfa SHA1 06091c1a757d5dbe2a83dd406ba2cdee354d4bda SHA256 2a4e9452b9410159b25b80b3e3868feafa5cc4ff90c2f49e40c4f52cfb8ea232
-EBUILD ampache-3.5.3-r1.ebuild 1041 RMD160 590fe2fede105acf49cd72c79f451fa0b0825a79 SHA1 3730a74fbb1b578f174c288aa45637cb8da1ab47 SHA256 df33528b20c56fc8cdd2046e4ffa41c8bae588cf61f88e1d5c1f0a8c959cd48e
-EBUILD ampache-3.5.3.ebuild 1041 RMD160 4af36b3f3410e91dc3dbb5d94506581903c27ab7 SHA1 aa629fd0d45a778fd1013018d9e8b917fd7eb0ae SHA256 ee8b9c69b99f2c4d1ed61c8f05674813558c2b4ab7f4df3d31f38d085be384ca
-EBUILD ampache-3.5.4.ebuild 1274 RMD160 7b1d076b1dbb4a3f694dfdb87ef100304f33cebd SHA1 3150dd03be179c1b67b2cade949cc474caccafca SHA256 cd1da14f2fafd0671a6e6e9028a6d1a130bdadc1fb79ef04386656f9ef378201
-MISC ChangeLog 8205 RMD160 3d9b5e0eaf4809ce82a0d34265d40be20fd21d3b SHA1 143b401132f79ce71fae6e9caf27e2b0a77b425f SHA256 8fe76bf429323a81169d160a9a962105f7ba591b0d135c0294d6d2003d4d9d9b
+EBUILD ampache-3.5.3-r1.ebuild 1028 RMD160 d8954d06a83da3b02eb786ca7a543952746a18b1 SHA1 4950eb5b20aaafa65cce788fa84bd117dda39945 SHA256 4e6ac8952213de9fda49b9ea4f5645876a387787ff470599824ad3fbfdf5ffae
+EBUILD ampache-3.5.4.ebuild 1260 RMD160 f607dd8a53efb1df1036b67af87374018110a606 SHA1 e73589c7c923a716c9fa2d651d16e0eacc2cbae9 SHA256 8c82ed20e99d7b2d83668e5de72592308b60691be85d5b56f2f0b08d39fad68e
+MISC ChangeLog 8451 RMD160 09a44aee345c2ee1934f81afe8107af4e8121da2 SHA1 32b70b0e1766d98b7355441547b9d54a45096c8e SHA256 b6b5bf576b5670ec0d891c76c75e05f44b77621e4c2d61a3e082f1a59ecfc422
 MISC metadata.xml 263 RMD160 72bbeef3e4c2860fa9b98ea415e8190659ac3ac3 SHA1 9e8abc4b0f84dec4828205940887ccb73f08193f SHA256 f82adcb8564acf7373c6335204bfc4457c2f7814d8d5f79cd4535a910ddceba0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNAKkVAAoJEEqz6FtPBkyjZKMIAKRxK3I+JZAszFCdRlWUuaxY
-My50cKwPWU042gg53fEo0MXN02FsHKE1U3nXMKh/R16lgi0jkkcaSDMXwp7CiIEM
-ukWws6zka6J3wxTyQtNpUsnlLPOYRx657sXUe2tdShWIqgPAtxJvRORlWKigWdK+
-SUitC+L6Fw3/jFeBbpKHn/6wRpquPRYcnMblIbFDquU7GmAp0MCLK+9dk49IhJ7i
-5dnZW6yaZjJfnJO6eqMvJ/TsE0ZEK6xawMrRx42sBt7GSJGcg0nx0L/q3j8kqTZ5
-ywGweE19Yrh52h+wvEeiP7k04nTttfkpGWvR8vZGX/ClKDuHob4llKRRbO1YIoY=
-=ikfJ
------END PGP SIGNATURE-----
diff --git a/www-apps/ampache/ampache-3.4.4.ebuild b/www-apps/ampache/ampache-3.4.4.ebuild
deleted file mode 100644
index 0804108aa6e3..000000000000
--- a/www-apps/ampache/ampache-3.4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.4.4.ebuild,v 1.2 2009/05/09 16:12:55 armin76 Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface."
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc docs/*
-	rm -rf docs/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.5.3-r1.ebuild b/www-apps/ampache/ampache-3.5.3-r1.ebuild
index 9d548d284a1e..38633199580a 100644
--- a/www-apps/ampache/ampache-3.5.3-r1.ebuild
+++ b/www-apps/ampache/ampache-3.5.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.5.3-r1.ebuild,v 1.3 2010/10/20 14:19:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.5.3-r1.ebuild,v 1.4 2012/06/22 21:24:02 mabi Exp $
 
 EAPI="2"
 
-inherit webapp depend.php
+inherit webapp
 
 DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface."
 HOMEPAGE="http://www.ampache.org/"
@@ -35,7 +35,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "Install and upgrade instructions can be found here:"
-	elog "  /usr/share/doc/${P}/INSTALL.gz"
-	elog "  /usr/share/doc/${P}/MIGRATION.gz"
+	elog "  /usr/share/doc/${P}/INSTALL.bz2"
+	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
 	webapp_pkg_postinst
 }
diff --git a/www-apps/ampache/ampache-3.5.3.ebuild b/www-apps/ampache/ampache-3.5.3.ebuild
deleted file mode 100644
index 343ba832e680..000000000000
--- a/www-apps/ampache/ampache-3.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.5.3.ebuild,v 1.2 2009/12/20 22:54:56 marineam Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface."
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib hash
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc docs/*
-	rm -rf docs/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Install and upgrade instructions can be found here:"
-	elog "  /usr/share/doc/${P}/INSTALL.gz"
-	elog "  /usr/share/doc/${P}/MIGRATION.gz"
-	webapp_pkg_postinst
-}
diff --git a/www-apps/ampache/ampache-3.5.4.ebuild b/www-apps/ampache/ampache-3.5.4.ebuild
index 1180776b6730..9b78350900ec 100644
--- a/www-apps/ampache/ampache-3.5.4.ebuild
+++ b/www-apps/ampache/ampache-3.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.5.4.ebuild,v 1.1 2010/12/09 10:01:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.5.4.ebuild,v 1.2 2012/06/22 21:24:02 mabi Exp $
 
 EAPI="2"
 
-inherit webapp depend.php
+inherit webapp
 
 DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface."
 HOMEPAGE="http://www.ampache.org/"
@@ -41,7 +41,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "Install and upgrade instructions can be found here:"
-	elog "  /usr/share/doc/${P}/INSTALL.gz"
-	elog "  /usr/share/doc/${P}/MIGRATION.gz"
+	elog "  /usr/share/doc/${P}/INSTALL.bz2"
+	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
 	webapp_pkg_postinst
 }