x6 stable, see bug 531684

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x60373227

4 files changed, 25 insertions, 21 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 8a2716307121..7348a8ccefc4 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.541 2015/01/07 16:23:03 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.542 2015/01/16 18:07:14 nativemad Exp $
+
+  16 Jan 2015; Andreas Schuerch <nativemad@gentoo.org>
+  phpmyadmin-4.1.14.8.ebuild, phpmyadmin-4.2.13.1.ebuild:
+  x86 stable, see bug 531684
 
 *phpmyadmin-4.0.10.8 (07 Jan 2015)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 9cc533e9217e..69d42dde7c21 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -10,26 +10,26 @@ DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256 bc179dd35f6aa6d01b5
 DIST phpMyAdmin-4.3.5-all-languages.tar.xz 5397680 SHA256 d499fb0c6178dcb488cf522124f84fc5babfcd6ce336706978f4020daf667df8 SHA512 dd8f29e96392a362718b793c3f649ab13f29d443f456a38d2b84c1eebba6bad194609d35329c51449c242fcdb0c5c085e25b6bb75ef8ae01f9b8e6029a616dbb WHIRLPOOL ef796804c4f14f5ddc931414fd9e6f82d4eedcee3e0537ca9cc7580faa9f1c3769387b319e548569f7609d2c9c597fc182d2300dc36abc8ef9ab5aefb6d4a669
 EBUILD phpmyadmin-4.0.10.8.ebuild 1661 SHA256 11d0eba0983d8903914b67d55c264bbc2c44155a1cadfbe358dc71baace32c47 SHA512 42717ef5d7dd2ab757c01058e3cacf65e819c2a3351d011351ac21090041002324fb70a82b17fbbc63885b4dd540d8ead5c675ec54fb5b433c40c904f965ab97 WHIRLPOOL 11cf348fb46ab1b737240eee19d0a2f95d7402e37d1c5acfcf3a5cb0e6a0a207debc8c81a910212d648bca1fc6a56c0ea932cee1f2f3d8ba6ae928d6c19dcb3b
 EBUILD phpmyadmin-4.1.14.7.ebuild 1646 SHA256 a21034e57951065a95baf81340d05195e0ab99738a3008c8caf6ec07b6453733 SHA512 491a8e6500a6d88255015c32ed08621d000c812551539b3e18ab78d8baa195aea84d81d4af5a493da93dc3dbc4f5e11c8a9826035374eaf40504681e8bee4938 WHIRLPOOL 3d796e14d9241f009c804e70bb0856b5ec555b95d7699b0d99b75cd5181652ea10b34567ed636c8ebbf0ef06a52db2e3f209d4c47c751c37c6cc89b28231fff1
-EBUILD phpmyadmin-4.1.14.8.ebuild 1661 SHA256 157d1fa825f090d24527f6cc461414730bee2acabd2ea18b6deadd14b6c19187 SHA512 2c962216bb83701969b8337e147aa07cf8edeb6b901fc23996116061e051459e54f1f33c53b03e3d6051596bb191f678ca7f2292091f332bdf661635c7a2c983 WHIRLPOOL 89a49d450d40fa546114e6f6ce7ba657dba99b11432a0ae465492b646d9ebb3d3330ca12913c36942a8ab7b7e73788a0513f74d3c7fb1ce58e9c26a4c91e49e2
-EBUILD phpmyadmin-4.2.13.1.ebuild 1661 SHA256 9febf4c83dfa195b49bc87a4c7ee813670c6b2dc8354c4c33299416e29d3afd0 SHA512 3b0a07da4aa6e96f622ddd3b1c955262c2f7e44b77cf079a5c422c4fd0a8e1dc8e3508b09062cfd75295b18480ab453a6d0c130fd867c2a0ba2c3881a43ad5c0 WHIRLPOOL 1dd0b3becd640d4d7c5cbade004a1d7380b71c569bc97bfd9a8806bd9beb71535224ba84799e200f10af0e410dbabc9ed1e4ea4478968c9eaba869bd6085b829
+EBUILD phpmyadmin-4.1.14.8.ebuild 1658 SHA256 3e58a7978e4f58692b19f2b027e03852de2fb7c7a0fa6b0b2685ad611a7c2ad6 SHA512 436d345799c48cf70bf49b55d30414180d34b1d9b39a8305d0197ff65fb0a0ec87b6dd1ddea5a5eb2f8f2b2b3b2e7a8fe64ea982882b0d60b91a72bf0978e340 WHIRLPOOL 959902dda348f1cd95e6085fb54aac66fe7c90f123c7687bbf31f2df31db003ac529d89342a46b6859e6a196d94d3616ff198560cb67ee613616dd440eeea1c7
+EBUILD phpmyadmin-4.2.13.1.ebuild 1658 SHA256 7331843103922f83e934b6bb494b8dfb32365c9264867891d499b35f1d88d2ab SHA512 7af24c876045b0895545c820fef5cb0d978261d7826c2a336cfc5be3bd2a387d7f8a37a10d2af1071cb5ee695c0108f01c52e0f6bb17f80ae6208245997ae014 WHIRLPOOL 9ba22d411ab322bb0d6dda99f6e352545b12a30f4e1fbd146008d2a033db62177a740d09ef1cf464aa178468c3efb832065374dc096b26232f4e59bb5316f3e3
 EBUILD phpmyadmin-4.2.13.ebuild 1644 SHA256 ce68ce62547108c983cb0ae192b561cb1cfc240ca2150163db9c3cdb7ae8e19b SHA512 9dc204c712b74e441963c8108c5c6033eee850fa74deb045df34145aff5e387b9584712c7a237d8b17dd765f840a04afcc0f93205aab79e95ad19b5618541aa6 WHIRLPOOL 2045f81cb7a539e215de5392b43fa3a26a05a991f345e4d51eb029c5ce44b9f8be97b4bdb6a8765ddbf86ee1326f83bc361fcd29db264b2e5aa392c50a045267
 EBUILD phpmyadmin-4.3.5.ebuild 1658 SHA256 9e4982afd8c8f1e5496ad04655e610aa2741da872a5ebbd4053eab5ae156374d SHA512 23e20474ac6181fb1940016978f0e9e99149d5031036590c185294517c0a562cc0ddbc75b67a1fbecb0d0ac9d6ed1c209fc9bc4fae15676e1b145d6e9d0fae04 WHIRLPOOL 12d133681a703950a1d797ed09fd46835220036d3f7385bfae55d3b0cc4ddc91ba3c70332ffa892dae0b44f668c74da234e5c03adb364641a9e642da756b6f4b
-MISC ChangeLog 75252 SHA256 2d344c31e3566a90ddfdfabe05e2c1191c0d47283d03ef25796deb1aba3d0fc9 SHA512 d6d7843742843891afe2aa3c436b4b0f588dc4d9c44f272aa766017ac6803e4f1933bbd839a420a1fc1da2fd7134a5ee9aff77273d3f6dbd31c66f803f6c6668 WHIRLPOOL fd0c7998a2bf9a8c52cff6e8876aa203cd2d935872bae89381b860f138a7a1b9eef45744e9a1966e2fcbfc4fa962cc77e45069f6b1ee51250ffc99aaa7440b6f
+MISC ChangeLog 75393 SHA256 1b0ed4978b1af05c9be962ba7a0f0a6afc097dc7d4a34159a0d87e211747b6ad SHA512 9e5468b3fc9ffa0a496040258e69be65e3c924f2628cb1f6810450d352ec19f19ea917fe7c296871e9dc05c31bf73ea1769a8e453c48484a5162b1dcec759e18 WHIRLPOOL e80277e5bd6215e373ce11d557ba24a2736b340aedafa5d94fd82f72981d9c358973aa94656681db0f1ba65754fd0c56b8a0d5a736a64f31e2fce67d155f5955
 MISC metadata.xml 519 SHA256 01d144b9a9bd96948c642f54fcad77c03644f4c19c6af44fb145713f01b1d6f5 SHA512 7ae636517f5937c91d0dbcf51b198d8860afdc1669033fbcb16583853976e534d16f4d2a7b8d9a33e4ba942869c788c5649019611fa4d4393f0b1726f6d01ce1 WHIRLPOOL 4318fba7507a02a52d396f32573c0d4e377141c169bd22f323f5006ad4e0cf69b70c1285de81e1ac8cbdeca0ef31fa3f797f21d97037fcc304d1c3c3a818e7a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUrVuNAAoJEC8ZTXQF1qEP4lkP/2S+akBoadS1KsjYU57qY+Hv
-GXW6pRqDQs7UfgC1t/O9T46/UYMe049iAs38xDEqgNkRsV7BR0nw2gJS2AY78e7S
-czHJAzbCuYRfba8xBm90O9LPJPGKcjuZ+EglzCvHX9b/lbRoi8HqPsAhGSnJeOGS
-GUCzO0heAVROLsPeeSE/83Mk29jgAFE34xMuZhJm/bU/HuovQYSX1kO9ZxNPyV6c
-8thYKLTYQSeRVDTpUCM8LsyiN/yj4mrcvVJ+aG9hUskar0ZvgH+EccHdNIlwYTtp
-2BWU/GtKmzNbeFRae19QADnUWF5l8eoaNqlz4AfmydPqEDd/pWsvhx1pOGMoZwyK
-AlqVAlRTe/aWvuvVuQSdvQwLPUYL+mjRoZAVFPSv281XidQzenKR+UV0rZHVpYtl
-Whdp9Z7qgV5bmemxQ4JBUkWxeFhlp0sGLn7qciAU3MCvh9uLaPXnq5pTObMLP8JO
-3qEa6QoM9FhQJsaNV5UfNBO71lN9rsH/ZjPSplFEW1R8UOFn/0Ne0aGMuDjN1qJr
-KX4F95rc2M+ZYcpoYZZC/cICa5tlEN2rnu7dNHcB8s8EHk52hg7MdjFrwFuq3cIV
-QppC0+5azX+tlH2+VJFKPg3/fRb/lK8whR9FV90sDqa/+u1stlINYhidtGa6KNJh
-jtG0je8OehEipdipwlMt
-=IEJR
+iQIcBAEBCAAGBQJUuVNSAAoJEIug43o+kWudbHcP/jLYPwY8uOvgSh8sc59FP4Tk
+jWNnyRuv8D/jTzE5iUCk/OorpRUBCs9jH9T01ImamfGPCdwGSXZ6TrvIt+YXuO+C
+TU8729nOLmHH/Ij5bhDCjk2SgGmvo+KrFFG3fs8k+dn6kFLPTgp/rYHWCUOSPOa0
+QWFgpaa4ulD4sQ/orI4zxJJ4YvjOW9wvbCROuaZOkJqH6OqFgoY+hEhE5FNBR4Qe
+Jr0f0L7gtWW4CpcBuAJbZytQj3i9o/S6QYcRpxt+w5TewsumXYVkY2WvpLSc4eMK
+FHcl15mEFgqC2NQOZqw9NYzIJfytN3UtFyv3znuRLHc2hZsC3VVqeV9OBRuXaCfC
+phcYWhvEJycg9/8JyElL2E95Pc/a1CX03G19l2Es0Rpib4p20Qlrxuxyfjmvp7RO
+YxABg6WQ5K1aIfOIucHGjXDDQi9M8aYkFUnOu3BxBphemqIaa2z8k6eHnqfOa/ri
+SW9Plr+OilC4oaKTWCp2ZAclblDi0j9I3+rv71scwmd57w1IVVXdZrU3eBAOkcWs
+/KsCsDf9t+wgMTQXA2OcBTugVW4kAzH4+9xHWhKFPxGx3XZnqN9qKNt0Lt4rV/pt
+c4i1tLPSbzZ3XMeaHk7gyEZJXhkCRXtBSntbBpoVvBFtRGL1qUq7IWR7+cKoJuTX
+RkrRSgplfwwAzQUxV1QE
+=IqoJ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
index efb51caa3b29..1b419e182435 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.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.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.2 2015/01/16 18:07:14 nativemad 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.2.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
index 3b3e6fbe4e3f..81440f61eb05 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.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.2.13.1.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.2 2015/01/16 18:07:14 nativemad 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="