gentoo resync : 10.11.2017

28 files changed, 147 insertions, 487 deletions

diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
index f6ace775f995..4690923e7f7c 100644
--- a/dev-php/PEAR-Console_CommandLine/Manifest
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -1,5 +1,5 @@
 DIST Console_CommandLine-1.2.2.tgz 40705 SHA256 38d677e321c33bbf179cc9e4ec7840b63fef70531f1ce797fb09b50bcc94a417 SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603 WHIRLPOOL fd7651e46528506a87b10e7838be6663a82c40e63803993a33bac0ac165c45d0444b1a26a3c269f514db024d14ebfeb6188c4b4c3fc8f24b974244bd357c07e7
-EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1375 SHA256 6cc29307d8c8edba3a202d2341680cf0f0392b741dac26ca22bd7c8c1f0a63eb SHA512 171ed5d4632a019f682fdb15ccf6d10c82cad6e2efcb7b0d57edb587927b08a969b390c09265eeaa029b1c912191e06fe7c10be34136acda4e1a4187ab1a8b46 WHIRLPOOL 66e19f3961ab49ab1c80c88ebf3fe7ce2aaee9472f32881e5dbef1bec2bada1f5a55954f23875d804428c8908ecec5a4510e9ecc890d27ef461c50a35cca2251
+EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1382 SHA256 2c56575e2c5f71bc935e059918a09048c9b6c849c821dee35b212b9fe6ca604c SHA512 d2b4f91417eddb1ca9b1b2605bad1af513c411e4748d48d22f3a26f511101ad6c4fbba4b17906edf8497ec93e674f5963bcf33ac67fcdf14804ca2135b75b03d WHIRLPOOL 58f3203a7649cd56d3a9ef41b51afc68d2b84379fcbe7e0dc5cfffdfdb7c603d3c9bb8ce0edb891a4dbb930588a5ffac46153dca835be966ae430c82289685c9
 MISC ChangeLog 3374 SHA256 7367abf8016f86f8b26ccc7b6cd7f94e233645e098bb4fcce272079d4df9b191 SHA512 8ef6661e2012a27556a0eaccc8a1b97e05d0984242064babe1ccffb11f941428f844f95d591260092105107324fd4cec858241aa710f3c5c89fe6f6aa0e915ce WHIRLPOOL ff8d36aefa81a9e127b6349ebda91048b327a9a27c28f91d55f31d108a57a511dc02ac8c22d17220d25c6306121442a366296648fc7c2b0d135fb16ed9884bcb
 MISC ChangeLog-2015 1160 SHA256 5ef0fe4eea1d16b0cfb3795e2d0ae1266594f0f971527a61f5e80358f3f7e86c SHA512 796b2b0988efeeefa53d0c5d0176e142d470a2bb6cfa7055015c0216ed492082af45a8cc9653bec0ddef5c81da580f7ae14d03281b876c4854dfcb3710f02606 WHIRLPOOL 88410e83ae6df25888a42fcf581ae827ff51f3ca13c7c3601dc2b89edbe62e1ad4b7cf8fb4a0390b87faa79a1ae374dbf560a3d06e7f6603032d1ed815d5f431
 MISC metadata.xml 397 SHA256 d269fa9c98d2b98e57ac934245648a6437bbd476681d52d6c6f08574ba7f7e72 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84 WHIRLPOOL b03dd0fb3a7e1a77025d10b4289f24b370716d707020a671a47081b13eea00c3ae106f750610941f0ec269d7880f53d55beb11aa065aee2168fc94e2d5c7ac30
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index 5e5c2d9f5fc1..5668d3ce5956 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples test"
 
 # Only needs PEAR_Exception (not yet packaged) -- not all of PEAR-PEAR.
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 33761d6ba970..39ec1c717600 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -4,7 +4,7 @@ DIST Crypt_GPG-1.6.0.tgz 345474 SHA256 efbe714d553d9e478f39bd181acf684a681803539
 DIST Crypt_GPG-1.6.0b3.tgz 345445 SHA256 fc3757b33a1ea39f9816521aca50dee4bf6c07cc9c7be60600db32066cf89d29 SHA512 0a3cb665fac8e84a0699600155cb74e2394e4759fe0b111d971d253ca511a371d06d826e54abadfbb3f707833cd3d6b369f52d04541b3e04f217056ec8439f4c WHIRLPOOL 0df9a3b21bbfc0d2f8e3cd8efaf8e19a58981520976faf1c4b501a363bbb05c2e4299de22e3c987f8f5ead36e98b5401c813d07947e4e84c6c664c2d46c4e3fa
 EBUILD PEAR-Crypt_GPG-1.3.2.ebuild 325 SHA256 f15f858366a7bc749c069e21e0b2204ecf83bcb95ad709260aa3ac9bfece1b6d SHA512 5a088b2ed27216e8703b025acd2a273c7cdcac46ae43538b105bcd91ad8f390d37def6bf944fe3e849cd282345a8578cf5f002ea1049e983629f7fafbf6d281f WHIRLPOOL 994d214d7e6cd695f094769f3e349eebbcf7c46dc487301f28fae1f972efb8626a9bb7e4422c7f4ff934063079b4b0f698c6e30560975d2aad339651e38b84e8
 EBUILD PEAR-Crypt_GPG-1.4.2.ebuild 366 SHA256 5725e0c986551f99cc73a4fd72940e03ea7ee668f0e641efaef6f61e2fc19e1e SHA512 991325ee421e7fdcd649bcf4b8182d55d5b6cce5e4963f50bff624eb0625bffac25b23584be761a47fe6b1e556f23a79136048dfa9bde7b9e0ae5a3e8a4596de WHIRLPOOL 96a59c5b66b6e9ffe70de5978ec3d9a23b3207276674e479d299ce257728babd57c9789f80aa9d035b5e978e42f9d877ae740b4a19abc00a5255e1360de80ce9
-EBUILD PEAR-Crypt_GPG-1.6.0.ebuild 1153 SHA256 46eb390a55b0cd916ba2d2958c9fac4347d7d5b0b9770822ac83d6befd155b13 SHA512 fb66f4bc6b09f4486fdadc106e7701974ba9b44871db37568ac95920f813eb0841502b7003a7b4e2ed1e423ca815c46f18669a2108b086e653b13cbdaa953f31 WHIRLPOOL 17fd6e5203ff7f8a414b4b90f62ce2cbbf785d253bd40525a7c3892abf051767ef9fd740208b8653b95cd2078261539c0e90df08ee0a30805a1b4becede4b896
+EBUILD PEAR-Crypt_GPG-1.6.0.ebuild 1160 SHA256 97a1e7d0ac29464632d543602f50fca0f60452ceeace14ef7e02c7486b47a8c8 SHA512 9aac82daa882de79ff9e4aebef0fa43d75937d17e864f9997b27c446c4cc24fcedb45c5c9e46f346d9ac9f3f4b4185b38523858e0e4ec866476201ab549c24e8 WHIRLPOOL b6afa72262c21b2a56750351af68545710d36aa9c7fa3ab1489b092f652b8f734ce2d75fa2f8ec9852ffe2024e666b0c8fd6efd03ebfff15b0615e893e671284
 EBUILD PEAR-Crypt_GPG-1.6.0_beta3.ebuild 1139 SHA256 033bbd6bbb0a5b51b41b5b32df0cc52d164d0948525a2a15cad9089eac0bd0b0 SHA512 f1327d9e40c8e04cc99346ce6c7d0a203b23c7031142608494bc8d72e8c2a3a290c638801508a7eebb95279dc50f62470b6e66199d3c4956d2958d7a60576d7d WHIRLPOOL 42ae457328e77a94aae35d5ca8b2014684942e15e25d9f65a7370b6bcf03308495c867aec4d68606eb8e97f9c7538445a32ad4aaec2d350e6758147581cd2589
 MISC ChangeLog 3681 SHA256 ccfdcf70679b33e1b28680652411e2447fa2eea9d27a42933504d2dc0c70802b SHA512 5e4516069d4f9cbf3c9952185f7699863c2cd6c59102b022a89878a46705093430ca95176d33273edaf45cd59c9e7d3adb486f63a66fb86c71ee37032cf7e2c0 WHIRLPOOL e1ecec7b2ef99e9f42fc12b5daf49c1207c1e5ccd1fbd2c9227a29bc0c3110a5a4792145a9a777830e6a714ddb2343a693ad854014c3ce5a66a0f83a76ef06ac
 MISC ChangeLog-2015 1806 SHA256 837c06bfbfef5f278d2e9007c6defdbb7f7f9fd5bffacf2b9089bc1d10622eaa SHA512 20e67f03e8057f7d3ad93a6e42d064d8bd4bc6b2d164fcdbeb612ddb524af6883e56b606a3ee931d906c4f514ea7abcdf3c1b7c9e3be5fc161d5dca44a6f67ba WHIRLPOOL b0b6a2fc42109470c1493923ec4fc51d3e65a119889d31508c0bf4aa5234f57e14749860d0affa12caf3bcdda47ea3535f2c5e4333f76d11dcc99b60bb966a7b
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0.ebuild
index 9e21bd39011a..0d4d1766b519 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Really only needs PEAR_Exception, not PEAR-PEAR.
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 85976a31a197..fd2965f54885 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 SHA256 026b1f5981e7365237effda2a840f696f96a00c59e45ab7dfab79644f72dc2e3 SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58 WHIRLPOOL d11317410ed77c4bfa468c840b44f2b186c01c4b056d72a4f89951d3734d76a1d2888a0d64a9515541721650358c7461a5f1f6c1a032aab4e7937b163f86f10c
-EBUILD PEAR-Exception-1.0.0.ebuild 634 SHA256 7733bb98861fb45e9dd761975b31cf1933d35dea77b8aec4573c41458ae72ba1 SHA512 261e1fe76833c519530fc15cd7c80c99d0b8cbb26422d70e6ad3fb0d309d5eddd04d2a33c450eb369872ca81772e5fd852a25fc7d4a5973407666aafc0cc5fbf WHIRLPOOL 7747a792016199e426876d71aaab5d61f77bbda0f8e7408a54bd80b973848353f0e8a608af9c42a43e65a8649bd1aa0b266e792d8aa5d223fcef14d69a9294fc
+EBUILD PEAR-Exception-1.0.0.ebuild 646 SHA256 03ec9e8ff0b0327b3c6c4d4027841f73d6cac12bcf9cfe1fb254da36ad23de68 SHA512 6e840230274a2f3c57a32a62e308dee4dfc897c2cd89dd46a1d3949446e07a707d3a5b09ebc3771c93085221c995792a8c825f4a6ea5e6063eb1c5f8151fa520 WHIRLPOOL 8f688a3efb2c30872f4de9a0e1d8f22d0499a21043768820be21f35ca0f7c4438e3487d234da3d66794e9a14c80940446ee6815f5b7326675c6a1f6eacc7d9a9
 MISC metadata.xml 387 SHA256 bd3bcb2cb0d8274c95f1a70ae6c56cc1087f0f6b3dcb38aa4b66bbd075fca4e0 SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62 WHIRLPOOL 0971352b3c6ea01f468a351d3698e32e0dfcf223850451c77d237dbcfe7bdd0327c70ac9a4a3774f5481931d040e099afd28138f1e4594e8604880468220171e
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index ed45b38d93f5..42a77744cb2f 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RDEPEND="dev-lang/php:*
 	!<=dev-php/PEAR-PEAR-1.10.3-r1"
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
index 0d6efd568cb1..8c778d4c6907 100644
--- a/dev-php/PEAR-Net_LDAP2/Manifest
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -1,7 +1,7 @@
 DIST Net_LDAP2-2.1.0.tgz 96371 SHA256 ac5ed3ce1aee822f6d35c612df134d57f0085eb4afa83fb0a926ceca6950bf72 SHA512 3a8480d0aea32710cf340659d91bd3e738d4a08ca28a697402c6863b5af122c526be50f740b50a4d2b4f23e69d2f33814694bb2ccc3fa9e1fd3878f9612e9c70 WHIRLPOOL f147f30baecc52b9360ad62d1364d70464370021ebff20a86a55907bd298f5577dd82aa10517d5f38b640f2ef1ee27faf07af481dd3977176871d1a1e252e7de
 DIST Net_LDAP2-2.2.0.tgz 97180 SHA256 b4e7fee2ba574bea8b9c7040ddc6089268c5504a056f018966e39923d4450e52 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca WHIRLPOOL 0c74657774cd7adf0cbe3ee14642f27c1ca00129a02da416122f9cecd73dbcdc7968408d562bfd2a0c3779229f75a2238b998dc58ba1719dd70f728075367947
 EBUILD PEAR-Net_LDAP2-2.1.0.ebuild 339 SHA256 b833947595355a3f282327e70a2753653a73aa3b516ad1ccdb2117e0255c2376 SHA512 a1605ef601589a998a3a7d66ce7b81a1a1e0e085d24db75ee51f9c47cb5447e35f2c42f59287d6ad40ddec62bf05bfef5aaf75c41b202c59c3d686b220164614 WHIRLPOOL 2617969bffb089d66507a89b513f349c86ead3b81eed3077d5a31cea608344743912b1c4256e18a14b8aa1750faa3cb8a7aa84a733434df680228885932f4ca9
-EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 723 SHA256 2103ba90b91844204654312714879b37376e159b49f40dd0a69846467581b401 SHA512 a47cae26ae811155a6f690dcaa53c30cef9fe695a2c8c36379f4259d2fc47ba253c4ac732b83612a8c2719bbe4b1135004e68610a396e8a31cc7a45780598667 WHIRLPOOL 64c39e78be0cca29ad3b621c97568339f776163ed880e3321e2bb6ca2c08093ab7212439fbfa3ddbb62ba05e505e5f884e1cabb356d3442ade7777f39013ada5
+EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 730 SHA256 d8c47ce189e86b9bcd46a68319313a973761857682009761f44248f39f8398dd SHA512 878129d7e591fb71cd3810fc399df5b3c76902e8289980455848aab3c639831f45f605d79188ab5965d9fa1c66bb75cc09685018214d938173b9950210fa4451 WHIRLPOOL 60029be343ebe36f1d6d54b97af1ea26da20bbbcf389cdc31bff8cf7b3befd923efc6f0f764ff29f5f008c4b3b44eb8ef9467857bc8f404cf52106b259dce8dc
 MISC ChangeLog 4182 SHA256 8c7aff2aa6fc2e13d6c61ef38a8f5148a99ccc0d76d8a3e3978737b27a4e7537 SHA512 2761a58ed675738418cdf9933737ae8d8c65a48747b7c4ce921b020996a6960d80b1f97d109cac9067be24b7c4a986af9f9111f95dfe91ef1562cb9baefffc3c WHIRLPOOL 2801ba2c8d300ab50f62db79f9ea1901e08f93c70027faa7f189cbc8602de2979d01b27977d8d7ba2ce1af6ef7982db7792fb1c4e8e6dbdb3201996c7f627c7f
 MISC ChangeLog-2015 3207 SHA256 3b34916da23f6b25bcccefc12bd536aa29b626b16577a98a70f7949cf48745c8 SHA512 6b4553aabb2297bf891622112150b4946a1902520939f08bc1876eff4feec22c0203c7dbb77ebf739d0d58924491ebfbb256287c2f9d5da12ecef4749f787589 WHIRLPOOL d0fd58f930287be0ab749357a3c8abab6d886a3e065a2c549430944aa448402605361bba87c149da653d9f5fda4f8039834002c4e76701c2cef9390797b78189
 MISC metadata.xml 311 SHA256 33f9668cf11ee699c22eda53324b33df41c05f1f907dfdc3267349479ac6cd23 SHA512 a885b79978595cef0b7f647b110fa2f5687b72202cf87abd3bf1068b38be8a8cc5e2866c54809a0cee7dc1058f7e9990d102e4b4312a9de96a9f961fdffe831b WHIRLPOOL b0bcd51f10e98913b8189a4ee16731fca77f5b64b4a8211aaaa96fb70b1297d5053a7c09fadf345c34081c8f163513281a003fb34ff97666d5b267d9c6ef8d55
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index 129b730b505e..57f44a2e9188 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MY_PN="${PN/PEAR-/}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
 HOMEPAGE="https://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index 42d134ba8fd0..691aef0739e4 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -1,8 +1,7 @@
 DIST Numbers_Words-0.16.4.tgz 58379 SHA256 93aa2b8d370a9d87d1ae2595b4f1b7b78c18e0f06cd94a6eda042b6bbeb14838 SHA512 f07c5bf170a74be170c87c217b8561066938669d319cb6ca683c564e2f8a5917109c97ea51c7de740023605e77c78d34d9d864e187edfbab158af11e19bc3155 WHIRLPOOL 8acbb5d55717e6c593b22c831bf759dbe98a6ba5dedd3a7f8b447f9eb8d091eb1f2bc37b4980e116267e68e97fd6ea60ac78c2ba4284bc5a1cd751fe2f734384
 DIST Numbers_Words-0.18.1.tgz 72925 SHA256 cbe0c2b482623af9aa56a8da23d03bf562ff1412ac11e425775c737145fa916f SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c WHIRLPOOL 3effb9b2324b8e5fd60a5e841c4faf0eaa33790e5e61a3e967de50b0ae465d0f43a9d7ca19d28bf3176b3b798b1e3669f124e764c7b8ba1a66b78e7f0c7d71d9
 EBUILD PEAR-Numbers_Words-0.16.4.ebuild 281 SHA256 2d6e25126c4251e98cf55caf5bcd7add341d301df1fe30ca4225ba4fe7f437b2 SHA512 b9ba4d77d0f6a355cf2925bffc47bc5090959bf41e115a6e9becaeebcd6de6b60b244c2f2e8cad1bfc595ab97b0a65b1efad9d199805fc3bcf989c88149d81ae WHIRLPOOL abefb4da9a5ac1b1c3dfadc8694afe82324cb2d15a72c81a87f69080e3015bfdbec332d56f713d7c83d378c70c5fbd2b3a38d58264d08dba93ef11bdba197390
-EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 694 SHA256 244bba3b6478cce01405d7f9494505ba01ed74f8de203cfc3eadf5b5cda89221 SHA512 1ba5d67b347a6c8c8bde85e96ae18a2a1cc0f6785879b573699f8cb398f0a7eecc2adb285969acaa7e1cfaa22c58621a90c2b1fbabbf6abe03a26c5b71d46f50 WHIRLPOOL b913599e573e948facd1a4ab9f8fe961c039f89a2496e65cfeee53b68d937200d97dbd71eadbaa560b065a2c895efa58814bdaaf896561bb03d8605bb7d9a90c
-EBUILD PEAR-Numbers_Words-0.18.1.ebuild 361 SHA256 8e7861717799580a60f3c5b2303f67e10b59bf6f8f8311d9b379accfd80882ac SHA512 886d6914f41ff9510bddcffd3ecdb52e82a95babcb48652cbcece0c01b9518d5fa92a14c285f5cc1d6d2a05973a219e5037b3e5c30a7bd8a96ab3b823d327560 WHIRLPOOL 1f200fef43141bab7908856e7af91694177574ca83e253ca62cc927b9ac95fa78f643dcd118b305e946923ae23df9a4652a7eee75cfd40e09dd38da50cd294b5
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 701 SHA256 fe8711dff0d4e674192cb4b527adfe86a0905d84a1177630bbe41b9b559b50c6 SHA512 19e847cfd6d8d5ba41195a2a405078a236e05fd211f7b06572b0e19615acc266252bfe6e46b2c50003c367216ea83a8db24be7dd518a2a70b406e44de2c9effb WHIRLPOOL 4cb520c3a8a60bcf08f9ba4496d97e7122fe293dee33aad519bb62429492f37617a2344fd193aceef02f9ec5b6c2b0c47e5a99e818b5153367a7dbd9a9d108cb
 MISC ChangeLog 2700 SHA256 0b6e74104dac2521460f9c0a35b3fce8ce230d8fce4c0b45094582b5d7839e55 SHA512 a87e4d6e39af1564fc42e4ec801837067a91458ae20e85a380516f7680ea74579ba661719f1a4586882da0eef4aaba97fc9ca8bd85740d385ed1d56488190467 WHIRLPOOL 94daf25d5e83eab50b0b628c92182b9e9964ac0bc4977d6e309e912d2c59ab8a4541a51c7375de4721a1ffa1028255ee9e9e69759aad7cda135377494a085c12
 MISC ChangeLog-2015 6810 SHA256 ee46d208b2b89ce2fb3ca173dd003485bf6794330f167f78cc4382a788e73ead SHA512 5e749e827b73a7b208b1a951766cfb5ce37f5a6d9d556c81b36454bf8c04a36643bd668bb34c8268f24a8b5998889fbb70c0c6c84b4030ae3c4b7aba3bbdbe70 WHIRLPOOL 9d9f402a7d346b97f3b4d1abbbc9005d6a6e5495d5e00ac565fe86842e73c19ef7bf3e247408d24e15784789c3cbd019dd13fdcf275d10cbeb652dd46a4db8fc
 MISC metadata.xml 385 SHA256 f06fc7f0495935f2c2c11727c89588162de362ccb22b2f193e2595b79b215224 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e WHIRLPOOL 39652a29b0da2a19fb9abe3a844b9b9be8dd4f75cbc534e8a0f92a6a1aa5a460720bf5991b7657e22c3e400e28e7a43b4c4b656402a31a3acd2e3b1abd303e90
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index 62b9df853d2b..ff49aada8250 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild
deleted file mode 100644
index 7834ea4695e2..000000000000
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides methods for spelling numerals in words"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/php-5.3.2
-	dev-php/PEAR-Math_BigInteger
-	"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index eb15733b02c1..bcd8215bd3a4 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -2,12 +2,9 @@ AUX gentoo-libtool-mismatch-fix-v2.patch 510 SHA256 f4d702b44b86e481f6351b2880dc
 AUX gentoo-libtool-mismatch-fix.patch 718 SHA256 7ee96d72e09529f773c14db4da099fdb8beec12a370b76fb8901cc010cdb6fb5 SHA512 11fa9687c05ca448124b9b10801ca161ef1a5e77aa1aa9fe264a1e5ffa8947227e370a0f0d5f29d00bd5e7a280815dd43fc592996f52114cbf309556861db88e WHIRLPOOL 931d2d9c995dcaabaa2b5160a41146ad8771cb2b1947e2bd749b64be8c6520ad018ccc7bd8759aae7e3afeae78801c908b5362d089d89f55addaff1a7e1d1eeb
 AUX pear.conf-r2 379 SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be WHIRLPOOL 23a9d300340b463064a4f26489386d786c151394d763a9bcdbb6d5fd6ef72536849c375edd48c57f7c58e63a80650a975fdb7d6cbb368f59471789da4c65ae9a
 DIST PEAR-1.10.1.tgz 291167 SHA256 7eca0d8e4f6391d66d92abc4faebd5a9346e739b92573e20392db9e878a8d59f SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 WHIRLPOOL ef067937d805a1e5c082c5945ffcbffd005757326f72572563154f2b5c573713050cc002af7727ebe053b3956fa1113c29bbbad6e74d8fb110704b07b7291929
-DIST PEAR-1.10.3.tgz 291095 SHA256 c882979c48640b0b1a71cf2290dad3b3bbef1c33e4f1ec9af36a710e88e7921a SHA512 1ad531a6e0ac30719b05e58f0758393bc6cdb0e89b4f99f843e7318a40ef18e74767e8ed63346b0ece9d6e8e71c8ebe15b08eaeb6f0c4f3169814bb4bb524332 WHIRLPOOL 987d875a76ccbf26ea3fce0ca1b11d0885bcd98c73c1bdd43ce41f5f0cec4504f769aaa2b1bca3e501763ab21c3d6980a2eb02d26bfdfbd6f9a28f938ebbd4ea
 DIST PEAR-1.10.5.tgz 291151 SHA256 74c28725fed39617a6c2f310d5e1185b05982e3478196c2fedc64b4e747c2465 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364 WHIRLPOOL 8d2bf23cb28c4242b9c452f141b42d445e2fce343ed091bc834ba058fb0358a1b22228585c0074bde445a0de8807af27b57d503962e57c45cd1f00e2f982ad7e
 EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5088 SHA256 c95bf6f9744865cddefba51210a72f8a951d45315075486e9dee4212bf74c18d SHA512 a709a4874155a1095a390e159d77e797fc0cdca1b59929851a07e752d32648a27d36abc755c49a23fc6cc349dc0ef1a3f0012ba67c92b69c8c3c56b5394db22f WHIRLPOOL 813e72a67074cf26f704c513a1752eb7f9a956c7921d1e8e1c5f7a4626466e17bfe550b7129203c30f6cd587549e119a21a9e8ca19c41651a12be3b9bac0d7c0
-EBUILD PEAR-PEAR-1.10.3-r1.ebuild 5688 SHA256 7228c7cbb46cd41cd08c0c18844a746f310f1354b414c08ffcd2271aa196de39 SHA512 64ed25403281efda677a63208f7d880be24b86f7410ea4522039d91a3f8c6f0db89c41068e46692510bc4c94de75770bcd5d5ff5a6622705c3141a97333fd864 WHIRLPOOL bff92eb51830711634f7447ad5255959d83e798654bf9be2a0d1fb5f7bc9018a44b683c887ecfbd022b31dfde4a35ac06206f6989d573be53d706f1089c35e4b
-EBUILD PEAR-PEAR-1.10.3-r2.ebuild 5704 SHA256 0f1a81dd3a278b1db92d8dce58970f446bcf47e2e093b61078eb1720dd169a84 SHA512 4c55f8757f8ad140ef4cc3a2142e3ec0e6bcf2591e88cd40dadb435c2a1c911c0b7e08eac513eb07f2f75b2483041065302a5b694a8e7b29de5cc65a07e6bfdb WHIRLPOOL a4c268633d1284f27d48f07840c0de867e63ca6e44d84749e0d1b87485854361790cd967bd0ae53c9a7de005e72958ff2e63b81063de670d0ffa169b408f3a47
-EBUILD PEAR-PEAR-1.10.5.ebuild 5870 SHA256 57927e77a3aa5396a36c0a0afe97e3db4e6d8ccd551d9cf079c390328099ff5b SHA512 a8045d807eb56c361997a46671c1408c2eff3ad9bee8723b9533c6264e6f72df4f7566d3d0c1465b37703f60c2895c640cba8b18f9b3c66759cea64701ab344a WHIRLPOOL 368739149b16fa3f4fab24a753af05bb237fb220a20d2b40ab4605b56b5feb14806d4716d94384f5757565042df4d5d67cf98b38fff1dd348bd774eb665dc4d7
+EBUILD PEAR-PEAR-1.10.5.ebuild 5882 SHA256 3fcfbdbc07b80e91855a1a90f88430f984587530d6aaf15b37937848f8ccc5da SHA512 e87709aac8de8feeb34ad662a91dff86db7f704f27b4d9c4398cf7793655571f7e713babcc46922f0acf376b71a806296d1150e30b6784ae763b68c0ce84d91c WHIRLPOOL fca5b9515a0ec6455d4d88504131564c8bf36bd64c1e93f265b76feedbedd38cf31080fa0f5840dff56da7d2386f41d94ec90173eced4956fb11dc9be44bdf74
 MISC ChangeLog 4271 SHA256 1dbd6a3cfede43b89ddb4c89e17286f907fa86f2ee827681d6d205b86c23e24a SHA512 df1cc8bac38bae0e8514db77fa0dcd6f610b28980375e2bc7e716acc7d0b6d4d57019833a9d544ad415323ca4a19f131ffb5d5446f5d627465d18039a8a13772 WHIRLPOOL bd51b54d01f17780e88e1281b99b0f9fd84456b9301f8435c11705655af6bc561b36d1638110322b6047315e3755912c22ebd8d1004ff27bafa8f843c0f36dde
 MISC ChangeLog-2015 23213 SHA256 d764ce928a6df94c55474dfbda8643bf640233ebf0e486aca3e0ff6eae9526b0 SHA512 e3cba6a170207110b1e162b91c70c38f1dfe3841f2a63c1b7f924e7ab9ea5ee637d8d4cbc6cb284d4806546d751ac2aa5a4bd0e08c86213c5d19ae53ff6a2d56 WHIRLPOOL 9bdcb6737bee37275a1e3367fe85b4befd54d64ca7de96e057c2b73d7fd3f0d49637616c03ff12c8293f987d13f6b0e0f524369243dcf92044c1c544c5a0558d
 MISC metadata.xml 306 SHA256 91b4007b73df9f43b5286941673f49f3a9aae409c62c48ab31af8b4dcd191012 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa WHIRLPOOL 196291f2331d8f65b33f4f450ae97951a391a0240b9f3e1be58338eddf5b88e7c3e11660427f78a15b138ff20eb24c36293fbe6120dfc54eb9931d2f8e717f59
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild
deleted file mode 100644
index 94d1ad067dd3..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	>=dev-php/PEAR-Archive_Tar-1.4.0
-	>=dev-php/PEAR-Console_Getopt-1.4.1
-	>=dev-php/PEAR-Structures_Graph-1.1.0
-	>=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.phing.info "
-	pearchans+="pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" install -nrO --force \
-			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
deleted file mode 100644
index a097da16a520..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~hppa"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	dev-php/PEAR-Archive_Tar
-	dev-php/PEAR-Console_Getopt
-	dev-php/PEAR-Exception
-	dev-php/PEAR-Structures_Graph
-	dev-php/PEAR-XML_Util"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	default
-	# Exception.php is part of dev-php/PEAR-Exception.
-	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	[[ -z "${PEAR}" ]] && PEAR="${PV}"
-	for i in pearcmd.php peclcmd.php ; do
-		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
-			|| die "failed to sed pear_version"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @bin_dir@ in ${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
-			|| die "failed to sed @php_dir@ in ${i}"
-	done
-
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
-		-i "${D}/usr/bin/pear" \
-		|| die "failed to set PHP ini values in pear executable"
-
-	sed "s:@package_version@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
-		|| die "failed to sed @package_version@"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
-		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
-		|| die "failed to sed @PEAR-VER@ in v1.php"
-
-	sed "s:@PEAR-VER@:${PEAR}:g" \
-		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
-		|| die "failed to sed @PEAR-VER@ in v2.php"
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
-	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed PHPCLILEN in pear.conf"
-
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed CACHEDIRLEN in pear.conf"
-
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed TEMPDIRLEN in pear.conf"
-
-	# Change the paths for eprefix!
-	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the docs path (prefix) in pear.conf"
-
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the data path (prefix) in pear.conf"
-
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the tests path (prefix) in pear.conf"
-
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the PHP include path (prefix) in pear.conf"
-
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
-		-i "${D}/etc/pear.conf" \
-		|| die "failed to sed the bin path (prefix) in pear.conf"
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
-	pear clear-cache || die "failed to clear PEAR cache"
-
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	elog "Updating PEAR/PECL channels"
-	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
-
-	for chan in ${pearchans} ; do
-		# The first command may fail if, for example, the channels have
-		# already been initialized.
-		pear channel-discover ${chan}
-		pear channel-update ${chan} || die "failed to update channels: ${chan}"
-	done
-
-	# Register the package from the package.xml file
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" install -nrO --force \
-			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
-			|| ewarn "Failed to insert package into local PEAR database"
-	fi
-}
-
-pkg_prerm() {
-	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
index 9a39ac1c9476..277099941f1a 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-PHP_Debug/Manifest b/dev-php/PEAR-PHP_Debug/Manifest
index d3a7c9aca54d..cc486986a396 100644
--- a/dev-php/PEAR-PHP_Debug/Manifest
+++ b/dev-php/PEAR-PHP_Debug/Manifest
@@ -1,5 +1,5 @@
 DIST PHP_Debug-1.0.3.tgz 48967 SHA256 bf0d4fa8b1b8625d8d3244cdbbccf3caa6b2b2223392681a7036ed7738c75045 SHA512 740991812218abe21babc9892a3a814c8ed9180a7d68acafee933c4cec3c86282134bb46b2058cae8ff97a134a3c04b72d8113126184f6aff27fea9f1203344c WHIRLPOOL 4bd88ef219ae7f336a666ac55f9b3896243942ed8c5e73d5c2585dcdf59416e74974c9a1d4cb39e3e9d22421aebbd40ce9b0c2e7f3b1e96b44d30e6aeb10f52d
-EBUILD PEAR-PHP_Debug-1.0.3-r1.ebuild 384 SHA256 b11277370ab9dba546ef4fdc16eaca99281427dbae3a832f42110ff33c09daeb SHA512 fa418bed4276f8dc94808dd9701b5b25055be0321320ad6bde84d8139ac1e8869a363e34fb3e5737827810fe85951dd9ac9ef7e3f6b5792abc88b89502e69e07 WHIRLPOOL c85c7df38448d0615858a49a9152a9b02edecc6518e12bbe79c744f65e3992a8006f5a3c4ec999d303ee86470f1dfc4e5e06dbcf49464d571f577ddabd6d6067
+EBUILD PEAR-PHP_Debug-1.0.3-r3.ebuild 500 SHA256 c237de3621fc789f6a14fcac56588df2fad6cac781fd6640cefb1d0df9d22e79 SHA512 2dedd33c7808fb38b95418ca72f6a9b2fe67daa51855a983d0b558503a02999618ce2944016b1be045b8d175a719eb17dee317a1cb4e0764fd2a3c3b8ab00d54 WHIRLPOOL d031adb0b81ed3bafb5aa1be4dd344c617eaab4129afffc8249e1d8fd8ef7714c596707a4a8449d94bfd74349f2858b8a7c1d911f4cd04d76cea5f851699e5a7
 MISC ChangeLog 2453 SHA256 a6cc3c63f07961d047677c7ce9964cbd37048c57b419bd9d532e73568a7bff9d SHA512 10ac9d16a1f6ca17ecc5f4fdaa77b0f6a1b66c68a7141c25bdf403514feb3215bb5456765fe0cc8f0e112fcfd46d15dc35b2e9855cd61d22b85f7ec86be54e2b WHIRLPOOL 37f0a361867b058485fb6de4ac983ee866d978587ed3132919d7c84c926dd1aebdeae46b3d7b74fd34c3d49958808e91b2b7ada4cfd3f0561dff9d0ac2d59f50
 MISC ChangeLog-2015 814 SHA256 856320a34f26a54ae5dc5640223b133b942b291f8df0dab59b27758b36aaf663 SHA512 22999837f04d46230a1ba6793e4fc1c8815f2254899dc1eaa13f3b55c0cd5207e56fa736187121b38e2dfa32e841c256474db4fb704effc4a832f17e724d7719 WHIRLPOOL f6162ca4c759e109be480e27914c1757bb3e6cd87b097191930e0af207b528b5368a5564f6b2310da6a7c453c46f439ad0a9bcfef35080f850116495d0f8541b
 MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa
diff --git a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r1.ebuild b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r1.ebuild
deleted file mode 100644
index 76fdf9da5225..000000000000
--- a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides traces, timings, executed queries, watched variables etc. "
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-RDEPEND="!minimal? ( dev-php/PEAR-Text_Highlighter
-		    dev-php/PEAR-Services_W3C_HTMLValidator )"
diff --git a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..a09ecc06ad4f
--- /dev/null
+++ b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides traces, timings, executed queries, watched variables etc. "
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="!minimal? ( dev-php/PEAR-Text_Highlighter )"
+DOCS=( docs/README docs/INSTALL docs/CHANGELOG docs/FAQ docs/TODO docs/CONTACT )
+src_install() {
+	php-pear-r2_src_install
+	docinto html
+	dodoc -r css images js
+}
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
index e7706c7a95ed..eb990121b4ea 100644
--- a/dev-php/PEAR-Text_Password/Manifest
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -1,7 +1,5 @@
-DIST Text_Password-1.1.1.tgz 4357 SHA256 018f64dd1527e6dfbd52ca86c25decfe01b1e6e86892ef0f7f171764eb850c87 SHA512 6d43b47e8ebe030c9c87e4288698f26e2ef5062bb4c4477fdc5bfe0dfbf3f9aa01b0222ca6849b82d6a33330519410694f7db1339cfc46b740fc03fb37f35b22 WHIRLPOOL b7b5efc1459dd27c283ee4b68ed8de2c859e8c5938101043b2e0f539fee3349dcb6c32f27dc6ee2b16616c8592d15e41f9938875db98a3fb079bad760f60cafc
 DIST Text_Password-1.2.1.tgz 5631 SHA256 d3c5d12f31c44759dddf7a7b61a5240c480804d90cdf01381590b893f55c1de8 SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9 WHIRLPOOL 53f615f015e8ed392525e7dbe9d178a3d9ce5c0e430fa957fcb1cc4d2b29606acb15a085607f916560d8674b3a7e7564119dda74aefcee1e40b39c182c6ecc93
-EBUILD PEAR-Text_Password-1.1.1.ebuild 258 SHA256 5e28d10c91876afa6da0f31a9080aeaafb03f34c71133b631d85ae07e480e0dc SHA512 d742975fd53d38fac65313bae87b638ff6fec016c5984dfee5b95089c1b91e5149824a7ff8bce0650dcf14ce132ef5e2a931ff548440ce59180b93bc45c85712 WHIRLPOOL d0e22849ba11ef406fab5ab5c253586f650272b7ba25e84b718f8551715daf4270c79acbb1b25e9e77e33134745f3ee59ed1663bcbae26ef36b50217646ea323
-EBUILD PEAR-Text_Password-1.2.1.ebuild 611 SHA256 53cae581c7bfb3a2787f9b832702399ae1446557cc1328762f81662121ea9e44 SHA512 8c36cf5f6f24ce1fb3b897ef1f01d1181262c15ae932e03da5c20ae5c794d20efe054a8ecd42d25b1e1520310c58ee831529a270361aa4d82e7761b91132976c WHIRLPOOL 5f54b589123db1a0a9b51592c2c2397d5d20baa2444c32494c9712e733d70c34e08758e3d45721c36bb9e1974a3f7971959c335846f0a305807dedc21f483ac0
+EBUILD PEAR-Text_Password-1.2.1.ebuild 611 SHA256 b27ae2f81a209d170f33168861aec4fedf5c63a9bfcb2a0a226b4e3461c44f3f SHA512 8377974c3759162f01bce94c1d0fd0ef5ab3f96a9cf1834c08c177680830d5eb72ee3d6a8cb8505c7306e2c845fe1c682dfd29194976dc1960fa30b3aaffcfd0 WHIRLPOOL a281e6824430391bf9a66fc1b0da529ba2ff317383934b0f184779ef467409278270a54c31cd6050cc3c433c608c31c62061800f3bc8c06bbd7190f361a6b6ac
 MISC ChangeLog 2636 SHA256 3670f0e6c74172f1e2807d526d12a91683a43a6f1ed42032b3e51c8d71f919ed SHA512 7b254a36ef227e29e3751048efd3b41c65cd307cd607d1677ebad5de3400af47b68f3d9af2be04075c11b5faf27572660e2b6f8e1e789005b7fdadcb667ff6f8 WHIRLPOOL 2686bf1b9c206e3f864552b34f269251eb7cc72572cc1b0ed7218905945bad7bfb43baacf90388676d9a6793e57cd617956df9a0f0207a0dffa89bd70bc348d6
 MISC ChangeLog-2015 3659 SHA256 eb1bc28754fa2694707b159ebc8b35c38e3adeb8c11ea512a327a83110c4abf2 SHA512 2124a239d08c382b7b7db581ed63f64161fcc3bfd765758ecfede18257787821a2f8cdd43f1ad307878581bc9510718a866b7565abcc90fcaf34cdc43fd8e8e7 WHIRLPOOL 71036e627f81910393cc9402edbb8affc1825a89a82e6768f0cd2ab924ab29f8ba31b3f0ebdae0be766183ccc403c3342da8b98b809150e3902f41561ed231d1
 MISC metadata.xml 385 SHA256 4ecb1c7e111715b8ca73ccdfa993325ab76d38ff16fda2ea14ad615e0e4d5051 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7 WHIRLPOOL ffcdff9a073f5fffe8262a663e911dfba5099ec6e63d6679154d76b9cc4d3c470c554caba00d9718bb0161c52a708e1ea3e56e862f603c5ffbbe42745184b05f
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.1.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.1.1.ebuild
deleted file mode 100644
index 8032220f1f75..000000000000
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.1.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit php-pear-r1
-
-DESCRIPTION="Creating passwords with PHP"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 00d1919b53ca..3ba8e34522fd 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
new file mode 100644
index 000000000000..ef44c3b5815a
--- /dev/null
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 199 SHA256 c57dcb1b6d61d14edc2dcf7cedcc43ed7afd82f361a6617a8b9aaf20da841f92 SHA512 bb53c3edbab856787432d085f35af4b0388a46489ad910bce4d2e070537b5b1652da6ed7260fa5b1c0fb7f808c5e8a66b9fce0282bc0d62f3e80d1eb2284a905 WHIRLPOOL 9ee1e489dc78be252483d6350065ead452e7db9eb396d26c5fb0814935c3dd25edb7042f92ae905e06307d070179e1ad680f1a6270a59e64b0d01c041c0d49d7
+DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 SHA256 b1d0166ac9d7a2df2ec33c2fd3e2ccfcb556f013c8f58df3610e08bbf7e9c383 SHA512 2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a WHIRLPOOL 6059929c7b6e10ceafc4d50b7b2af2162c5a6e3b4dfc7390bd6b7adebca69de1847a01632e63c4b7de09581fdbd3c21dabe3c5182346d503228fd8e0112ad366
+EBUILD maxmind-db-reader-1.2.0.ebuild 2375 SHA256 86f365b73ab551c46d7f0a2a4a435954587909a3f85e3d8253053929740499df SHA512 4640012b889a6078324a9f2ddf819d4f9f4ab4f6c85bd7b0c9d0b85ca80dd7b09e76822fb00cad43f81ed080e519dea5edb25dbd2bc6bdad7b0076e40e79e8f6 WHIRLPOOL d12e6c8c4e5835d4c2223fd97fdf9138025ffb4612bc1ce082ca44ed4dc3a34fba934a1f57daba368716c1f509540927617981abc23adcc02768c2750ebe9db9
+MISC metadata.xml 472 SHA256 5f37f8e455bf9e0cd2946e5bf1ea10cfdffef5446f4e12e206e6bb6f0569c027 SHA512 7522517bc559e5309dce0bfa525c80f0d00ca57f03d7a6c771fc1ac20281c09efb142bfdafd56633edfa3e2a878943d6bd3c16ea3f93f0b5ca8ba11a5f28cf8d WHIRLPOOL 7a290ce8542c1cf968c7a24638993634abfc1dc9d5955869f1f9023e9d33aaa8984d8588f51de5d261f0286dc2e26c6d5ddb1f69bdd14531709a3d53dc936869
diff --git a/dev-php/maxmind-db-reader/files/autoload.php b/dev-php/maxmind-db-reader/files/autoload.php
new file mode 100644
index 000000000000..45e8c2dfba31
--- /dev/null
+++ b/dev-php/maxmind-db-reader/files/autoload.php
@@ -0,0 +1,6 @@
+<?php
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('MaxMind\\Db\\', __DIR__);
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
new file mode 100644
index 000000000000..6d5d40ddc9c6
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+
+COMMON_DEPEND="extension? ( dev-libs/libmaxminddb )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+		dev-php/fedora-autoloader"
+
+src_unpack() {
+	# Don't make copies of the source tree if they won't be used.
+	if use extension; then
+		php-ext-source-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare(){
+	# We need to call eapply_user ourselves, because it may be skipped
+	# if either the "extension" USE flag is not set, or if the user's
+	# PHP_TARGETS is essentially empty. In the latter case, the eclass
+	# src_prepare does nothing. We only call the eclass phase conditionally
+	# because the correct version of e.g. "phpize" may not be there
+	# unless USE=extension is set.
+	eapply_user
+	use extension && php-ext-source-r3_src_prepare
+}
+
+src_configure() {
+	# The eclass phase will try to run the ./configure script even if it
+	# doesn't exist (in contrast to the default src_configure), so we
+	# need to skip it if the eclass src_prepare (that creates said
+	# script) is not run.
+	use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	# Avoids the same problem as in src_configure.
+	use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md
+	insinto /usr/share/php
+	doins -r src/MaxMind
+	insinto /usr/share/php/MaxMind/Db
+	doins "${FILESDIR}/autoload.php"
+
+	use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+	# The PHP API has its own set of tests that isn't shipped with the
+	# release tarballs at the moment (github issues 55).
+	use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+	elog "and then most of the examples in the documentation should"
+	elog "work without further modification."
+}
diff --git a/dev-php/maxmind-db-reader/metadata.xml b/dev-php/maxmind-db-reader/metadata.xml
new file mode 100644
index 000000000000..c6051cdbefb0
--- /dev/null
+++ b/dev-php/maxmind-db-reader/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+   <use>
+    <flag name="extension">
+      Build the C extension that uses <pkg>dev-libs/libmaxminddb</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">maxmind/MaxMind-DB-Reader-php</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index 09f39c94204b..24414be2644c 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,11 +1,7 @@
 AUX autoload.php 11422 SHA256 de772da295f2ab21b20a849559e3430c0a07cedd68af1af81d2c8f69077441e7 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da WHIRLPOOL 3f8dd3cd284999411de7e242b3403e78bf62846f589054c9530479ec3797279897a3825079fb9a4dd9bff0b5b8353e0812d77f5d8b6205808077c907ddd88abb
-DIST phpunit-3.7.20.phar 2769487 SHA256 7972291d498a425f7daaf0274eed45d8ba564b87da3250fc975e1af2b0d60602 SHA512 9263364087ad2f4870ce4d849c31b75c82799088809e444206b9e113e917d05923ece62264568ee5f2a6d7aeb04d75cbdc375ddd7825ceff16704431de5f68bf WHIRLPOOL 7e6399ccfe01f5e59bd14e243ee4fed760a40d36708aea8c1c5be08b2814125effb89f351f8ea0777d280d7a5557aadfe6142330bbc020d4c1159658cfc99baa
 DIST phpunit-4.3.1.phar 3324489 SHA256 1bac0c5f53bc04efa680bf9b3dcb35e804714eb8f497931ba81bdf08ae432c37 SHA512 de123e2301dc1d64e7401ceaec48c9458c3ab0dfc78faa488bed12c5b30b1367e1f9f6dfbbd5a07b427a56aad6d989f36a11b4642a0a843eed9c39e551be0490 WHIRLPOOL dbe5bed2251832c6c905b09c131bc2dc98de6247ef55077d9882c41a0b20b2e8b1c2489dbc0b3c1ed746f81c2b7163042e73790fff2b2ca78f8470875d77d88f
-DIST phpunit-5.0.10.phar 2773192 SHA256 e740f1376fec6dd19023d38537583276f804d02f818af1f1b2012599743c7c29 SHA512 978bbc409aeb6823c8a8a630fb6221fad5e6aac1d49288c93a69936468bdc6c01d2c58344b161b6fa6a6ccf6ff1100738edb00d7c3cef357751d00323c365d8d WHIRLPOOL 52255b646c063b60d2094fd1f08546b4c498ddd3c4b7fe0ebfc3f6370581e00679774e5492a30a3f5428007250a1c13937c34016e746004a019bfa26e52cdc18
 DIST phpunit-5.7.15.tar.gz 205474 SHA256 d1ce59cfe5f4939c694b6a3ca84eed9a0099228ad8f57c379ffc6fd4806ef1a7 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3 WHIRLPOOL 7a268ac8df88992fe97fa74820a766bf4199753c743da945d6bae64987fa8f904c0dfe026d861d81aade4cd23576133592f998dc66150aea730cefc804ed610b
-EBUILD phpunit-3.7.20.ebuild 790 SHA256 761b10a58e8ec281e92452cc1084b2d19a7831337a843b79493762cf45719d10 SHA512 25d78e5933839f53dad132a540af898235dc38c04eb264feb39fb3ab57a24c2989563ee5c88b4f60aab33408fd77898d98e58039beaea38ea251051512f21736 WHIRLPOOL 479c7145308dc02e0bdcdcf92ee2f07261a1653fb09d43f715af2e93232fff179d669780125d3a3fb723b37fe8dec49ba99b86d5c6ed6cf8cd885a7e9ccb3aae
 EBUILD phpunit-4.3.1.ebuild 772 SHA256 a1d488279d01be7416c32141c0db24e2cff2df121d817ed10b9e71fd7409f20f SHA512 f2081416fde29101e40e5073ae1ab5bfe7d1320e4ddec1203c5589fe22ea4b8d5ce0e7fd8e20c0b34eeeef57ab8bfa62b3205a34dcaa8d0e74331061b71ad4e3 WHIRLPOOL a7c8757c86c8e571eb22dd1335137b57b7669032126a85db97bc88c3fac0b6f96503d496041e4f037dcb0f4918d906b048e9a14f6eba7c5e2fb1ae634128f1ad
-EBUILD phpunit-5.0.10.ebuild 841 SHA256 aea4a580a1a23b2bb81c1c4e1358276a5546b9ed9b474c7bd9f9b0f8eac49210 SHA512 f15227f08c98c8ad8886d6352e8829c0e7ed43e128c8d81630248f1efd366d7be02bb9d0a12ab1fe224b70c1499479b77b78b8dd4c01dea9383f1abd3c4efbaf WHIRLPOOL d2fce171cadbbbaab2fb7d2467f56c7f943e28f806a626927aa7662326f795ea362ea33e77193463e0e42af434bf24e7e81a593608291b9c30650fbfc55f6488
 EBUILD phpunit-5.7.15-r1.ebuild 1625 SHA256 289833800dacf2b6a628119bad5a224ec55ff0aba4d6aa61f37dc0dea0a4e0b5 SHA512 eb23f8cd9b561823e604abfe0392510e3d8e3dd8434246c10c05a8ce8bb3d30108cc58ec21d36f1616b0f41ff86a6d822bbcd765aa916e1dfa60a317698028d8 WHIRLPOOL f57ca6ea83c1bf867049a3632d75caa083ec53690daafc3dd95dbd8fe7850e3a854abf56d04b7324e36686c233659c9d122c0146068e5b48f3cb917a1b9c07a7
 MISC ChangeLog 3023 SHA256 6d343ae34ce20741e9a7ee4f76c643784c5ea9d50b8ac7ca474a8bfd7f7e0474 SHA512 54ddacca4385ff7d42f15f80e3fd85244d968c785f3f727e86cd82e2fe1bb8f6c43292531467ac6a1235f17e5bb5cbbef63c57bd3428f404bacaeb6d3d8d5e81 WHIRLPOOL be02adf42cd8ef9c6cdceebeb896945b1c6e39cb5fc601d96816da6e16d9b6d924d4cca0b620cfb8c49d2a819ab7f67349d43edbce69568f687b7fbde6019547
 MISC ChangeLog-2015 8756 SHA256 a85b55761b4b54a3285cb97908682563e0a0268fcec1a6a6f66c0afec8ed01e1 SHA512 4b91c6464851ef15927a9f99a8ee621749ba812643f26ee457cc54f6bd343db7ca65cfb9fd01413e05e447c58997df01fd3cdb041427b8e6ba86c7c4c73632e3 WHIRLPOOL 55e4d2fff87f15ed1a8dfd55d92f85c6042086e4cc1131f02a938508c8556514932d57b8df558871e5655da8f776f3d3c0f675dc3eaae0137de886f99ee5a7ae
diff --git a/dev-php/phpunit/phpunit-3.7.20.ebuild b/dev-php/phpunit/phpunit-3.7.20.ebuild
deleted file mode 100644
index 382ae095598f..000000000000
--- a/dev-php/phpunit/phpunit-3.7.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
-
-PHPUNIT_PHAR="${P}.phar"
-
-SRC_URI="https://dev.gentoo.org/~olemarkus/phpunit/${PHPUNIT_PHAR}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-DEPEND="dev-lang/php:*[phar,xml]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return
-}
-
-src_install() {
-	insinto /usr/share/php/phpunit
-	insopts -m755
-	newins "${DISTDIR}"/${PHPUNIT_PHAR} phpunit.phar
-	dosym ../share/php/phpunit/phpunit.phar /usr/bin/phpunit
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}
diff --git a/dev-php/phpunit/phpunit-5.0.10.ebuild b/dev-php/phpunit/phpunit-5.0.10.ebuild
deleted file mode 100644
index 46336b4d6db3..000000000000
--- a/dev-php/phpunit/phpunit-5.0.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
-
-PHPUNIT_PHAR="${P}.phar"
-
-SRC_URI="https://phar.phpunit.de/${PHPUNIT_PHAR}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	|| (
-		dev-lang/php:5.6[phar,xml]
-		dev-lang/php:7.0[phar,xml]
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return
-}
-
-src_install() {
-	insinto /usr/share/php/phpunit
-	insopts -m755
-	newins "${DISTDIR}"/${PHPUNIT_PHAR} phpunit.phar
-	dosym ../share/php/phpunit/phpunit.phar /usr/bin/phpunit
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}