Version bump for security bug 302745.

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

5 files changed, 9 insertions, 182 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index d048caa46988..87f6f04118b9 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.388 2010/07/18 20:24:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.389 2010/08/21 00:18:15 a3li Exp $
+
+*phpmyadmin-3.3.5.1 (21 Aug 2010)
+
+  21 Aug 2010; Alex Legler <a3li@gentoo.org> -phpmyadmin-2.11.9.5.ebuild,
+  -phpmyadmin-2.11.9.6.ebuild, -phpmyadmin-3.2.2.1.ebuild,
+  -phpmyadmin-3.3.2.ebuild, +phpmyadmin-3.3.5.1.ebuild:
+  Version bump for security bug 302745.
 
   18 Jul 2010; Joseph Jezak <josejx@gentoo.org> phpmyadmin-2.11.10.ebuild:
   Marked ppc/ppc64 stable for bug #303761.
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild
deleted file mode 100644
index 5aa605cf16b5..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.5.ebuild
+++ /dev/null
@@ -1,63 +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-2.11.9.5.ebuild,v 1.9 2009/11/03 17:26:43 armin76 Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-
-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=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session 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 pcre session 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
-}
-
-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-2.8.0.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
deleted file mode 100644
index b9960c56d80a..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
+++ /dev/null
@@ -1,63 +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-2.11.9.6.ebuild,v 1.9 2009/11/21 18:56:02 nixnut Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-
-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=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session 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 pcre session 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
-}
-
-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-2.8.0.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
deleted file mode 100644
index 64776c80098e..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
+++ /dev/null
@@ -1,53 +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.2.1.ebuild,v 1.3 2009/11/21 18:56:02 nixnut 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=""
-
-RDEPEND=">=virtual/mysql-5.0"
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,pcre,session,spl,unicode]
-	|| (
-		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 CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog || die
-	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.3.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
index e18cb2828c2f..a9b5a639ecc2 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.3.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.2.ebuild,v 1.1 2010/04/30 21:41:43 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild,v 1.1 2010/08/21 00:18:15 a3li Exp $
 
 EAPI="2"
 
@@ -17,7 +17,6 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/mysql-5.0"
 RDEPEND="
 	dev-lang/php[crypt,ctype,filter,session,unicode]
 	|| (