5 files changed, 22 insertions, 8 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index a55d68bca311..b8b36a21135c 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.560 2015/04/23 02:42:37 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.561 2015/05/16 02:40:56 jmbsvicetto Exp $
+
+*phpmyadmin-4.3.13.1 (16 May 2015)
+*phpmyadmin-4.4.6.1 (16 May 2015)
+*phpmyadmin-4.2.13.3 (16 May 2015)
+*phpmyadmin-4.0.10.10 (16 May 2015)
+
+  16 May 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpmyadmin-4.0.10.10.ebuild, +phpmyadmin-4.2.13.3.ebuild,
+  +phpmyadmin-4.3.13.1.ebuild, +phpmyadmin-4.4.6.1.ebuild,
+  -phpmyadmin-4.0.10.9.ebuild, -phpmyadmin-4.1.14.8.ebuild,
+  -phpmyadmin-4.2.13.2.ebuild, -phpmyadmin-4.4.3.ebuild:
+  Bump phpmyadmin to releases 4.0.10.10, 4.2.13.3, 4.3.13.1 and 4.4.6.1. This
+  bump addresses PMASA-2015-{2,3} and fixes bug 549540. Drop old versions and
+  4.1 series.
 
 *phpmyadmin-4.4.3 (23 Apr 2015)
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
index 17549d2e9108..70d3a3a6fd0d 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild,v 1.8 2015/03/30 10:06:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
 
 EAPI="5"
 
@@ -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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
index bf6689761c6a..62fbb1b14c6e 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.9.ebuild,v 1.8 2015/03/30 10:06:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
 
 EAPI="5"
 
@@ -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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
index d7604f3b6617..e75ed764a6ff 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.8.ebuild,v 1.8 2015/02/24 10:56:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
 
 EAPI="5"
 
@@ -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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
index 2c239a31ea12..376709c86ec4 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.3.ebuild,v 1.1 2015/04/23 02:42:37 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
 
 EAPI="5"