merge from webapp overlay; remove old versions

Package-Manager: portage-2.1.4.1

7 files changed, 28 insertions, 164 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/Manifest b/www-apps/ampache/Manifest
index 16b695c7dd54..7e420c161e1c 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,12 +1,15 @@
-AUX ampache-webinstall.txt 1376 RMD160 27881bb17df0ec5a85f61e1e47eb8585511d3023 SHA1 70ec6a4b0d2248c0eede6750c44eccc63df575b2 SHA256 5a657218b21332823c3e12e91173073b116c842750e5d4b985fc3627e415ee4f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX installdoc.txt 223 RMD160 204d2be3f0c8838a4bfa168824d34014b685da0c SHA1 3e40f1855deae4a8226689957a394625707ee533 SHA256 ad163088081a596b3fb1b08ae1c606dbea558f839377d6a19268f4e958acf53e
-DIST ampache-3.3.1.7.tar.gz 1613218 RMD160 653d49171a2b64673177b8fef54615aeccb1916a SHA1 f1d5172bdf835de0ab8621a2cf6b28f19cd87856 SHA256 3db93e2ad5eb3c5ac92c66ef394de6032ae3bba3a9efe9bbcea9dde5e504b151
-DIST ampache-3.3.2.1.tar.gz 1700467 RMD160 02eff68afb4e13cb94088395bce42f91fce6437d SHA1 48d1ef10261447d3459987fbcd8d7c7018941a5b SHA256 2f7cebacbf0415aeabd6a932b5c1f2b91389bc50865645d4f8067b3cc48e792e
-DIST ampache-3.3.3.4.tar.gz 1823363 RMD160 062793393b62fc228da1b71af7dff002078065e4 SHA1 ebe12dd4ca7e072caa00a2373290e5fbccf7db7c SHA256 c277ba11d67724a0e6f46885fc45301a5e896b41b5ae61b6f854dd119593c267
 DIST ampache-3.3.3.5.tar.gz 1820523 RMD160 7b803391cc0561fe77ad925878265aeaef0680c5 SHA1 2b61c465e87ee7913b6e93e4a9e335da3bd14df4 SHA256 3968ff3efcdbb11fb87ea68d06a722ebef8c59b616a4dacdefd5eaa8588627b4
-EBUILD ampache-3.3.1.7.ebuild 898 RMD160 422de687dba0a23e0a3cb3571a091650b1b8924c SHA1 3e98bba54041e01c683c5f399c56e4f81b73935c SHA256 9ef7d30da3f6920db8a9815a53670f735f47b27a92ee0671783e47a21c9bba4c
-EBUILD ampache-3.3.2.1.ebuild 873 RMD160 847e0dd16df447db07f904411a186d6a7858966a SHA1 3a217fb0231339342ef8b955a1c2311a44907f45 SHA256 e17b10fd605d7d81b1daded91534c8ad3217b08a615aa663b300f132fc5e6b5b
-EBUILD ampache-3.3.3.4.ebuild 886 RMD160 e43c4af435bb08ab4fd824a017c4226b7e3f7d1f SHA1 8403775bb9f8e561ee5dfb0dadb835f73df71128 SHA256 49fdea8f865326d2c704fd8788fd1dc73b648de530ae80d1db32e944d455edf8
-EBUILD ampache-3.3.3.5.ebuild 883 RMD160 6b966a0161d419f41f1feae40f0296a52566b12e SHA1 3fe2cbf100a2a4b02c19eeae29bde40571ef9e47 SHA256 0fa92a54aa5be39ea7d0fad9ab721fd2b2a4830e413ed102a78011fc32253b28
-MISC ChangeLog 5461 RMD160 56fa1c3913468b92f0ebae7d2575ea91d84f2c16 SHA1 d5b4cc72802acf962b0c01adcbafddd4eeb05581 SHA256 809e23ed8f57e8475a942f9e6924cd17b0997368de6f6b5eb470c0c133d23874
+EBUILD ampache-3.3.3.5.ebuild 829 RMD160 41c223a76428e3c9522a8b2fa6d119f8e7fb3394 SHA1 b5bbc2f5bea7ccad03379782c360aaeb953b01ab SHA256 31822e4da435fa4458718c2f6d230448626d14281045a011b3a4d1a79bd41c2a
+MISC ChangeLog 5778 RMD160 d876f8c14b3b7ae3c86a9de1643adc7e6e4166f1 SHA1 65ba6fd774406c557466870aff82c83dd305361b SHA256 4e5ec72ad7ec220ccd51f38cb1840fb767e96dc88be966230e456b881ce85a86
 MISC metadata.xml 257 RMD160 c777a94d4d98d399fb81de0e5bb3cff300d63311 SHA1 e81b9b38b7d5b8de58df6b0fdd445ccd5b75ea59 SHA256 6eac5a6e9c1d912de35713ea0748c446ae21448da5a193de7068d874d7064cca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke4fSMACgkQmPFBzbX68WFdYwCcDMuMLzEI7+KTqBrvxhnlYxHS
+pewAn0hQOXZ4Bba6zkrI3HUWRw3WN8mE
+=dQTr
+-----END PGP SIGNATURE-----
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.