Bump phpmyadmin to the latest releases and add 4.4.0_beta1.

Address CVE-2014-{9218,9219} - fixes bug 531684. Address PMASA-2015-1 - fixes bug 542218.
Drop old vulnerable versions.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

8 files changed, 32 insertions, 143 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 106e05217a06..f8e5dc3aeafb 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,21 @@
 # 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.550 2015/03/01 17:02:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.551 2015/03/14 15:33:38 jmbsvicetto Exp $
+
+*phpmyadmin-4.4.0_beta1 (14 Mar 2015)
+*phpmyadmin-4.2.13.2 (14 Mar 2015)
+*phpmyadmin-4.0.10.9 (14 Mar 2015)
+*phpmyadmin-4.3.12 (14 Mar 2015)
+
+  14 Mar 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpmyadmin-4.0.10.9.ebuild, +phpmyadmin-4.2.13.2.ebuild,
+  +phpmyadmin-4.3.12.ebuild, +phpmyadmin-4.4.0_beta1.ebuild,
+  -phpmyadmin-4.0.10.8.ebuild, -phpmyadmin-4.1.14.7.ebuild,
+  -phpmyadmin-4.2.13.ebuild, -phpmyadmin-4.3.10.ebuild,
+  -phpmyadmin-4.3.5.ebuild, -phpmyadmin-4.3.8.ebuild:
+  Bump phpmyadmin to the latest releases and add 4.4.0_beta1. Address
+  CVE-2014-{9218,9219} - fixes bug 531684. Address PMASA-2015-1 - fixes bug
+  542218. Drop old vulnerable versions.
 
 *phpmyadmin-4.3.10 (01 Mar 2015)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index c0b2b017bece..cb815055e821 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA256
 
 AUX postinstall-en-3.1.txt 1160 SHA256 0fa47a49b9c5604339335d36ce9d1506a1cd07644d219fb7f35e2e4432fa8dbf SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec WHIRLPOOL 5b548fd9d41ca794f74936ce8ceda15c2c410cbc8d383c3376009a8936e47bc4d350c520ece1ff1eb20b0ac899f84fa513a185db5c255db362b7f3ee0b8f69ef
-DIST phpMyAdmin-4.0.10.8-all-languages.tar.xz 4776844 SHA256 50b4038d6b3335291fc1204cc3959db30afd69165db327b8c3eaeb5b38ef817d SHA512 98d5c843154e0c926678ab8ed9f40bede84a14dc477fee36936c20811a4e270952f756400701c407f9535c05b7fac2272eebe3a43d8e8dbcf989eb6940b4b493 WHIRLPOOL 3b8e06fa7cc16dd57cf9912ccc9e6122afe11150eb8ce983bb83f471df4b63f3af58074a026989af38465a45a1160088155fdda56e9e3b93008d2e0b47d9fb12
-DIST phpMyAdmin-4.1.14.7-all-languages.tar.xz 4879304 SHA256 72b954bbf95bacc70436450026915e4740274ee0c71eeb314a9f491788bb63b6 SHA512 03ffdd485b9e7ad4661189bcf3fca8892fb2c34d0b995d44b2c5e88c27b28095f0e8654109741b41543b56872c8b5d6dadb94e929e6332565f4a3ca5c3302383 WHIRLPOOL 850021d72cdec8af74433f8cd9f6c9a92e9950dd893ad96941a2146079f88bbbd3eb95e3fc45e7e81d656f3a952b5fdce6f4dd109804de2d19a78f06d5275ff4
+DIST phpMyAdmin-4.0.10.9-all-languages.tar.xz 4776232 SHA256 ca8399711dcd613f3e13de706ced326885001a0891b31dc9677dd3a23cc78258 SHA512 fbc973b2719162c2aa8a7c88d395d513c2425259a3b69ecbdfc08f954c6dc25146fae41e4d67c57815782e3cf36580ef50ed870ee245463f59948f9062882b2a WHIRLPOOL 6dc1c230f3ed95ee828909d6b96fadcca25c19ea90fcdc38359d7ddd8ee8acf1724e9f4fd592ef60a6a41498badc1ec3ab983a36ca9f41f4e4e4efbed59952d0
 DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256 e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512 34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2 WHIRLPOOL a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
-DIST phpMyAdmin-4.2.13-all-languages.tar.xz 5204232 SHA256 1bab6ef2e930ea4a92346c0945908cffba3efa45d6f39413b351cc8a2a017377 SHA512 d3cc81a9fdf212a0e86f88c77a1de195894998a338762ea8896e3c20c17f0faae56cb3752ef6fffdd67f5073b8a7e800001d1a11d8e8475ffe594879348ed0b5 WHIRLPOOL 4b6e69e630ccb350d1e3b5ddae1f0f81008b71ad4f43298c983d45d8a91e8be220adbd4f6a43a2b5cb26e87e0ce32d1bd349099a1634c024fcf0e394cc517b2e
 DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256 bc179dd35f6aa6d01b573f1e11b594d357fb2c09405b7fec06de5059adbec7c4 SHA512 121e6f063d7f4c4e8eaf048c9f68aaff713206ae077090fed671328f3fbd6f7d723309719c38e3a800c149630c1e2038b3f002bff7b48337278925cecf178b58 WHIRLPOOL 0bf85889e37f68907e8565a41d2e9ba804d41f8ad223a6d650117a93bd0900de242bed318a3cb467556b17eb2618d46571908090165cab666a2782a6f7465b3c
-DIST phpMyAdmin-4.3.10-all-languages.tar.xz 5443264 SHA256 9485bc83366ff0f556005941d74b5f93499937e213e8bfcef3e20368eeeedcbb SHA512 4524ed3bde2b5df870e3e7fb452e1ca6a28360ba1346752d54c8bbe1d6cc412d42352147da67a00ef198ea1f1ad5c8324ec8f6ddcb17dc167e89792191140762 WHIRLPOOL 06c40a7ae38c714dfbb25deadb434dcfe6257c97038153ae3ef7abfd56bc97a701c80b0948b6053ed7f7c177b08d14af8482ccb0c2cddb5d317859c717e5b755
-DIST phpMyAdmin-4.3.5-all-languages.tar.xz 5397680 SHA256 d499fb0c6178dcb488cf522124f84fc5babfcd6ce336706978f4020daf667df8 SHA512 dd8f29e96392a362718b793c3f649ab13f29d443f456a38d2b84c1eebba6bad194609d35329c51449c242fcdb0c5c085e25b6bb75ef8ae01f9b8e6029a616dbb WHIRLPOOL ef796804c4f14f5ddc931414fd9e6f82d4eedcee3e0537ca9cc7580faa9f1c3769387b319e548569f7609d2c9c597fc182d2300dc36abc8ef9ab5aefb6d4a669
-DIST phpMyAdmin-4.3.8-all-languages.tar.xz 5364656 SHA256 6d3a41382d878f59a959ceb25a671c8ed3a4ac9d0dc54e8de567c3ba264460e7 SHA512 e1ebb87a93e8557524b491be332f45af406de34a44f585692828276f5bfa6e65567f0747e466dbfbcc728715ab3702032b5172bc0cb48a8e2cb4bfedf632d177 WHIRLPOOL 130c00e3ca1145846ce5ef1eb2fb50dca216a7d12ecc7a6130afaa41aeaaba3dac8583989682ca223631e1e3779e4eeade1a876807b915bdbc09f3e5dd09593c
-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
+DIST phpMyAdmin-4.2.13.2-all-languages.tar.xz 5204448 SHA256 3a8262fe392337d1963e8bc4364e280ced8ecace32c94cae0a4394cbf19256ee SHA512 944a324269b28290e57d15d7ed247594ab62c7117c763069ee4739c4bde2b09dbc59297745459dde4ec083771318ccb1f462eb828bdca31451fa13c5e9e2f6bd WHIRLPOOL bdeced7f9ff774be06c68c2b0dfd461133012530795b1530155f67d36a6ad6b9e9da418ce842ed1b79e900cf19fe0659547b0cd4c2ffd696e9f96b69d9b8eefb
+DIST phpMyAdmin-4.3.12-all-languages.tar.xz 5370996 SHA256 2ef69b32af8dfb51523378b654b0d3ee58a08fc80ab7ef2d1bdc38e0e26956ce SHA512 d7bb599ed3f2d5674e0b03df519a8c7a293f8a2814b7d28dab66161e0e3eb40e8e4943f436d113829df5187d1b802cb53dad7495efbeccc64f79d2190df4d688 WHIRLPOOL a008f10f2901fe774af151ac28230f0eb0294d74213a1a0f95909d5c98dee543b81647dbe9d5f014513743aca5d00847871506d46f5dcaf430e4936c493ff8be
+DIST phpMyAdmin-4.4.0-beta1-all-languages.tar.xz 5665800 SHA256 7d3379b377618850d358e6d2760c71f48616068fd7b454662866fa8f8ce90854 SHA512 8d77b437122da5f2315628d442eae9eacacab0c03f85a15026f991d09d7c5f0a5e8148414f77353a2f4b55a913eb4828e3c1781e84cf7a346791d7d5af21d15c WHIRLPOOL 89f6dc1b7fa64a33fa09b2a7cf0bf9510f5eee65f74e08f6920bdd64ae968d4182704f712a9d193c5ba301480c9b4ef29003d4d5b0a6c1e8c3945c730932b3b5
+EBUILD phpmyadmin-4.0.10.9.ebuild 1661 SHA256 c8e87cd5a06c1c4b6ec2b817b978cb6ea6efa3d40cfa6849ef81366644e5485d SHA512 72ca1f72588dac7e0487869ab19ebbd3a08f863fce02506a303e9b6fa527e4ac03a9755cc5194b7ac91d464af247584cd8212c06b81b1ac8e3894073b8a3f427 WHIRLPOOL f601873164451a897b1841d8026116e80114f5e902eda920a45232df55a6fd8ddc0dc3aabe6182a1cc132c76c2f6ad5c0bd2b1fe5d2010f2bf3da7dbdbe181a6
 EBUILD phpmyadmin-4.1.14.8.ebuild 1646 SHA256 11cc0cc63a068b4c5192882d2974daa1561d43f7f485d129fef2b74afc13be97 SHA512 2675f4de933d7db3de7b25fcd69c7716010cfa6ea323258003ce9f057f1f9685beb95b20ce0d9e5e234493a6e526cd86abe04ea818b6202db91bdd4824a791db WHIRLPOOL 9fa2cbe90f759924ff3c0bd474b4c0c234b559dc2d4b8d6ac02aa4240aec12ff0971c0195e7e24951e8c54b08de7ce7b2aabc3abbe922dbb1f64040ef8660409
 EBUILD phpmyadmin-4.2.13.1.ebuild 1646 SHA256 147bd411a460d775f4485928312133287ee23cd2c051a9f81bcd25dd50c7a33d SHA512 1bf74f1e06f1927c835f1c433139ac9b7c3b37de9f15c99e30a2013a232965b47d17c74b3fe61500c89cfc1438f412565b45ec00638e64381f6259a80d802fb9 WHIRLPOOL f4a46cc8cb47b2a750773382dfaa397b003505152134a16175ac527091c53839fd29dacf5149d9341f15a526e0abf7f77513a13f4512cb6e8995d922068682aa
-EBUILD phpmyadmin-4.2.13.ebuild 1644 SHA256 ce68ce62547108c983cb0ae192b561cb1cfc240ca2150163db9c3cdb7ae8e19b SHA512 9dc204c712b74e441963c8108c5c6033eee850fa74deb045df34145aff5e387b9584712c7a237d8b17dd765f840a04afcc0f93205aab79e95ad19b5618541aa6 WHIRLPOOL 2045f81cb7a539e215de5392b43fa3a26a05a991f345e4d51eb029c5ce44b9f8be97b4bdb6a8765ddbf86ee1326f83bc361fcd29db264b2e5aa392c50a045267
-EBUILD phpmyadmin-4.3.10.ebuild 1659 SHA256 1ad414422a0e6e3834924e714701d180dc4c5877a24c70b13d4e57f7ef783dc1 SHA512 946c1ecd9d459e94dc6fa26e5eec0920bc59ec5166dae045dac165b651fc4b09cd022933e9abf2f34935acfeda4394b295ffd277774b0b50d7fd89de5eda2679 WHIRLPOOL fc74b9466639030e324a17c69762d9a5468c1efffd5b674e49a5641430959b10d38281735ff984c322f20ec8edf9d1321edb3119a4129836f45ae9cf94047b02
-EBUILD phpmyadmin-4.3.5.ebuild 1658 SHA256 9e4982afd8c8f1e5496ad04655e610aa2741da872a5ebbd4053eab5ae156374d SHA512 23e20474ac6181fb1940016978f0e9e99149d5031036590c185294517c0a562cc0ddbc75b67a1fbecb0d0ac9d6ed1c209fc9bc4fae15676e1b145d6e9d0fae04 WHIRLPOOL 12d133681a703950a1d797ed09fd46835220036d3f7385bfae55d3b0cc4ddc91ba3c70332ffa892dae0b44f668c74da234e5c03adb364641a9e642da756b6f4b
-EBUILD phpmyadmin-4.3.8.ebuild 1658 SHA256 5aa1ca525e48b894c85da423639f4e4be0b3625c201187d3e406c04f4735db19 SHA512 0bbc74eb940ce502281cc49af9fdc3487835555a74eeb73bf19d4ce45f20c3c3f736fd920302cd43c83450dc17dbefbddc3fe89f1148f116442b5c8fa613a9f1 WHIRLPOOL 8c3c4c658b245be8b4dc99949230c1c1afcafc719ac628ddd22d9fbbf9a35c82ce93bafaa0589a18ba7f552167790e76aca76a2b1317f014c8ab7613911f6e7e
-MISC ChangeLog 76578 SHA256 687bf0139416ace14a546fb1638de9dbfc87e917ecad283ae3e58d1fee9911ed SHA512 d4a832456c8e219eb12c94d14ecb644255e5738b3fc92fdeffeef29654fe280042b50a81411404ed620040d699f83b7cba042186ec1a5503b292da92e351d31c WHIRLPOOL f104d6adbff5376583246b266e5d4b84b6f34d53a19ff1fd0e2905d10f5388430e47f39016becd469a853b668f5d6c5f7272f1535cd6d8379644519fd6a24835
+EBUILD phpmyadmin-4.2.13.2.ebuild 1661 SHA256 84aec49e6e56067402d44bd92b202daa01085ca9b6f3097da0532a21219541a9 SHA512 44f959eca4ac3b18f7de0fcdbeaaab4579569693c9c32eb6c2708e9c16b1cb98ca0dea94cad3e575fb77952774125397738ba877e7b22fa1c995f564dd6c288a WHIRLPOOL aaefeb8cc87da53bb08c03e3018d28ed736f5d671eb10d13501e456ded4d1b79dc0e395310e7f7b7becf540707da69b9404e70e548cbb3df654a02bbfd11dc69
+EBUILD phpmyadmin-4.3.12.ebuild 1659 SHA256 6f37a3491e167c0b3c81a5cbe3154529d2ac81365cbe6f8b043af4d53762a538 SHA512 f12dfe0a9666117a3b8b3a300e69c34c6c5673c7fc161de1fa6dee9e04c62a352305f86195314904f942a44d49b5426f276456e525dc788e48810bf5e98a6443 WHIRLPOOL ddcc4861c7b450db5a115ffe2515b1c1ad17268aa823b69eae3bcfe6ecf32959fdf5283425545c09311ea56352483ae5c8a9cc274f1c95304685535f07b1aba3
+EBUILD phpmyadmin-4.4.0_beta1.ebuild 1664 SHA256 b0ec261053bacf7115830a04bb4e5b2c069d2a48e3a932a5d5e8e1d0035114d1 SHA512 6d1c3984b4f137afc76f1683d98010b23bbbd14c332b321656354ab0cb1b2fbd6c6b597b61012db9c63fd9b581ed1a912087e2d2d8b15205faeaf442e0e0da5a WHIRLPOOL 47265223e3a75839028f7bee6d606927f56c4cf5475a30fd0864c198c4f10991cbda54fe5e509ea5ed39088dca5553784926b91e43e264e001e2c717e0c82cd9
+MISC ChangeLog 77265 SHA256 b6de906433b4d3afcbb2e415108503b9ae88949a32bdfb2b58ed022bb1791dff SHA512 b3826248a5fd1f07952995258cd23bdfc9c09a3e4c1bac44aecd3fbccb5db0891fe55096c99196e43ce62db35f5f1ff5466e59afc0b3959190325a94549e4f7f WHIRLPOOL c809166b50c370380dff33f5dddbad417ece31995300359941261bb27ef57aadce0f3dc236bd0650295f5edc906445f6d35ca0e533edd9ba2714f97e10c6c85a
 MISC metadata.xml 519 SHA256 01d144b9a9bd96948c642f54fcad77c03644f4c19c6af44fb145713f01b1d6f5 SHA512 7ae636517f5937c91d0dbcf51b198d8860afdc1669033fbcb16583853976e534d16f4d2a7b8d9a33e4ba942869c788c5649019611fa4d4393f0b1726f6d01ce1 WHIRLPOOL 4318fba7507a02a52d396f32573c0d4e377141c169bd22f323f5006ad4e0cf69b70c1285de81e1ac8cbdeca0ef31fa3f797f21d97037fcc304d1c3c3a818e7a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTzRfcACgkQaezjy7sObpgY+AD/fxSJcRqa4INF0KCBCOwpLTeI
-gcibqWvJjw/gI1CV62IA/1eYLRn763dJyQSqOzH27r5hd8AxwLVxNh5YqVSYDhq9
-=mN/w
+iF4EAREIAAYFAlUEVNMACgkQaezjy7sObpjouAEAs3YFbR537MVx+RLnk/bYBiiY
+5GvnDEEaWhK2wpEMxmwA/izTAAwa4coT7K5DmF5dKSO8UK5dyb9x0hCw6Bh6yZ1h
+=pq2A
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild
index 8ce2ba3f21b9..3b9a25aaa693 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.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.8.ebuild,v 1.1 2015/01/07 16:23:03 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild,v 1.1 2015/03/14 15:33:38 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.ebuild
deleted file mode 100644
index af3a5f14904a..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.7.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.7.ebuild,v 1.8 2014/12/26 09:28:43 ago Exp $
-
-EAPI="5"
-
-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.3.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild
index 7dd2ca2ed824..2f51c423d54a 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.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.3.8.ebuild,v 1.1 2015/02/02 04:43:23 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild,v 1.1 2015/03/14 15:33:38 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.ebuild
deleted file mode 100644
index 2dc430327473..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.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.13.ebuild,v 1.8 2014/12/26 09:28:43 ago Exp $
-
-EAPI="5"
-
-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.3.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.12.ebuild
index 92da6f5b9227..3122e1f7697b 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.12.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.3.5.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.3.12.ebuild,v 1.1 2015/03/14 15:33:38 jmbsvicetto Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild
index 287c767fbae5..2b350dfc1c3f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.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.3.10.ebuild,v 1.1 2015/03/01 17:02:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild,v 1.1 2015/03/14 15:33:38 jmbsvicetto Exp $
 
 EAPI="5"