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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 17 insertions, 93 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/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
 }