8 files changed, 13 insertions, 92 deletions
diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index 74d0a96875da..5431131a0e4b 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2007/08/16 00:04:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.28 2007/08/20 22:52:35 marineam Exp $
+
+*ampache-3.3.3.5 (20 Aug 2007)
+
+  20 Aug 2007; Michael Marineau <marineam@gentoo.org> -ampache-3.3.3.ebuild,
+  -ampache-3.3.3.1.ebuild, -ampache-3.3.3.3.ebuild, +ampache-3.3.3.5.ebuild:
+  Version bump, fixes 2 non-critical sql injection issues.
+  Clean out a few old versions.
 
   16 Aug 2007; Christoph Mende <angelos@gentoo.org> ampache-3.3.3.4.ebuild:
   Stable on amd64 wrt bug #185478
diff --git a/www-apps/ampache/ampache-3.3.3.1.ebuild b/www-apps/ampache/ampache-3.3.3.1.ebuild
deleted file mode 100644
index 51876248347e..000000000000
--- a/www-apps/ampache/ampache-3.3.3.1.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.1.ebuild,v 1.2 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}/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.3.3.3.ebuild b/www-apps/ampache/ampache-3.3.3.3.ebuild
deleted file mode 100644
index 15553fcfb1bb..000000000000
--- a/www-apps/ampache/ampache-3.3.3.3.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.3.ebuild,v 1.2 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}/installdoc.txt
-	webapp_src_install
-}
diff --git a/www-apps/ampache/ampache-3.3.3.ebuild b/www-apps/ampache/ampache-3.3.3.5.ebuild
index 1f4837724a79..dcfef3b3b95c 100644
--- a/www-apps/ampache/ampache-3.3.3.ebuild
+++ b/www-apps/ampache/ampache-3.3.3.5.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2007/07/13 06:13:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.3.5.ebuild,v 1.1 2007/08/20 22:52:35 marineam Exp $
 
 inherit webapp depend.php
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ampache.org/"
 SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="virtual/httpd-php"
diff --git a/www-apps/ampache/files/digest-ampache-3.3.3 b/www-apps/ampache/files/digest-ampache-3.3.3
deleted file mode 100644
index dbdc2e85be49..000000000000
--- a/www-apps/ampache/files/digest-ampache-3.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e84134e83d33766adc389cdbfdfc457 ampache-3.3.3.tar.gz 1847807
-RMD160 a9540f5907578005c0f0eaf082c7b630775b0bd2 ampache-3.3.3.tar.gz 1847807
-SHA256 65d0912aa8a7a9eb1613ac3f3a84a8c8bea9be521e3a954a639cfbbee0dc56c3 ampache-3.3.3.tar.gz 1847807
diff --git a/www-apps/ampache/files/digest-ampache-3.3.3.1 b/www-apps/ampache/files/digest-ampache-3.3.3.1
deleted file mode 100644
index 6b00eabf3ea5..000000000000
--- a/www-apps/ampache/files/digest-ampache-3.3.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8e3c3e987fb0fc1fd2b9940f6329a55 ampache-3.3.3.1.tar.gz 1860305
-RMD160 804055ae54550c8f4c8ecad37b498e77558f46c2 ampache-3.3.3.1.tar.gz 1860305
-SHA256 57021243e4df83268215d299ee2b294f41d2c9d71d19a21ae833466972f0ed55 ampache-3.3.3.1.tar.gz 1860305
diff --git a/www-apps/ampache/files/digest-ampache-3.3.3.3 b/www-apps/ampache/files/digest-ampache-3.3.3.3
deleted file mode 100644
index bfaf3be820f6..000000000000
--- a/www-apps/ampache/files/digest-ampache-3.3.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 00bb0a6d5c6ca3b9de27f31800154956 ampache-3.3.3.3.tar.gz 1858343
-RMD160 b1cc94c816d4064999fc600e61565c473d1c0299 ampache-3.3.3.3.tar.gz 1858343
-SHA256 ea6094a908ee12b88ce2315dd505da1e76a568c3a88d8df7ae0b2786ba39171c ampache-3.3.3.3.tar.gz 1858343
diff --git a/www-apps/ampache/files/digest-ampache-3.3.3.5 b/www-apps/ampache/files/digest-ampache-3.3.3.5
new file mode 100644
index 000000000000..eb8faf3ba1cc
--- /dev/null
+++ b/www-apps/ampache/files/digest-ampache-3.3.3.5
@@ -0,0 +1,3 @@
+MD5 caec287d813bb303701ed7ac523e8152 ampache-3.3.3.5.tar.gz 1820523
+RMD160 7b803391cc0561fe77ad925878265aeaef0680c5 ampache-3.3.3.5.tar.gz 1820523
+SHA256 3968ff3efcdbb11fb87ea68d06a722ebef8c59b616a4dacdefd5eaa8588627b4 ampache-3.3.3.5.tar.gz 1820523