Version bump to 3.5.2.2 for bugs 404991, 410965, and PMASA-2012-3/-4. Use .xz distfile and bump EAPI for that. Removing unneeded vulnerable versions.

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

3 files changed, 11 insertions, 69 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 58b8dabd2d63..98b39955b947 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.467 2012/05/07 14:36:20 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.468 2012/08/22 15:15:53 a3li Exp $
+
+*phpmyadmin-3.5.2.2 (22 Aug 2012)
+
+  22 Aug 2012; Alex Legler <a3li@gentoo.org> -phpmyadmin-3.5.0.ebuild,
+  -phpmyadmin-3.5.1.ebuild, +phpmyadmin-3.5.2.2.ebuild:
+  Version bump to 3.5.2.2 for bugs 404991, 410965, and PMASA-2012-3/-4. Use .xz
+  distfile and bump EAPI for that. Removing unneeded vulnerable versions.
 
 *phpmyadmin-3.5.1 (07 May 2012)
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
deleted file mode 100644
index e928f3fc3f43..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild,v 1.1 2012/04/09 23:50:00 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		<dev-lang/php-5.3[spl,pcre]
-		>=dev-lang/php-5.3
-	)
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
index 1a8e1ee3dfa6..25d64e920199 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild,v 1.1 2012/05/07 14:36:20 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild,v 1.1 2012/08/22 15:15:53 a3li Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils webapp depend.php
 
@@ -11,7 +11,7 @@ MY_P="phpMyAdmin-${MY_PV}-all-languages"
 
 DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"