merge from webapp overlay; remove old versions

(Portage version: 2.1.4.1)

6 files changed, 16 insertions, 155 deletions

diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index 4cf9aea37eb3..113d9a766af5 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/ampache
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.31 2007/09/04 11:33:34 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.32 2008/02/17 18:29:46 hollow Exp $
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/ampache-webinstall.txt, -ampache-3.3.1.7.ebuild,
+  -ampache-3.3.2.1.ebuild, -ampache-3.3.3.4.ebuild, ampache-3.3.3.5.ebuild:
+  merge from webapp overlay; remove old versions
+
+  05 Feb 2008; Jakub Moc <jakub@gentoo.org> ampache-3.3.3.5.ebuild:
+  Fix quoting.
 
   04 Sep 2007; Christoph Mende <angelos@gentoo.org> ampache-3.3.3.5.ebuild:
   Stable on amd64 wrt security bug #189607
diff --git a/www-apps/ampache/ampache-3.3.1.7.ebuild b/www-apps/ampache/ampache-3.3.1.7.ebuild
deleted file mode 100644
index 81b3464f8ec5..000000000000
--- a/www-apps/ampache/ampache-3.3.1.7.ebuild
+++ /dev/null
@@ -1,40 +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/ampache/ampache-3.3.1.7.ebuild,v 1.7 2007/07/13 06:13:03 mr_bones_ 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 ~x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php"
-DEPEND=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc ${S}/docs/*
-	rm -rf ${S}/docs/*
-
-	cp -R . ${D}${MY_HTDOCSDIR}
-
-	webapp_postinst_txt en ${FILESDIR}/ampache-webinstall.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.3.2.1.ebuild b/www-apps/ampache/ampache-3.3.2.1.ebuild
deleted file mode 100644
index 7d6ef9307f53..000000000000
--- a/www-apps/ampache/ampache-3.3.2.1.ebuild
+++ /dev/null
@@ -1,39 +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/ampache/ampache-3.3.2.1.ebuild,v 1.6 2007/02/05 00:07:39 beandog 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 x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php"
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc ${S}/docs/*
-	rm -rf ${S}/docs
-
-	cp -R . ${D}${MY_HTDOCSDIR}
-
-	webapp_postinst_txt en ${FILESDIR}/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.3.3.4.ebuild b/www-apps/ampache/ampache-3.3.3.4.ebuild
deleted file mode 100644
index 31bd16ce8766..000000000000
--- a/www-apps/ampache/ampache-3.3.3.4.ebuild
+++ /dev/null
@@ -1,40 +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/ampache/ampache-3.3.3.4.ebuild,v 1.4 2007/08/24 19:56:12 dertobi123 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 x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php"
-DEPEND=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	require_php_with_use pcre session unicode iconv xml mysql gd zlib
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc ${S}/docs/*
-	rm -rf ${S}/docs
-
-	cp -R . ${D}${MY_HTDOCSDIR}
-
-	webapp_postinst_txt en ${FILESDIR}/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.3.3.5.ebuild b/www-apps/ampache/ampache-3.3.3.5.ebuild
index c4b1993d14ef..5db7366e5a25 100644
--- a/www-apps/ampache/ampache-3.3.3.5.ebuild
+++ b/www-apps/ampache/ampache-3.3.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.3.5.ebuild,v 1.3 2007/09/04 11:33:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.3.5.ebuild,v 1.4 2008/02/17 18:29:46 hollow Exp $
 
 inherit webapp depend.php
 
@@ -19,22 +19,17 @@ need_php
 
 pkg_setup() {
 	webapp_pkg_setup
-
 	require_php_with_use pcre session unicode iconv xml mysql gd zlib
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
 	webapp_src_preinst
 
-	dodoc ${S}/docs/*
-	rm -rf ${S}/docs
+	dodoc docs/*
+	rm -rf docs/
 
-	cp -R . ${D}${MY_HTDOCSDIR}
+	cp -R . "${D}"${MY_HTDOCSDIR}
 
-	webapp_postinst_txt en ${FILESDIR}/installdoc.txt
+	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
 	webapp_src_install
 }
diff --git a/www-apps/ampache/files/ampache-webinstall.txt b/www-apps/ampache/files/ampache-webinstall.txt
deleted file mode 100644
index b7c023447d2d..000000000000
--- a/www-apps/ampache/files/ampache-webinstall.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Installing Using the Web Interface:
-
-As of 3.3-Beta3 Ampache includes an web based installation script. In order
-for the script to work correctly you will need a user that has Database
-create and modify rights for your mysql server. To use this script simply
-visit /install.php. If you get a Access Denied make sure that your /config
-directory does not contain an existing ampache.cfg
-
-         Step 1 - Inserting the database, this requires you to enter
-                 a username/pass for MySQL that is able to create
-                 a brand new database and insert new tables. This does
-                 not have to be the user you actually run ampache as
-         Step 2 - Creating the Config file, this step asks for a 'user'
-                 level account for MySQL that has full access over
-                 the newly created ampache database, this can be the
-                 same as the last step, but it is not recommended.
-                 Ampache will attempt to write the config file directly
-                 to the /config directory, if it isn't able to it
-                 should prompt you to download the ampache.cfg simply
-                 put it into /config and then visit the login page.
-         Step 3 - Creating the Initial User Account, you will be asked
-                 for a username and password for the administrator
-                 account.