Non-maintainer commit: Version bump for security bug 288899. Removing unneded vulnerable versions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 13 insertions, 63 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 7d36ce6e64a5..1e2a256a41a5 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.369 2009/09/18 08:28:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.370 2009/10/13 16:41:09 a3li Exp $
+
+*phpmyadmin-3.2.2.1 (13 Oct 2009)
+*phpmyadmin-2.11.9.6 (13 Oct 2009)
+
+  13 Oct 2009; Alex Legler <a3li@gentoo.org> -phpmyadmin-2.11.9.4.ebuild,
+  +phpmyadmin-2.11.9.6.ebuild, -phpmyadmin-3.2.0.1.ebuild,
+  -phpmyadmin-3.2.2.ebuild, +phpmyadmin-3.2.2.1.ebuild:
+  Non-maintainer commit: Version bump for security bug 288899. Removing
+  unneded vulnerable versions.
 
 *phpmyadmin-3.2.2 (18 Sep 2009)
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
index 7e77577c1090..ae81f26ca4b2 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild,v 1.8 2009/01/05 17:31:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild,v 1.1 2009/10/13 16:41:09 a3li Exp $
 
 inherit eutils webapp depend.php
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 need_httpd_cgi
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild
deleted file mode 100644
index 1e3eb7a24c45..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild,v 1.1 2009/08/01 12:45:19 a3li Exp $
-
-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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/mysql-5.0"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype filter pcre session spl unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "crypt ctype filter pcre session spl unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	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_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
index e1c97abbfa10..1f22d6a65b81 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild,v 1.1 2009/09/18 08:28:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild,v 1.1 2009/10/13 16:41:09 a3li Exp $
 
 EAPI="2"