Version bumps to address PMASA-2014-{13,14,15,16} - fixes bug 530054.

Add unkeyworded 4.3.0-beta1 release - waiting for feedback.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

9 files changed, 22 insertions, 251 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 20556b6d6965..a3d1b180d972 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.529 2014/11/19 09:59:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.530 2014/11/22 05:03:31 jmbsvicetto Exp $
+
+*phpmyadmin-4.2.12 (22 Nov 2014)
+*phpmyadmin-4.3.0_beta1 (22 Nov 2014)
+*phpmyadmin-4.0.10.6 (22 Nov 2014)
+*phpmyadmin-4.1.14.7 (22 Nov 2014)
+
+  22 Nov 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpmyadmin-4.0.10.6.ebuild, +phpmyadmin-4.1.14.7.ebuild,
+  +phpmyadmin-4.2.12.ebuild, +phpmyadmin-4.3.0_beta1.ebuild,
+  -phpmyadmin-4.0.10.3.ebuild, -phpmyadmin-4.0.10.4.ebuild,
+  -phpmyadmin-4.1.14.4.ebuild, -phpmyadmin-4.1.14.5.ebuild,
+  -phpmyadmin-4.1.7.ebuild, -phpmyadmin-4.2.8.1.ebuild,
+  -phpmyadmin-4.2.9.1.ebuild, -phpmyadmin-4.2.9.ebuild:
+  Version bumps to address PMASA-2014-{13,14,15,16} - fixes bug 530054. Add
+  unkeyworded 4.3.0-beta1 release - waiting for feedback.
 
   19 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
   Removed a3li as maintainer.
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.3.ebuild
deleted file mode 100644
index 88f347ac0a3d..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.3.ebuild,v 1.1 2014/09/13 19:15:51 robbat2 Exp $
-
-EAPI="4"
-
-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.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,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 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#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.6.ebuild
index a74dda986f95..f4c41274a8de 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.4.ebuild,v 1.1 2014/10/02 03:28:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.6.ebuild,v 1.1 2014/11/22 05:03:31 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.4.ebuild
deleted file mode 100644
index 40e3540e4064..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.4.ebuild,v 1.1 2014/09/13 19:15:51 robbat2 Exp $
-
-EAPI="4"
-
-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.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,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 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#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild
index d9c1361e36a4..2be9cb7534ec 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.5.ebuild,v 1.1 2014/10/02 03:28:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild,v 1.1 2014/11/22 05:03:31 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.9.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.12.ebuild
index 8a7d07125d6a..34b389c22b35 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.9.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.9.1.ebuild,v 1.1 2014/10/02 03:28:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.12.ebuild,v 1.1 2014/11/22 05:03:31 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.8.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.8.1.ebuild
deleted file mode 100644
index e14587414741..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.8.1.ebuild,v 1.1 2014/09/13 19:15:51 robbat2 Exp $
-
-EAPI="4"
-
-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.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,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 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#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.9.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.9.ebuild
deleted file mode 100644
index 6abc8de9c76b..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.9.ebuild,v 1.1 2014/09/22 02:47:12 jmbsvicetto Exp $
-
-EAPI="4"
-
-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.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,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 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#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.0_beta1.ebuild
index 67db372e8fcf..32371c5ea842 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.7.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.0_beta1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.7.ebuild,v 1.7 2014/03/24 14:29:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.3.0_beta1.ebuild,v 1.1 2014/11/22 05:03:31 jmbsvicetto Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils webapp depend.php
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
 IUSE="setup"
 
 RDEPEND="