Security bump

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 80 deletions

diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 6770043fa734..e736d4981987 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- - -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ampache-webinstall.txt 1376 RMD160 27881bb17df0ec5a85f61e1e47eb8585511d3023 SHA1 70ec6a4b0d2248c0eede6750c44eccc63df575b2 SHA256 5a657218b21332823c3e12e91173073b116c842750e5d4b985fc3627e415ee4f
 MD5 bca60999fc1787d45fa77e621731126c files/ampache-webinstall.txt 1376
 RMD160 27881bb17df0ec5a85f61e1e47eb8585511d3023 files/ampache-webinstall.txt 1376
@@ -16,19 +10,19 @@ MD5 6a4f59c28e2cc7432761dacd4b3b1fbb files/installdoc.txt 223
 RMD160 204d2be3f0c8838a4bfa168824d34014b685da0c files/installdoc.txt 223
 SHA256 ad163088081a596b3fb1b08ae1c606dbea558f839377d6a19268f4e958acf53e files/installdoc.txt 223
 DIST ampache-3.3.1.7.tar.gz 1613218 RMD160 653d49171a2b64673177b8fef54615aeccb1916a SHA1 f1d5172bdf835de0ab8621a2cf6b28f19cd87856 SHA256 3db93e2ad5eb3c5ac92c66ef394de6032ae3bba3a9efe9bbcea9dde5e504b151
-DIST ampache-3.3.2.tar.gz 1709861 RMD160 d5c47a32d0b0d96f7c71ba5ddf5d6c0769de95bf SHA1 f9101dad4a3f23260159572e3ac4556ee6cd4a14 SHA256 91593f30cb3b640d1db27008bf1e1547e47d7e11913ef884a6bd5ebc24be7204
+DIST ampache-3.3.2.1.tar.gz 1700467 RMD160 02eff68afb4e13cb94088395bce42f91fce6437d SHA1 48d1ef10261447d3459987fbcd8d7c7018941a5b SHA256 2f7cebacbf0415aeabd6a932b5c1f2b91389bc50865645d4f8067b3cc48e792e
 EBUILD ampache-3.3.1.7.ebuild 908 RMD160 4d26e32eaf0a942f8f5df81fcec1024a88ca75c7 SHA1 6e571ec8dd72a883d8afbbe137c53b3f653733d3 SHA256 db4b8fc9c6917f8c2711e88a09b3e670f1d5f29f96a837544e5de6e7305d960b
 MD5 1995d12be2d44bacd06f3a4ddee4d744 ampache-3.3.1.7.ebuild 908
 RMD160 4d26e32eaf0a942f8f5df81fcec1024a88ca75c7 ampache-3.3.1.7.ebuild 908
 SHA256 db4b8fc9c6917f8c2711e88a09b3e670f1d5f29f96a837544e5de6e7305d960b ampache-3.3.1.7.ebuild 908
-EBUILD ampache-3.3.2.ebuild 900 RMD160 756953a3087b689a7427fdc144e467df3b59074f SHA1 8f7b051de53a27803b88d415b1a9203381d66119 SHA256 9c7f084af4dc13a0fdbebd0d789c2b60e66d665d4c90bf1417935b8f234116a8
-MD5 44290eb8a16fe9f9239f6e05c641cd5a ampache-3.3.2.ebuild 900
-RMD160 756953a3087b689a7427fdc144e467df3b59074f ampache-3.3.2.ebuild 900
-SHA256 9c7f084af4dc13a0fdbebd0d789c2b60e66d665d4c90bf1417935b8f234116a8 ampache-3.3.2.ebuild 900
-MISC ChangeLog 3163 RMD160 865c9f8692a76d7dc9163c8446fdd235715af589 SHA1 870d9de606638302eecfdf6f524082a79ec3e7d5 SHA256 8e890172f3908a20e43d84a76ec7589bd87707205b0bbbd4ea5aaae0a0f9c2de
-MD5 e7358371ee314fe90f50d35243d2bab3 ChangeLog 3163
-RMD160 865c9f8692a76d7dc9163c8446fdd235715af589 ChangeLog 3163
-SHA256 8e890172f3908a20e43d84a76ec7589bd87707205b0bbbd4ea5aaae0a0f9c2de ChangeLog 3163
+EBUILD ampache-3.3.2.1.ebuild 902 RMD160 e6933658265894df368df716ba62130241abcad6 SHA1 8592da4183c2f1622e444eb8092c6503cddc13b3 SHA256 8b62b782522187e78e6da75719f0985c7e9a13c4a1d4b7df731b87e9993aac56
+MD5 015a454b8bdbb38b5bb3f9dc62f3e9a9 ampache-3.3.2.1.ebuild 902
+RMD160 e6933658265894df368df716ba62130241abcad6 ampache-3.3.2.1.ebuild 902
+SHA256 8b62b782522187e78e6da75719f0985c7e9a13c4a1d4b7df731b87e9993aac56 ampache-3.3.2.1.ebuild 902
+MISC ChangeLog 3417 RMD160 c3b3ac5cd156c8ae5f54d62749b34217ffd2d24c SHA1 65df9b08000a6a09dc497b5000e12c32395acf6b SHA256 2dff1db04be2c9ee08e30c3eb51302c089f71fb7792c4bbf843fb55567c3acd5
+MD5 c63e0deb54f6a240953482cfb3a30d48 ChangeLog 3417
+RMD160 c3b3ac5cd156c8ae5f54d62749b34217ffd2d24c ChangeLog 3417
+SHA256 2dff1db04be2c9ee08e30c3eb51302c089f71fb7792c4bbf843fb55567c3acd5 ChangeLog 3417
 MISC metadata.xml 257 RMD160 c777a94d4d98d399fb81de0e5bb3cff300d63311 SHA1 e81b9b38b7d5b8de58df6b0fdd445ccd5b75ea59 SHA256 6eac5a6e9c1d912de35713ea0748c446ae21448da5a193de7068d874d7064cca
 MD5 46ab575d4d218ddb1fe7500850065f03 metadata.xml 257
 RMD160 c777a94d4d98d399fb81de0e5bb3cff300d63311 metadata.xml 257
@@ -36,27 +30,13 @@ SHA256 6eac5a6e9c1d912de35713ea0748c446ae21448da5a193de7068d874d7064cca metadata
 MD5 6f091f094767b500dd4a739700e0b5a3 files/digest-ampache-3.3.1.7 250
 RMD160 479fba461ac4f8a4706cdf54ef9f2509360563ef files/digest-ampache-3.3.1.7 250
 SHA256 6e6fc71ea925dc6ed063b68386c6aa7a1b2586b33f4372238a57660d3129945a files/digest-ampache-3.3.1.7 250
-MD5 a81fd44e2baf0bfcda12e8c69f751615 files/digest-ampache-3.3.2 244
-RMD160 b2e19350ce9c3a0927d96df501469dc7c53e7e91 files/digest-ampache-3.3.2 244
-SHA256 f601b01fe9f883a5af14e51f937a6a964dfd1086cc91c17b18f0a41c2d20f609 files/digest-ampache-3.3.2 244
-- - -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFJah5iP+LossGzjARAljpAKC65Iq5yLlj+06N0u6lpXvsZf1n/wCfSbUW
-N82jlcmOKY8Bbo2MXMcNkpw=
-=qIbq
-- - -----END PGP SIGNATURE-----
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFJj5DI1lqEGTUzyQRAgC7AJ4+9sPwDyBCETRg9e80QEgC89B5nACfbQEM
-poKkrjQTlkzqzWi3/ddjp1A=
-=A/rW
-- -----END PGP SIGNATURE-----
+MD5 5b94fcda9205646270c46e3ecdea3185 files/digest-ampache-3.3.2.1 250
+RMD160 301f08b2f70b7bd8dfe81b509775e8d3502470a7 files/digest-ampache-3.3.2.1 250
+SHA256 14a52dae6ec33b8cdd2724867124feb1634d87c4bea1d1b6a26b487907b4b897 files/digest-ampache-3.3.2.1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFJ/FgiP+LossGzjARAnRtAJ9kA93Dv2Q7IbbIvCOTMZHJxwf1iACeNPIz
-2QTFx7V4JF8E0VtKTcd1N5Q=
-=DCj6
+iD8DBQFFNPZyiP+LossGzjARAu+JAKDVdlABWmW5wyO4ih036To/7Js5dACdGh5y
+Q7OhFSwWk58ZqDX6DhDjoOA=
+=kXAa
 -----END PGP SIGNATURE-----
diff --git a/www-apps/ampache/ampache-3.3.2.ebuild b/www-apps/ampache/ampache-3.3.2.ebuild
deleted file mode 100644
index e9f8b9023e95..000000000000
--- a/www-apps/ampache/ampache-3.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/10/06 00:50:57 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 ~x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php
-	dev-db/mysql"
-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/files/digest-ampache-3.3.2 b/www-apps/ampache/files/digest-ampache-3.3.2
deleted file mode 100644
index 554e65606b16..000000000000
--- a/www-apps/ampache/files/digest-ampache-3.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 92ded37b48386316edf8b4fbe3884ce5 ampache-3.3.2.tar.gz 1709861
-RMD160 d5c47a32d0b0d96f7c71ba5ddf5d6c0769de95bf ampache-3.3.2.tar.gz 1709861
-SHA256 91593f30cb3b640d1db27008bf1e1547e47d7e11913ef884a6bd5ebc24be7204 ampache-3.3.2.tar.gz 1709861