gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /dev-libs
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
87 files changed, 520 insertions, 1419 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5b6cf4b0c2d3..602dac56e5b2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest
index 0ec6b2fed31f..68c109423736 100644
--- a/dev-libs/OpenNI2/Manifest
+++ b/dev-libs/OpenNI2/Manifest
@@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e
 AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc
 AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be
 DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
-EBUILD OpenNI2-2.2_beta2.ebuild 2499 BLAKE2B d1e10402654813cd70cea5f996fa5058f6d28277b0e2593511bf3d4050c563a565055ce602a3e7315565cb3bccc36ca123f33d3abe77c9a6db2c53a42edd65ea SHA512 5707c58d8e03eabc28b992edc4de00ec5d25dfd13482ac7cbfa3c90d9333c503315f4963de63cec260874e5c333b363c3bbdd25990e958f8a42ae51677bc3c46
-EBUILD OpenNI2-9999.ebuild 2440 BLAKE2B b25ac8393452cd3b88d2e141c06e057557bac866d3405233b89c972bfac09f874f58b8f4742139eca5a1adc9fee64cb9027c370e3d5d211138a7c34919cbbb01 SHA512 81b2e21a7a7eeba981203ac950ece70956036daaf6bdbabb83b89b9c04ff10d1d3484843e856f8337c6f8bd57752414d6f2300b9ef41da1f066477b7ac8c096c
+EBUILD OpenNI2-2.2_beta2.ebuild 2500 BLAKE2B 05b0b1c6a71efa8c9ab4031126d1cfc9f43e09935a2b9be4f3b811534ae1dc0773050ef2c11fa2c557b63b783b46a1a7ac3b0bcb7e047d5bd417193c1a4b2c88 SHA512 44cf0ac43f6b96c6d9566543fb3caaa4bce7de745c99dca1433cbcff7fd139d4445be10c9a6fc3f66d058efe8868fa2b5d6eda473162d980f08414492eb65eed
+EBUILD OpenNI2-9999.ebuild 2441 BLAKE2B ab4607cfb156bb3a37e7fe2e6619a17249f1314102b74e42771a5c34b2b71bf351bf6747fb87a1fa30f36793a54341b1a1f40baa3c6e937585f6256e3aa813f7 SHA512 f890fc3f3bddffb4f576847fc377da836f522a2e79f9ac0f3892b0fe443cf5c5b4727fb7151a144e623bf82ff4f5a1443aa9c7bb98537f642f65503e7a953d14
 MISC metadata.xml 341 BLAKE2B 5cf0f39369a82aea80badc678a0766aa9f9d2d2fef2108fa27bca9f7233d443371298334b356ba6253edba043d941a0ce821e23f5c1a119cddcedd8e79b1c9b7 SHA512 414b64e60046dc1628494ab50ae5f4c5594b9fe71daf7cdc844428200e6122bc471e27f982fa4eaaed6db6f93fb53312118a35dd52e01c576e8597f3e21b23c8
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
index 218a3a477fa7..4f39df7f4066 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="OpenNI2 SDK"
-HOMEPAGE="http://structure.io/openni"
+HOMEPAGE="https://structure.io/openni"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java neon opengl static-libs"
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
index ced4cfb2c9ef..1ced5f727b73 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="OpenNI2 SDK"
-HOMEPAGE="http://structure.io/openni"
+HOMEPAGE="https://structure.io/openni"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java neon opengl static-libs"
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index f65a013a2ffa..b5e29525467d 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,5 +1,5 @@
 DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
 DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
-EBUILD capnproto-0.6.0.ebuild 790 BLAKE2B 817ed1a14a05e6db318b03c35b1ff722cb578fdcb6a083d0742ef660baafa550bd92933c4c3d07de09c03ef5fe688090333099119cbdde224d3d36b6847ff16f SHA512 954df202a1889d1c58f2bf462817955a67663e17de4a94531ae725dd8658ed74a86f2dac97861c7821ad8b70bfa79e2cfe839790e98e4d01be5af79fed07ba5e
-EBUILD capnproto-0.6.1.ebuild 790 BLAKE2B f67a47e89c832b5be595e09989f8e2d5fbfdfd15cb0c34fd0211a4d0c492e023ca89ddaea546ce516e09bb5f636a97022bdb1539a7c230e4dd5c8b20d580378b SHA512 ee6720ff57616d0262a5a7f8796717f62a18cddba80479ef9480d5d9d847bd9b359535e40b8463a1abea8b40f92d8fab2d00e47a989bdb2f0a7f40ca9f4808f8
+EBUILD capnproto-0.6.0.ebuild 791 BLAKE2B 0b6b2e3dbd35b4bc6e75d497b28baeb0bd3e1998da0b139e1b279896223f21c28db49f10ddd381922f55661bbb9e010da9d421a584c5ec2652e04dff513cb8f9 SHA512 d3c794f90de85325011c4510f8d3c230fd63aff7cccad7cf9183980a039c686cc4a7686740dfa1114295ed9ecf9a19a7cca02231b7ddbc48f5a06547be9bf90d
+EBUILD capnproto-0.6.1.ebuild 791 BLAKE2B 4d6bea6b1e5616528804f24a4f1b8b80da4c546ff854b27804ee51b6780d2f50875e71586f42e3f2bae3615dac3f4df5f8605e43e7ac37d45ffb3d73f96529e4 SHA512 032be8ca5ea93114e4f4febdcf5f2123455c32db6bac3cc619323913a6be59237c057fed11e339750d0f0a406498729606a4d25157f840e21a0dfefc4e142508
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.6.0.ebuild b/dev-libs/capnproto/capnproto-0.6.0.ebuild
index 6510e318c5e8..2a6230fa3b94 100644
--- a/dev-libs/capnproto/capnproto-0.6.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools
 
 DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="http://capnproto.org"
+HOMEPAGE="https://capnproto.org"
 SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-libs/capnproto/capnproto-0.6.1.ebuild b/dev-libs/capnproto/capnproto-0.6.1.ebuild
index fd4142995470..358e6ae7a0c2 100644
--- a/dev-libs/capnproto/capnproto-0.6.1.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools
 
 DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="http://capnproto.org"
+HOMEPAGE="https://capnproto.org"
 SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 41028f642081..f64afd9d5aa3 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
 EBUILD check-0.10.0-r1.ebuild 1810 BLAKE2B 106168f6f135594653ce061d0dff535ba56d4d9de205d994d6e3dd91405496fcbc6d3c3835c3bf886a8cb29b7775fc8001024dce3e732028b9e6c5367da14d45 SHA512 9ce0cd9f3b3809823f4bdd5441351528ee04f4e470ca2b4f7f2622e5c4c22892870008fc6e9179e3d03225d709055c995e44767d5b07367d39e42bc07dbd0d56
-EBUILD check-0.12.0.ebuild 1705 BLAKE2B 8bf279d9d313de84c6c43c5863a10c3b413de53ee6af069cc850d806c528a70fa9992f369edc896f8f6b9914a25bcad7f6b4d5bcd7c3da629177c300e618fa30 SHA512 9c79e86f35d354347a11f76ac2f74a3135101a566a64b3a410aec275d9da890f2d3d8d7208bffac34a534dc2861002b45464d647d1d35be694551680edc12993
+EBUILD check-0.12.0.ebuild 1703 BLAKE2B b74ca868dd89dc438644ae6673e7bfd8426e1c9af65bf0e765b9e70cd4068939e8e1b74664111c32e5cce996a277027d8fbd5fafc93f9e0dcb2a97cfd9c9d178 SHA512 b090c3686a48756d787c6a59c1b2a7f443ad81f3c3914cbeaeec2460d3adfc6c9d57b58c9630d6cd9634b596a1eabb0ac0045e405521e4794e5516b994aa90ae
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 1e01364fcac1..bea0623e8351 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index a9d725585711..4b3ae11e06e1 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,12 +1,5 @@
-AUX collada-dom-2.4.4-gcc6.patch 589 BLAKE2B d2981573de9e3902081b2cfffb25f5ce06f50ad9f689cf311322366a55a3dabf106d93802145fbd838ac74ba25ff395aaed003fbcc5e169ff0743af41ccb4e02 SHA512 cb9c948ee5fc36b20852d4afc487aae3cba849e03f0f0e72a86891d7c4a5a132ae9b1b7f35f093b84781e123c07c682268dc8c2d1e1e6685908326ad33302d05
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
-DIST collada-dom-2.4.0.tgz 42517651 BLAKE2B 4bc0997d762a6626b78ef6a80d4ca01e98f1209d1628cd58b9734b5cb3a93fdd47826b08aa70e8334cb85f713bf36c9a93ca93219406d2bb5f77a2a077fba1fd SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1
-DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 BLAKE2B 0d6077fd4877a60fb02ab29a4a2e301f70e91316e390474a9ec37a528d69ec6273bc995961816be43679dd601ad2857f4c71775e639ae1e311d837793164cc98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1
-DIST collada-dom-2.4.4.tar.gz 4507681 BLAKE2B 3a5c0c4813202e2a14b54dd72b2a5ef6564b58ab6dbbe56625eb3ea09d2fb6c06dd23edc9a5d3de7f9c1a6ea9aeadc30089499748eabb5b9f334d7ec30b420fe SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.4.0.ebuild 490 BLAKE2B a8d73153fa630cbfa17e43001841a389db976a3e90be40cdab9e92f64fb700085fb32e09e4bf176dbc28e2bfc164a35236be2c27c1d31f9e9ff2ef01bfca32de SHA512 172680175df2c855767e51664ed37c3bdac37b73c0bd26aa8b40ce2b956995091520b02c98d86e105184c2b32777717b1fb4b0ccec0f21454c941c2464132ce5
-EBUILD collada-dom-2.4.3_pre20150112.ebuild 845 BLAKE2B 1b4aeb94df0d5d3333ae6858a0d84d73e30e874ebd4f51941f9059e7789f4b1bfb5fef96c5fdf637b415dabcd4a8d8f58f047c6dffd1fb54fb5a266847652ec7 SHA512 7559773cef187902ddc80eb6189e60323de517c5ec6bb4acb2761b93f769f508f7cf7e2982d414fe2c2df95e6844fb69fa8b60f4e33109da9750fa67b4082e1d
-EBUILD collada-dom-2.4.4.ebuild 888 BLAKE2B 5b22f503f455b4f9c8a7a293d1abded2992c4e661ff545d9cdb322d0435321918aa8948f46defc7b006709a787a1914c127d735a02390bcde8cb191f739651fe SHA512 561bdcf5c01267268a9252bdcda385a85f0430f0ee468ec63228f24443503eb23bc82fb51f6474ffe24e8d33af66d6e7c395f148179a048f17aef337b60b6582
-EBUILD collada-dom-2.5.0.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
-EBUILD collada-dom-9999.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
+EBUILD collada-dom-2.5.0.ebuild 749 BLAKE2B 6ab334a195a197efa817e5ebb9cdb04ddc152b3f34e35805d64143598976df51a4bcca92d833343d7ec8de090c75c8fb33225eda87f3350f6a3e3989a757390d SHA512 c934e13ba97dcbd6a021aed0beaa4ac00f8f5503beddff5da598b22d8d36a5dfd06f27996c757827ee198bc0724ba8335e414c19ee9b91a0a4696eb203ef1c25
+EBUILD collada-dom-9999.ebuild 753 BLAKE2B 11fcf22dab12fb6d9c371e5f536e767d8843bdc2ce019a8737c82323ce1e6f28474094ab2cd1c7e324063cdb95e458b62a5274b72acdb41230aefae02b58a597 SHA512 6480ac09fb6b199ffe0226b5274c4ac23a1b61bf95758d484fcef735e6f6fcdd6e95ba251bb089a209f1342d8d809739e20aa939a1d44f70509d059df53ff28f
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild b/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
deleted file mode 100644
index 7d1012ee9354..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="http://collada-dom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collada-dom/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild b/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild
deleted file mode 100644
index a06ea26cc2df..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.3_pre20150112.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="https://github.com/rdiankov/collada-dom"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-2.4.4.ebuild b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
deleted file mode 100644
index a783fc2ae1e8..000000000000
--- a/dev-libs/collada-dom/collada-dom-2.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
-HOMEPAGE="https://github.com/rdiankov/collada-dom"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index 46cc5b8cffbf..4086834d6c40 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -1,23 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
+inherit cmake-utils flag-o-matic
 
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -34,7 +24,13 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=[minizip]
 	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
+	dev-libs/libpcre[cxx]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	# bug 618960
+	append-cxxflags -std=c++14
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index 46cc5b8cffbf..bb015f58bab1 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -1,23 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
+inherit cmake-utils flag-o-matic
 
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
-	# snapshot
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -33,8 +23,14 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=[minizip]
-	dev-libs/libxml2
-	dev-libs/libpcre[cxx]
-"
+	dev-libs/libxml2:=
+	dev-libs/libpcre:=[cxx]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	# bug 618960
+	append-cxxflags -std=c++14
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch b/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch
deleted file mode 100644
index 48cdcd20c1e9..000000000000
--- a/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b
-Author: rosen <rosen.diankov@mujin.co.jp>
-Date:   Wed Feb 24 12:49:14 2016 +0900
-
-    fix return type thanks to #22
-
-diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp
-index 25fd9cc..c34ac4c 100644
---- a/dom/src/dae/daeMetaGroup.cpp
-+++ b/dom/src/dae/daeMetaGroup.cpp
-@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
- 	(void)offset;
- 	daeString nm = child->getElementName();
- 	if ( findChild( nm ) == NULL ) {
--		return false;
-+		return NULL;
- 	}
- 	daeElementRef el;
- 
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 3ae1ca2e091a..e7552470fb38 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,5 +1,5 @@
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
-DIST cudnn-9.0-linux-x64-v7.tgz 348817823 BLAKE2B 5ac2d5c6794f18e2f9de7b43d81f196391e193bc795ca89a5810a7e6f77d3f241c5f61b16a54294bedf0ee08d48c88ccfb85b552f4be76a8bb42bb76f8382d7b SHA512 63752fe8991b750794bd41d720d1ab2c94584fd9a0e297c68549d8e44cf2742f0601021ae54f5227e4865869fddb5d5b2f7445bfda2c0808b8973345337a907e
+DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 EBUILD cudnn-6.0.ebuild 504 BLAKE2B ed456c8cadcbe6320286e4f668d60a883cccbdf4292b39cc83a50634415022a7e81ff22f49cc42e064f96520508dd91d61dcad620a7cafd3e25afa7f2d59ee12 SHA512 ea1658e2dd8344203f767010b35a0b4a84d313498da7d37075b669f77cd22f80a8d111f7ffb18b9ed216aa4e87727275cf398e87c34790e27f2525dae5c9acd4
-EBUILD cudnn-7.0.5.ebuild 568 BLAKE2B 43486ac22aea07e1538c86e10f804ba9aeb71b995a7682a7da775841cb59eb9a82fd8101a5bc1b8759ff429736ec4e2e2962539e2493b76becd29db11f20f7ab SHA512 719399f9d8647a836ef24760823ba4ac6fdf41c205fa07538dcf10ca06c5e26f03ff5f41619a22a8da6234f60ebc0dac6ee1caa65c63be8f1baebfe772942b8b
+EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/cudnn/cudnn-7.0.5.ebuild b/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild
index e63b0750db22..219fb86f697f 100644
--- a/dev-libs/cudnn/cudnn-7.0.5.ebuild
+++ b/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-CUDA_PV=9.0
+CUDA_PV=9.1
 
 inherit versionator
 
@@ -20,8 +20,8 @@ LICENSE="NVIDIA-cuDNN"
 
 S="${WORKDIR}"
 
-DEPENDS="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPENDS="${DEPENDS}"
+DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	insinto /opt
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index fad333496efc..7ef5c2531a94 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,6 +1,4 @@
-DIST dietlibc-0.33_pre20110403.tar.gz 743758 BLAKE2B e6c4a6bf3198833ef309ce8035453d0c75b2e365dd4da3710c00200004ca6200f8f629bacfcaa1a4507dc43ab3b5c13ddc79ef285a77426a5c64608e308559fb SHA512 32f9d752a77bcca5703a388ba64dcb53de75999043c1b2fabe973eba05fce4e9f48a6bdb71e061939eee339ca723234d33d2acb3677a8030accaccba31a5932e
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
-EBUILD dietlibc-0.33_pre20110403.ebuild 1688 BLAKE2B 26dddfa9f951ffec44b53749403ebb2ceca663778874b1498ae7a53e375b4069b19cbb201a398af8c2adf92f81fbbbeab170cb35530aaa0f75fe32bb6cfc1831 SHA512 96382993aeb9d91f4512f354691988a6683957a5bfb4a4009fee48b9d0ec1205a13bb574bab953839b20a4b278f41e94fce31c811bd125d5d138609fa90487ec
 EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1578 BLAKE2B 98afe30dfd64a7adbeddd1236eac393e50f0be6a621208dd1f7988dcebc282fc7cbbf29fd624cb69739365b621a466d2a7677e39cf7ff8a4c3995c02752e6441 SHA512 5f7a30d563188980e751d78afc7aced3f157f6de4889f2aa46b9f0b48756da8182d73b3a6a2bde48d6701cb19032dd1c0e32c154438973d703400c38abd7e452
 EBUILD dietlibc-0.34_pre20140729.ebuild 1577 BLAKE2B f4aa508e7c55a86917295819b54f963c5e19117801bde8dba4d0463430f751e749bf72f241b0302ea9ff4ebe42f9ca50d7f2947f06e76ce8bcd47cc9f74009d6 SHA512 fb72a140962341c26031080959a5da32f156e92e97b53c72e46256d86c9c325577ea868643d4474dd15e93c279fc6ec636493ce0c4e0f83d32a3cd966c140143
 MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.33_pre20110403.ebuild b/dev-libs/dietlibc/dietlibc-0.33_pre20110403.ebuild
deleted file mode 100644
index 62b7fabdd9c0..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.33_pre20110403.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-GITHUB_AUTHOR="hollow"
-GITHUB_PROJECT="dietlibc"
-GITHUB_COMMIT="4e86d5e"
-
-DESCRIPTION="A libc optimized for small size"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
-
-DIETHOME=/usr/diet
-
-pkg_setup() {
-	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
-	use sparc && replace-sparc64-flags
-
-	# gcc-hppa suffers support for SSP, compilation will fail
-	use hppa && strip-unsupported-flags
-
-	# debug flags
-	use debug && append-flags -g
-
-	# Makefile does not append CFLAGS
-	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
-		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls -fno-strict-aliasing
-
-	# only use -nopie on archs that support it
-	tc-enables-pie && append-flags -nopie
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}"${DIETHOME} \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		STRIP=":" \
-		|| die "make failed"
-}
-
-src_install() {
-	emake prefix="${EPREFIX}"${DIETHOME} \
-		DESTDIR="${D}" \
-		install-bin \
-		install-headers \
-		|| die "make install failed"
-
-	dobin "${ED}"${DIETHOME}/bin/* || die "dobin failed"
-	doman "${ED}"${DIETHOME}/man/*/* || die "doman failed"
-	rm -r "${ED}"${DIETHOME}/{man,bin}
-
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 3a5fe4a991b2..4f5ecd29b9af 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,7 @@
 AUX efl-1.17.0-gnutls-3.4.patch 1303 BLAKE2B 74368829bd2cc3ebf1878384dfa6fc5a4290fb7b59b52d387141992fa957ef3099b6c5bf2c8a0723bbba034a45448c68e3bee5c42fdf0c4f8bd9196a95d1f178 SHA512 3bff2855849031b35fa68f70b3c59136f404793564a3fe2b15cc9e15ef211b0a41cb628330d84832fc4e9b1b331c161e6731816d2efe68aa7a1a5146bd87196a
 DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
-EBUILD efl-1.17.0-r1.ebuild 7107 BLAKE2B 73c195842690b8405512b21298fca5bff1b12b3bf083d20afc905824395bbda11782183080c1a487c7cec3d6df741d70dacc8b51f6467f68759a41243aff9e37 SHA512 36e3d53c1bdec68a0d75aa17ddcd4116117c1908349d5c297f983db9a78ac3bc277f20b79e99e27b1116b48f0fc5e4baa2828e5bbb59e41874fa828feded443d
-EBUILD efl-1.18.4.ebuild 7275 BLAKE2B 4f804a4cb7ca08cfd6372dd6c40165971c14c116b0e86dfaf141e9bb01c2a2f6fc8164325601dd37c556ec8825d5116b8406ac3fc7efea594f68f936e698a7c1 SHA512 9015dc587e6d52e3aa3803010f1e1e1922abccbd7f8a4f67a7e607ebaf4b75246322cac38336af862854ca63c8d05eb2111b254d1784b0dc3340af0377c3d34c
-EBUILD efl-9999.ebuild 7275 BLAKE2B 4f804a4cb7ca08cfd6372dd6c40165971c14c116b0e86dfaf141e9bb01c2a2f6fc8164325601dd37c556ec8825d5116b8406ac3fc7efea594f68f936e698a7c1 SHA512 9015dc587e6d52e3aa3803010f1e1e1922abccbd7f8a4f67a7e607ebaf4b75246322cac38336af862854ca63c8d05eb2111b254d1784b0dc3340af0377c3d34c
+EBUILD efl-1.17.0-r1.ebuild 7085 BLAKE2B 4bc38796a2704eb360c583876e35b3dc997d5e40dbdb15c417649b936b8b4dcfec74ff20f2db37befb023e22053c02ac4398a5bec1d11b343cef11fe7e9ae386 SHA512 95292a09cdf04ce02d863d2b4544fe50509fe084e1404a3ed117026832c1516b2b7e1403a534ef97795802d3cb73f968c885f5f96bf016976c59d0237f6844b6
+EBUILD efl-1.18.4.ebuild 7253 BLAKE2B 1c1814cbfe0ec120067803e826b8af26f9f722042d2cbd9e97fbb715daed97767b1c4d6cff7b0275e66d98ed0bb110e64e130e3133d1345a678a33575b56e941 SHA512 a752956004ff68af0310302276a26e8096e68834abe685aed0b6a9e269dd7332fe17527627133bd0cb444ef25a35f78e64d3396f9a758b46d26d06f266a86f8f
+EBUILD efl-9999.ebuild 7253 BLAKE2B 1c1814cbfe0ec120067803e826b8af26f9f722042d2cbd9e97fbb715daed97767b1c4d6cff7b0275e66d98ed0bb110e64e130e3133d1345a678a33575b56e941 SHA512 a752956004ff68af0310302276a26e8096e68834abe685aed0b6a9e269dd7332fe17527627133bd0cb444ef25a35f78e64d3396f9a758b46d26d06f266a86f8f
 MISC metadata.xml 1620 BLAKE2B 3a967bd7dc991947c1520e9e513adae314425476c2e7fe5c03f985ea9c1e41c2a8b3891a81c0a52cb9ad5bc744697b4f4dd2a889e6726393090cf80c2e057acf SHA512 a70e6aac0200b85a927cc0c0bc58a6f41c18b1155f239ba2a97dfe50e24f54632a05f4387204439093e4fa71ae01632b984fe0fc454c5b711470020fa42f928b
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild
index 9d3d409157cc..73c6b642ffd2 100644
--- a/dev-libs/efl/efl-1.17.0-r1.ebuild
+++ b/dev-libs/efl/efl-1.17.0-r1.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
diff --git a/dev-libs/efl/efl-1.18.4.ebuild b/dev-libs/efl/efl-1.18.4.ebuild
index 609840b2c5b1..7e7cc7eab220 100644
--- a/dev-libs/efl/efl-1.18.4.ebuild
+++ b/dev-libs/efl/efl-1.18.4.ebuild
@@ -13,7 +13,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
 	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
 else
 	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment pax-utils
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
index 609840b2c5b1..7e7cc7eab220 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.ebuild
@@ -13,7 +13,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
 	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
 else
 	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment pax-utils
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 0df0183192a5..865aa312d7d2 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -3,5 +3,5 @@ DIST g-wrap-1.9.13.tar.gz 613577 BLAKE2B 7b91a92e28c5f0757a1de95f7c6324653abfada
 DIST g-wrap-1.9.14.tar.gz 655812 BLAKE2B c4b937d156b0677e597120ec250537b9667242d0359b41a5e184f226c3cfc0086be9e35e265b02e857fb8e0074642aa93588352a07a10d1df95c55a70bbced5a SHA512 681d85caf24335db9f266e8350488d36c2b20a5ec02346189c866c7c1de9bcd4a942f092827cbf5fc30474dff70064abe8139069752a6d82657e51542000194b
 EBUILD g-wrap-1.9.11.ebuild 956 BLAKE2B 43e6789a6afd21c02c848162c9d0444efd6a12c26a398b976584ce5f830c4ed45d3c0ab06e8016f1f216957354173d8a6747bf15d31f54db0ab98c788dcdfde7 SHA512 9258d804db3393ecc863fbf1519986984e42f981d9a2fe10e2a9069c9452e2122030a01ff78d2fce6d36e635ad6354b8ad017548afe50d0783150958f3f97fb6
 EBUILD g-wrap-1.9.13.ebuild 633 BLAKE2B 04d0923cce97647cdeea7a1545fd2a3ad0c1eabe138c667367e947adeb9860bdbf308ee1cd1f4e7fe7b57168c4e8aa060740ad848a848ae6f4ea611844834a92 SHA512 c13422113125473f34851ca88127d4971b3e1aa31d03bbb9266ef6011508ae571ae4373b530f216ceccf2b90df6e019a932893e15df3a52cce857e20b131adaa
-EBUILD g-wrap-1.9.14.ebuild 705 BLAKE2B adee4840a4d898ed709ed956a9a926cea15eeebf1a44df68c2f379f79e3f5d5bb0fda762b05d12c5ac7ce31f37615dbfb62628453b379efe1450bc5c7f28762e SHA512 a2d369fee2b1674de8e2df2b1109d9f0adffd6a835116cfa1ca421eb98fb66ee69b0bda3de5e19806082fa07a40b0903a41af5f916888ef9990395b6f27634bc
+EBUILD g-wrap-1.9.14.ebuild 704 BLAKE2B 6b6d7a66e3e9ed524bfcba954429c2a85b069abc8eb198f19b79cc2507754fc7f55f33a6fae77c5fb2da0f8e6ed1a6383b90f493aa54a451c72a472ba9305864 SHA512 4a9e864a8ccd14cf9509cfd9cfc82676961bd8cd91b1d5e48b7e5a683605d0b9d8ac95c78c8735f88e5734de91374492893c024a28829b57db7d5d95030c8e24
 MISC metadata.xml 470 BLAKE2B d84738809f2d8a2999a9e9d22b342885cc9d55ff1328ff15720eb5a7887d03d64ef170db8723a8a080c738cac5495a4a396bf56c0288e021414affacf1c7195a SHA512 1a0ed70c7e3de5204dfbc75a6c470e0b833973b8b0922ce679ee4b4d5cd5c208f6e48f815d66b2d086e3ae9c9258c306c2480afe00c227b27e6f892362cc1c48
diff --git a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild b/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
index ccf80fe7821c..1b2ab0ea38d7 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 # guile-lib for srfi-34, srfi-35
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 001c2082798b..6ea4742b64b8 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8.ebuild 726 BLAKE2B 2fbbfea3e3203ae99808c0981d1fa2e0ec0bf2de112ed1aecfe2d36f7cf3c2082e6283599410f345b10641f31e93d75b31525ef19121a35157d44809c38e023d SHA512 b3a436937c43ea8526202c767fff2ecdf70f852ace08f412131f8291acf3ee1b5d78fbeaf86a8bd16b7009e55809cb741a35422717baf79cd6ebe95cd09dd1cf
+EBUILD hyphen-2.8.8.ebuild 738 BLAKE2B 1388a1069b4788512b10c1f0cd77e42cd2eb5ac43bcc76fc578c776a288df5fabefd98f170d27146bda9c4e8272d7d7ad0f9c5b2624654acf382292ad1068943 SHA512 79ee634a3bd0ea63c51a02e0dca8919f6c40d178a6aa1d9cefb21f5391ef8b188264d67a26ac64ac2018c7eec101050122da4cb4d586026454f5b6fa20ad08c9
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
index 464620ed88d3..92c213dd346a 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index b720f8110e72..40a7b5fa7e62 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,12 +1,8 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
-DIST icu4c-59_1-src.tgz 22706578 BLAKE2B 88ec0b5a174b7f854813c66009aba695b61ec4887b845f092f5b5bf401c416cb2920c596f3f33fee4751bb8ea576a37e991fb18bc845142b322e985224b95879 SHA512 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
-DIST icu4c-60_1-src.tgz 23296064 BLAKE2B 4f90c1f4f00b686d2632429fbaa6a6ec3d977e414f8d00cf82a525a1504c9d8c9b1a19458b495e5847abbcfff933038752f96d6bd165d206582f8ec1b77fff40 SHA512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 EBUILD icu-layoutex-58.1.ebuild 2512 BLAKE2B a34a084cd8c5fedd0169d1d7a7c9fe3f2f55a91d0fe362d927fb49c90ed5b2674a4a8d76552157629258eea7fd109e56be971ab230bf7afa90720db77fca4105 SHA512 6c7bb82c9fa751b9382832952cbe66b253d339b5034c6144556f8a8d7433a9027ca734c5363cde4a60b0f2facc938bd0d4051d4843f5cbc8d0b23de24fb12310
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
-EBUILD icu-layoutex-59.1.ebuild 2518 BLAKE2B 9ad1856dad58248fb2b91dd0d529f813cb60bbbb6fce995086acceb6862416fc172c418f0b38c8a211447779cfbc3b875fe340290947dfc117bda38c6690959c SHA512 f2aec190980a1760d6412a4c5fe74c7a01708a60c3c80751201eb30d158147312394f7270cb1f2849c1716c314cadf8a3b90b6efdf9f101c7902852ffce19ede
-EBUILD icu-layoutex-60.1.ebuild 2518 BLAKE2B 9ad1856dad58248fb2b91dd0d529f813cb60bbbb6fce995086acceb6862416fc172c418f0b38c8a211447779cfbc3b875fe340290947dfc117bda38c6690959c SHA512 f2aec190980a1760d6412a4c5fe74c7a01708a60c3c80751201eb30d158147312394f7270cb1f2849c1716c314cadf8a3b90b6efdf9f101c7902852ffce19ede
-EBUILD icu-layoutex-60.2.ebuild 2522 BLAKE2B 6d9da98cc5eb0f6aa6dc09997104dac715b669671ca22c26ae5f2f313b8b8c6e9ae05f1263fe6e714404eb8ea22924a7a0b72af4bd13cc7d3ac44ce0fbcc7d4a SHA512 c30cdd3d35b0006724a09f9a102cdcf585328d202d00621b71e3ac263852c14ee1696d720449e8b3f9e3dbce2aad7f98d3b76ff15fec445b9f584fe133182073
+EBUILD icu-layoutex-60.2.ebuild 2521 BLAKE2B 05cd9dbaa26141ed661fa190609ba187bd9097c8e8688043410545977fe36f6dd1a24b8ec75a628408dbd5c92be2212f98a9778594a544ebd14d918f5f582d26 SHA512 f5d47458f4146ea98ee1da87aeb9df91cdea06d7ce472a04b36cccebb9335905f0221ba9ec77cf17c2455482bd3587d5b2919f51b5d1b690d5f52f255134cd33
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-59.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-59.1.ebuild
deleted file mode 100644
index cb059aee76fc..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-59.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.1.ebuild
deleted file mode 100644
index cb059aee76fc..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-60.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
index 33cbe8eaf7d6..26809dbb3ab0 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index d041b2f388f0..b59d76501736 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,12 +5,8 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
-DIST icu4c-59_1-src.tgz 22706578 BLAKE2B 88ec0b5a174b7f854813c66009aba695b61ec4887b845f092f5b5bf401c416cb2920c596f3f33fee4751bb8ea576a37e991fb18bc845142b322e985224b95879 SHA512 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
-DIST icu4c-60_1-src.tgz 23296064 BLAKE2B 4f90c1f4f00b686d2632429fbaa6a6ec3d977e414f8d00cf82a525a1504c9d8c9b1a19458b495e5847abbcfff933038752f96d6bd165d206582f8ec1b77fff40 SHA512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d0672c7954ee8c03796a34abf21787c81047e6e3df481d85de0afe7948920a533e146105c368917b6d7dcae18a SHA512 03883866e050b61cbeb8268247f8a59b6516df75a33be729b7a8c513a887d951d748af42950bdcb5484dff9d9734daad570943845aa75996297312ac0181a258
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
-EBUILD icu-59.1.ebuild 3342 BLAKE2B c3f45fbbeeab2cc2a92cae23b5058783f5aec1c7bbbd28f6922e7e091077e7aece5f43365b8b16a54a60c714ac2bad31e18eda24010b7a7b74ac4cc7ab519e0a SHA512 708ec7e483bb078b1d0f7067ba720197b37280de9a09ba1fb92a944aad3613fd1db93f94cc1d53ce457a2ec610afe88232a040a25128d873bc401b91f0bc5911
-EBUILD icu-60.1.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
-EBUILD icu-60.2.ebuild 3718 BLAKE2B 84cfcc76fc1f02350ce7ef664719c77df3b58dec3885981151dc56c347781675fc0607aac3e42487ec7d9bfef49f16f64c9750be4c47e688fc5fc618e8f0b956 SHA512 39d21e0bd19e922e105ce9e35c9caf32528d42a4a45bffe3cef064cb9f78942a40e39ad015a085663592d2674d8f9044f44c8ef3e25651f529657a587ffd2a99
+EBUILD icu-60.2.ebuild 3717 BLAKE2B c24d4d0bfe198055acc466a08b47f955f82537955f9cd8eefe8120d1173ecfc3f3fb55784949654995a025e030c82cdc86c26c0d6502c64f8b0f26574c1ba5d3 SHA512 1f78bf2a838926d3e6159297fd556031ed70b12f41af72165a47d978c0bf1a0616b4ee149b7febb990927147e042c38e66b8101d00780ead9cbd8f22f340cf75
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-59.1.ebuild b/dev-libs/icu/icu-59.1.ebuild
deleted file mode 100644
index ed8bc1c9d952..000000000000
--- a/dev-libs/icu/icu-59.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-glibc226.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-60.1.ebuild b/dev-libs/icu/icu-60.1.ebuild
deleted file mode 100644
index 773d5b35d4ba..000000000000
--- a/dev-libs/icu/icu-60.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL=${EPREFIX}/bin/sh
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index 0343d4e9d87b..e3f6863ed530 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index fe6bd1b37ba8..21050d0e2aa5 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,8 +1,9 @@
 AUX judy-1.0.4-parallel-make.patch 6709 BLAKE2B 95c73d7f1e34ed12f1080c41fd5083a62c5a34d4f6766933409d8f1795a23364607cb6c25091db213ed3cf846feefbbd821d494e7a848b521084b213434c915b SHA512 43ada8c164cd6f0b1e41eed0759062ec1888ee34f32dacfa5492edb7acf28095f1a6ebd4b21acf0e4d2ae3a4f0820b28e72998f604767bc16eaef875cf5cc0c3
+AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.4.tar.gz 1142724 BLAKE2B 9357a6d37a9f8a15c4e06c304e5496ae271717243d79b7a1287cd6fcea5e130dcac2b1e191fff1530fb141a1d967be404a106afa3ac5005a6c71eb61491b807b SHA512 3a2fcd14a4367910ced5d1da8b46551e2847e02c1faa19c3ecd0ee542bb89c683c8998feb79abee4999a753d26ed5e7bfd9a7e2ed343a7667c7ff0d624ee384f
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
 EBUILD judy-1.0.4.ebuild 678 BLAKE2B 136a23f4eee0c8b4dcc67ac789a07f00bf0345966aa68b60ddc79b2a6519d51aeea9cdef8f86297a4c0d75ef18e842d657191c301e5f633534d006ceb78cd162 SHA512 e5a0445240ec1eb4e1e0b654d7d4722b29224e718374404cbc9a4d452d2b3b73b80c777fab290e94548f6817c3fa1b75bfdca30126fe0cdf6bacd1085ad6e702
-EBUILD judy-1.0.5-r1.ebuild 829 BLAKE2B bc33baa617861b77877510278831e1f0549c5c2c9ceac8040b399bdd47bf99c255bc26640bd9e0c96a75cdfeae15dfa0aeb68fd1ba55c7a382d27eb83adca93d SHA512 b63781286fc52b49cc846643fc0b691d0e6c4e98b68d4ae6b2349455f1ea493502e12a5535113bfe4eefc42a1a8ff776f2a51c1d9ef1ba50964356da4e923ac8
+EBUILD judy-1.0.5-r2.ebuild 868 BLAKE2B a68debbb1c70252e3eb34aaf704126a37e2b147a43f4758622dd04e97a171294bd4ba061bd691248be32ddb80e7b6c8988e2ce263d3339353554a8b527d21017 SHA512 23439b541e31818830b9b63087d82b32dbf93a598335f2b25f91100b07eb61d4ee21345e2e8289ed10ff40b5c8ef7909b4b386c58dcf256f26c6fae50449d9df
 EBUILD judy-1.0.5.ebuild 640 BLAKE2B d8a739e2a8688eaa6ba652ff123d919c341a44b74899dc375ad08a69cd7bba9399b2a2c24385f9731c0b5d12fa3c4ba6b73de5ddf41d4a59c25213a86a2b7e12 SHA512 5adb0f29c2fa930f31942cb06e6598f071da915faf6a2ff3e0790ea958dbc9cb62eb32212a5cbba8b24fd52a8b9d021bc39bc03e6ef2b5e941615821de5870ab
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/files/judy-1.0.5-gcc49.patch b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
new file mode 100644
index 000000000000..c2e127626fbf
--- /dev/null
+++ b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
@@ -0,0 +1,73 @@
+diff -aurN a/src/JudyCommon/JudyPrivateBranch.h b/src/JudyCommon/JudyPrivateBranch.h
+--- a/src/JudyCommon/JudyPrivateBranch.h	2005-02-15 16:06:07.000000000 -0500
++++ b/src/JudyCommon/JudyPrivateBranch.h	2014-08-19 16:59:55.000000000 -0400
+@@ -19,7 +19,7 @@
+ // Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ // _________________
+ 
+-// @(#) $Revision: 4.57 $ $Source: /judy/src/JudyCommon/JudyPrivateBranch.h $
++// @(#) $Revision: 1.2 $ $Source: /home/doug/judy-1.0.5_min/test/../src/JudyCommon/RCS/JudyPrivateBranch.h,v $
+ //
+ // Header file for all Judy sources, for global but private (non-exported)
+ // declarations specific to branch support.
+@@ -55,7 +55,7 @@
+         {
+             Word_t      j_po_Addr;       // first word:  Pjp_t, Word_t, etc.
+             union {
+-//              Word_t  j_po_DcdPop0:cJU_BITSPERWORD-cJU_BITSPERBYTE;
++                Word_t  j_po_Addr1;
+                 uint8_t j_po_DcdP0[sizeof(Word_t) - 1];
+                 uint8_t j_po_Bytes[sizeof(Word_t)];     // last byte = jp_Type.
+             } jpo_u;
+@@ -78,13 +78,18 @@
+ // TBD:  Revise this structure to not overload j_po_DcdPopO this way?  The
+ // current arrangement works, its just confusing.
+ 
+-typedef struct _JUDY_POINTER_IMMED      // JPI.
++typedef struct _JUDY_POINTER_IMMEDL  
+         {
+-            uint8_t j_pi_1Index[sizeof(Word_t)];        // see above.
+-            uint8_t j_pi_LIndex[sizeof(Word_t) - 1];    // see above.
+-            uint8_t j_pi_Type;                  // JP type, 1 of cJ*_JPIMMED*.
+-        } jpi_t;
++            Word_t  j_pL_Addr;
++            uint8_t j_pL_LIndex[sizeof(Word_t) - 1];    // see above.
++            uint8_t j_pL_Type;
++        } jpL_t;
+ 
++typedef struct _JUDY_POINTER_IMMED1   
++        {
++            uint8_t j_p1_1Index[(2 * sizeof(Word_t)) - 1];
++            uint8_t j_p1_Type;
++        } jp1_t;
+ 
+ // UNION OF JP TYPES:
+ //
+@@ -96,18 +101,22 @@
+ typedef union J_UDY_POINTER             // JP.
+         {
+             jpo_t j_po;                 // other than immediate indexes.
+-            jpi_t j_pi;                 // immediate indexes.
++            jpL_t j_pL;                 // immediate indexes.
++            jp1_t j_p1;                 // immediate indexes.
+         } jp_t, *Pjp_t;
+ 
+ // For coding convenience:
+ //
+-// Note, jp_Type has the same bits in jpo_t and jpi_t.
++// Note, jp_Type has the same bits in jpo_t jpL_t and jp1_t.
+ 
+-#define jp_1Index  j_pi.j_pi_1Index     // for storing Indexes in first  word.
+-#define jp_LIndex  j_pi.j_pi_LIndex     // for storing Indexes in second word.
++#define jp_1Index  j_p1.j_p1_1Index     // for storing Indexes in first  word.
++#define jp_LIndex  j_pL.j_pL_LIndex     // for storing Indexes in second word.
+ #define jp_Addr    j_po.j_po_Addr
++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
+ //#define       jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0
+-#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
++//#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Type    j_p1.j_p1_Type
+ #define jp_DcdP0   j_po.jpo_u.j_po_DcdP0
+ 
+ 
diff --git a/dev-libs/judy/judy-1.0.5-r1.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index cddafade8c6a..e118223b34de 100644
--- a/dev-libs/judy/judy-1.0.5-r1.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
+	eapply "${FILESDIR}/${P}-gcc49.patch"
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eapply_user
 	eautoreconf
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 2675c9c12199..c1703df24135 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,10 +1,12 @@
 AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24
 AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1
 AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b
+AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a8609426d35a1217cbb0718e7580c2a3b646a7d493d4b7aecc25dee35f61f7e036904e6b7dde8d3d398842dab7149053da2a2761a3 SHA512 4f33d849210da633629e16e96779dce2e03c0d1e6f44b91b68410e35433378f8cf0a04736d161539ea368f54a713177e6e8df2fde93d40c6917d03ad74a99c2c
 AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 EBUILD libffi-3.2.1-r1.ebuild 2405 BLAKE2B 09d43e6a73ce68afa1e86c166dd46a75887fe8ccf68b40fde42839ba9845a2bc305f2cdfa05570bddd3e47364435b1055b101da8ac6f56fbb8d5de2275cd4ca1 SHA512 777f38391afb930d42ccd56a7fcfad57c684b3359f43ed80d179cf1a9ef125cfc73b64208f5072323460368a71561fd94c3c03d31ed64955d5dfc40409af9fc3
+EBUILD libffi-3.2.1-r2.ebuild 2464 BLAKE2B 280d49c1be545edc9efe1c89afaf2047f9d35a6c2f73b73b0847c927daaf717310b62fe4933768adc3623eae708ea36f2710632bcc9c4a34bd13b7444bc668d3 SHA512 e8c23b5341335c5371daba4176c5b9904fe5c816364b7c36ae64edece64284cab39e8506d5c729aa2f39e5b5a0bd34745af46af98e085e0e26d73414bcba46ff
 EBUILD libffi-3.2.1.ebuild 2104 BLAKE2B e14f781ba993954032bb80464efe262c46e419b5d8b97c2f9f125cca0ab3d3acf5479413226e00422791bc238a93ed4f35411f02004dcef2cb62d69ed64e75c3 SHA512 98e9e34ed8312ca0a4bbf3cded47c135558b35a821a6ef26dfa14621fd965ebb7bb30c97c3cd39e0663fe9ae85fc79455c88bd472bd7f410ef8386a879f3fa13
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
new file mode 100644
index 000000000000..6e21f3566bc9
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
@@ -0,0 +1,74 @@
+From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 17 Feb 2018 19:00:40 +0000
+Subject: [PATCH 2/2] ia64: fix small struct return
+
+This change fixes libffi.call/struct10.c failure on ia64:
+FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test
+
+.Lst_small_struct handles returns for structs less than 32 bytes
+(following ia64 return value ABI [1]). Subroutine does roughly the
+following:
+
+```
+    mov [sp+0]  = r8
+    mov [sp+8]  = r9
+    mov [sp+16] = r10
+    mov [sp+24] = r11
+    memcpy(destination, source=sp, 12);
+```
+
+The problem: ia64 ABI guarantees that top 16 bytes of stack are
+scratch space for callee function. Thus it can clobber it. [1]
+says (7.1 Procedure Frames):
+"""
+* Scratch area. This 16-byte region is provided as scratch storage
+  for procedures that are called by the current procedure. Leaf
+  procedures do not need to allocate this region. A procedure may
+  use the 16 bytes at the top of its own frame as scratch memory,
+  but the contents of this area are not preserved by a procedure call.
+"""
+
+In our case 16 top bytes are clobbered by a PLT resolver when memcpy()
+is called for the first time. As a result memcpy implementation reads
+already clobbered data frop top of stack.
+
+The fix is simple: allocate 16 bytes of scrats space prior to memcpy()
+call.
+
+[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf
+
+Bug: https://bugs.gentoo.org/634190
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/ia64/unix.S | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/ia64/unix.S b/src/ia64/unix.S
+index 4733377..e2547e0 100644
+--- a/src/ia64/unix.S
++++ b/src/ia64/unix.S
+@@ -175,7 +175,6 @@ ffi_call_unix:
+ 	;;
+ 
+ .Lst_small_struct:
+-	add	sp = -16, sp
+ 	cmp.lt	p6, p0 = 8, in3
+ 	cmp.lt	p7, p0 = 16, in3
+ 	cmp.lt	p8, p0 = 24, in3
+@@ -191,6 +190,12 @@ ffi_call_unix:
+ (p8)	st8	[r18] = r11
+ 	mov	out1 = sp
+ 	mov	out2 = in3
++	;;
++	// ia64 software calling convention requires
++	// top 16 bytes of stack to be scratch space
++	// PLT resolver uses that scratch space at
++	// 'memcpy' symbol reolution time
++	add	sp = -16, sp
+ 	br.call.sptk.many b0 = memcpy#
+ 	;;
+ 	mov	ar.pfs = loc0
+-- 
+2.16.1
+
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..533e9afa08e2
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils libtool multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test"
+
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch
+	"${FILESDIR}"/${PN}-3.1-darwin-x32.patch
+	"${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch
+	"${FILESDIR}"/${PN}-3.2.1-include-path.patch
+	"${FILESDIR}"/${PN}-3.2.1-include-path-autogen.patch
+	"${FILESDIR}"/${PN}-3.2.1-ia64-small-struct.patch #634190
+)
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+	elibtoolize
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	# python does not like miltilib-wrapped headers: bug #643582
+	# thus we install includes into ABI-specific paths
+	local includes="${EPREFIX}"/usr/$(get_libdir)/${P}/include/
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug) \
+		--includedir="${includes}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 38acf9a48786..8d7d5a1ea479 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,10 +1,10 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
-DIST libfilezilla-0.11.1.tar.bz2 395868 BLAKE2B d7d0004ca2b64fcfb8ba8121fefffb416bca2c4575c7a47ac9f890e352c88d3b35a5b881a3d7ca476a5b202a01a0d8094a1377f31b4b0b46b064c335781884b7 SHA512 a41ad8b2b0de25cba3283a55344a147383860d6ae7df7a0c634b48c07319bcb8057f84611e5cb98696e1f94856f5901f948c2e376fffe7151e145bf18ab82cc4
 DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
+DIST libfilezilla-0.12.1.tar.bz2 397506 BLAKE2B 79f2009329195c51c81b6013b2ab14899a604cabd2a421888959690e57d67f1c0a30881bed5e7201f6a8d3f5ecdf56944f8f3ff7f2fab9bd8884cde6a0435a99 SHA512 3eeeb549eb5e07c712246a21c41e4ce076f4e9de8a65ad56f2a33bd7390a42950442cdb7113696b9673071f1f4253e847e4f961e97d4c8fad0a5369e790928dc
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
-EBUILD libfilezilla-0.11.1.ebuild 923 BLAKE2B 4b40f1899648d0c08b747549b1c60df1d87fbd8291d3aadb28278e1d174c749ec641ae9bd3e5b9f6c3d2d811508e14f2bd3692e92a822ac0e0117dde83dcdabb SHA512 a0528f93114da82ee995455260f0e443658ed17e9a0d2771c254869503f9d83e568dd18bd0aa110b991fe32859632ba245e36ec6b9274eb9d22742399ff949e9
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
+EBUILD libfilezilla-0.12.1.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.1.ebuild
index 31545f46bee8..b546fecc3c4b 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.11.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 0248d95c7eac..f6340673a295 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,7 +1,3 @@
-DIST libgit2-glib-0.24.4.tar.xz 458360 BLAKE2B 2a4202939ac6442c2119e102cc160981caa15abe4151bddd772f297c75a62d9f020701f69943023d81a7f7d2e659d670be31582c06035655b93285c9bff673f5 SHA512 55874f77ded1474eab6f84d3426c8cddd56a42b04b8b3e50e4294f396b8c10025a38bc925c0b74ba3e52022c696f07e7f69b75c443bbd0af0f9e0769b7c4555f
-DIST libgit2-glib-0.25.0.tar.xz 420500 BLAKE2B 7522417cd9f5249e108c39c3bef820f19a806891dfe81ffd1851b1544f224d943b3bf96e8e824f852bdd181f60581879f84d48a2603263445c122de6cd393140 SHA512 f265d5da4bba28de2aa7254d36fa596b9e348c6543cd559cbb9c1f9610d4b63af00c82fb4138f345e15109503e0d61101d3344c68539348cb268403387a4418e
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
-EBUILD libgit2-glib-0.24.4.ebuild 1302 BLAKE2B 76dd86570dfbf545750175058f4bf04732791e3260e3cce80ee90519b93a1e18c4d48b9e0024bc6db08cbe0033e339fc548637626ba57306bc76f6150a6bf951 SHA512 168f01747fb30312bfd7f68b7dfc0d7a9ad35a6ce53a01d8a076af910a956c0add62bbaaace1bb48b6e816cdaae0ef82fdc1fc30ce21579eb638e2dc7536624f
-EBUILD libgit2-glib-0.25.0.ebuild 1265 BLAKE2B 3e1c7c29740795a9c495ddc27a12cd1226facb351975884507a1a39c364c7ef22d3a4e59439b95112ba11bcc4803bae0724aec80ef7b5c72dfa077b279c7935c SHA512 793aa9f92833a29e865826ef0267d40c0478e017102bcbff1233e49eddd6c7037874a916cf33722ac9ffce1573cabdf9e4abb3977d073fb48596ecc6f8d7e0f0
 EBUILD libgit2-glib-0.26.2.ebuild 1283 BLAKE2B 57d0c5d1d5e580f6d43326d183446004d2242668f196e2a6f82c950fb15b87ca9f1b3c2f8aeb9053fee7a4402279a6aa234af8af22abaf827008232f810f3561 SHA512 2c61ed36beb0422bc1acdf3209e94358fa0c6d50c520d3ad5cb9cdc4c97b26fdfb150e4ad8cea42ac2bef97b45a22303dfbddf382d642205659e220a8312112e
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild
deleted file mode 100644
index 4c3a9d766b9a..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_4,3_5} )
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="python ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
-# of changing their API in each release in ways that break libgit2-glib
-RDEPEND="
-	>=dev-libs/libgit2-0.24.0:0/24[ssh?]
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/gobject-introspection-0.10.1:=
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/${PN}/Ggit.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.25.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.25.0.ebuild
deleted file mode 100644
index 07fc8e722f05..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.25.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="python ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
-# of changing their API in each release in ways that break libgit2-glib
-RDEPEND="
-	>=dev-libs/libgit2-0.25.0:0/25[ssh?]
-	>=dev-libs/glib-2.44.0:2
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/${PN}/Ggit.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index f4b94e29a463..2e894b62f44a 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,8 +1,4 @@
-DIST libgit2-0.24.6.tar.gz 4178476 BLAKE2B 5bb1bad874581f987e2b10eb6fba8265c2e17c3eb0f05ff4b0db1e4bed81842331b56d7e360cbaae7fed7431cf6e36e2863342bfb76b7df8d33d77958f9304cc SHA512 ea928629450f6619c17e76cf32e5d76ddd9e00d914b8a0fc2efdcc32ae271637c124a27a8d4c595b8dcf2048551b22f1bc3c5b6394b3022a2f852a06f7ab3396
-DIST libgit2-0.25.1.tar.gz 4252130 BLAKE2B d5e6270ef8967d36094182eafe68673a07c667bec062c48aa036c02ecec493b0b7cc874681faed68be95d8ccb1635a155e77b7afcc489cb0b9e09ecedfdc8f7e SHA512 bbd0d27c95406b548185ce02e2a9288a9dcb8c3b28476ba20f4f4917f6bd67f1ddee80de3054d30b79cdb9d973c3061a15ea7847c79bfa4e0c62e41d5195cb99
 DIST libgit2-0.26.0.tar.gz 4697149 BLAKE2B 468e679bd7093004fb19a7947102d09bb90c653f3957615ce5468fe4c602f61804877072445a90447d83c70277529d02762cd3f35d0879708ea8355c44fe3456 SHA512 988c616c99637f2c1f80c498de34820296b78c0601669475eba9d194490cfd2047131987e63a799599277893e5741f9bcc226ffa594327356047ed563f07d346
-EBUILD libgit2-0.24.6.ebuild 1739 BLAKE2B 25f74413e54c17fc7655e2ceff27dbe20568c57bec92f096c0dbafd381bd683e840d883635a7774d1774fd4cef8dcb4c9eba94746355beeb64fd265fa69fd4a7 SHA512 ee096a2b92942dcf44c060e48de92adf454d2d83f3f068835d06e7a37f77aed0ba00f8c706c578e276425725bf522e2f596da6c493c69335dde63aff1233f27a
-EBUILD libgit2-0.25.1.ebuild 1741 BLAKE2B f2cb4c25cebbdb212d25d1538b40f3217d36fd2da4cbacbf8c370d0b460da2f6596f9343a0c5139823830a64852a30cb482e1fe80714bc2e17fc4789afe537f8 SHA512 d0ca8c242677e113287d8ec34e3fc39818390061d113e8e8d20762c817223659579e85f6ed31f6c35dafaf61ca6058b082f52eed063e52df9399da1bc70d170b
 EBUILD libgit2-0.26.0.ebuild 1748 BLAKE2B 2451d8d46de8edd0081fcfe74d2ec964eb0f85e7a490e1405cb1cfdc4ecba3485213de36d2efa0c44338baff7aec184c99e9d06e0e81976ff704421e4ed96a67 SHA512 9c971dda49e296e61330b81f3046043769d30513ffb5662f727b8c81f3a202c17203e914f571e82d887427858f13a6fa89a9567e029af75f39d7fe839b7f8fe1
 EBUILD libgit2-9999.ebuild 1750 BLAKE2B 1ae8ce701365c9ad24516656efaa2dc3a5cd6895f4435d002da5cc6535f82cf0084e641b0ad8ebd1faf7c3a711ec6710d232fc4dc716e6b292dc5f49e0a6a055 SHA512 fbdd070e25dbecf026cfd0106bf6253a29e75456bd2f9d75493c1013871e533da9bda26aade344dfc4e9dcf43657376523cb5e8e079fd49c5f26961465bf6e39
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.24.6.ebuild b/dev-libs/libgit2/libgit2-0.24.6.ebuild
deleted file mode 100644
index 02472f65a332..000000000000
--- a/dev-libs/libgit2/libgit2-0.24.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/24"
-IUSE="examples gssapi libressl ssh test threads trace"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use_build test CLAR)
-		$(cmake-utils_use_enable trace TRACE)
-		$(cmake-utils_use_use gssapi GSSAPI)
-		$(cmake-utils_use_use ssh SSH)
-		$(cmake-utils_use threads THREADSAFE)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		egit_clean examples
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.25.1.ebuild b/dev-libs/libgit2/libgit2-0.25.1.ebuild
deleted file mode 100644
index 110fc1f0df88..000000000000
--- a/dev-libs/libgit2/libgit2-0.25.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/25"
-IUSE="examples gssapi libressl ssh test threads trace"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use_build test CLAR)
-		$(cmake-utils_use_enable trace TRACE)
-		$(cmake-utils_use_use gssapi GSSAPI)
-		$(cmake-utils_use_use ssh SSH)
-		$(cmake-utils_use threads THREADSAFE)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		egit_clean examples
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libindicate-qt/Manifest b/dev-libs/libindicate-qt/Manifest
deleted file mode 100644
index 070367053403..000000000000
--- a/dev-libs/libindicate-qt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libindicate-qt-0.2.5.91-optionaltests.patch 676 BLAKE2B 6ac5fd2c1e177d18d65c4688400bc087c442d0e375e743c620fe4ce6fa2708d9f25fa372f56bd6417bcebb1dc56629b333a0270acdb00c94cf3c90aabb5dd66e SHA512 0d9b89c7827e4adf63369d51f20b199f9a308801100ed3f7cc9d062596e8cef0d28674b561fed0ea189ab31541b33071902dcb27e830299ff94faf7f95f3f117
-DIST libindicate-qt_0.2.5.91-5.debian.tar.gz 5263 BLAKE2B a9a1adc70587313811d78a1f2062be4033717deeff894c103c86e7d5bf4357b18457cc1a94b5e1b69f7e323d1daea5192dfc1df54a030e28bc5c2d4be3486c35 SHA512 9e377d06be8b65f54bceb7fb50f83c9aefae1c5f27ca1a695997d6cd4b39ec3a1d1fe0b39322b276e1c0fc2157d5eb9a89fa3d7cc6879fbaa9d027e255c3cdc3
-DIST libindicate-qt_0.2.5.91.orig.tar.bz2 33799 BLAKE2B a9d618bf4a074d2798371f08d6e0ac2d4c4debaa6cf55978daae0db4ddd459eb3bae72be80dd2d4f69b2321dbb97ea3e5b0ec29d7c1e617bfe12ece3ab5f60e0 SHA512 62b6ee0a758729f8007d0dfe6c7b9f55264f0bc110cebc8ef9f782c345fb81e45d9b652de45db06105510a232449b2427fb9a8344f86fb911d3fac1d5c552a23
-EBUILD libindicate-qt-0.2.5.91.ebuild 1111 BLAKE2B bc9874bda79de7fa773da0e38464fd090fb1f986bf368244938c46c4c5e18530a71960237cb15f4606821c06d0e2bb0eaa047667546478bd3636fec27c571e03 SHA512 17ff068bf0d4ed65ce4536194269ecb6c190be58ede9aa1bf24295b93db98866f84e53f4879bc3695aa02d4057541795fc61f4300f2af930210a9800b5399c8b
-MISC metadata.xml 331 BLAKE2B fa84bd947cec7a46eae84ced6a331388812b504b92f47e849e2375e20b24790e66fe0acc1d9cd4cb7fe6ef714f57707e3863a7423e9188eb75c3e75257bb805b SHA512 969b6e184a308a88b1fe9e7d9427fd28101c8d7884f85016991a021c635679c0d7222864a0ba54a65adfbded058c13c08d44eecf9dc2ea417201899cc8bda9be
diff --git a/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch b/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
deleted file mode 100644
index 5fa46f33081d..000000000000
--- a/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://code.launchpad.net/~ballogy/libindicate-qt/make-examples-and-tests-optional/+merge/82829
-=== modified file 'CMakeLists.txt'
---- A/CMakeLists.txt	2010-03-08 09:02:19 +0000
-+++ B/CMakeLists.txt	2011-11-20 20:28:23 +0000
-@@ -36,8 +36,16 @@
-     DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- 
- add_subdirectory(src)
--add_subdirectory(examples)
--add_subdirectory(tests)
-+
-+option( BUILD_EXAMPLES "build examples" ON )
-+if (BUILD_EXAMPLES)
-+    add_subdirectory(examples)
-+endif (BUILD_EXAMPLES)
-+
-+option( BUILD_TESTS "build tests" ON )
-+if (BUILD_TESTS)
-+    add_subdirectory(tests)
-+endif (BUILD_TESTS)
- 
- # Packaging
- set(ARCHIVE_NAME libindicate-qt-${indicate_qt_VERSION})
-
diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
deleted file mode 100644
index 57833115c671..000000000000
--- a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx cmake-utils
-
-_UBUNTU_REVISION=5
-
-DESCRIPTION="Qt wrapper for libindicate library"
-HOMEPAGE="https://launchpad.net/libindicate-qt/"
-SRC_URI="mirror://ubuntu/pool/main/libi/${PN}/${PN}_${PV}.orig.tar.bz2
-	mirror://ubuntu/pool/main/libi/${PN}/${PN}_${PV}-${_UBUNTU_REVISION}.debian.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/libindicate-12.10.0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-qt/qttest:4 )
-"
-
-# bug #440042
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches
-	eapply "${FILESDIR}"/${P}-optionaltests.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	cd "${CMAKE_BUILD_DIR}"/tests
-
-	VIRTUALX_COMMAND="ctest ${ctestargs}" virtualmake || die
-}
diff --git a/dev-libs/libindicate-qt/metadata.xml b/dev-libs/libindicate-qt/metadata.xml
deleted file mode 100644
index d82f5059bb61..000000000000
--- a/dev-libs/libindicate-qt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">libindicate-qt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index bc221e148035..f812d2b381bf 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -5,5 +5,5 @@ DIST libpqxx-6.0.0.tar.gz 676528 BLAKE2B a40095ba9851acde1296d93af7e4c4414f334a7
 EBUILD libpqxx-4.0.1.ebuild 2332 BLAKE2B a6d7affcddc3930d4a789ee7f7ae2cb2b1c1e823465a02dc8385930ac3951fb39bac8e1e85fe4dc577f02303143a26629aeadc98b05ad9f98a1b8687cda5412a SHA512 6d01421a6f56b160e51297cb02d73f5c0ad5c197a5bda8491efee96c8c46fc1cc0d792a3b3f21d9898e3296eadd5511e3be7b9e8482598db8b28ddf443c33b0a
 EBUILD libpqxx-5.1.0.ebuild 2182 BLAKE2B d92910a7f05c82109dc98d40a66ec1837b57e820250f784a16a85073979c1708588a3e5c02b9cf2c98a559ae0231029069365860fc520a9eab083f98ff049179 SHA512 9cd97b0fc56f25b52409886a37e3faa477c93e0723274fdbaf2ae7659c57f8df93e52309c95d3426d0734a6574d5bd1d75c12233b2ab8841b5bd68d33e95f49b
 EBUILD libpqxx-5.1.1.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
-EBUILD libpqxx-6.0.0.ebuild 2184 BLAKE2B d93524640c87d60894353767a4d6a50b99f8eb32912491e2a48fda26f469c3c482d012790fe388a9788bba61d03fa0ff09f60096d3ea04320a5ebf78bba7f7f8 SHA512 a95e9d4fc359ba91de7f1c0f669e8de3628bca8f936afabd819e15ad05217e6779366eef91aaae5b02350ae63973f2dffd364efcd45ce970cb26e35f634e3f21
+EBUILD libpqxx-6.0.0.ebuild 2183 BLAKE2B fe6dc0358dd71d3630d444625cf98370054b44b4aa10cc7ecd14b2bed38280d5b08c60b34a2d6b2ec570a8d66c4bb2668e0e0549171ff72c1b5124bfc5193874 SHA512 15bff65b2ff812514858edeee5b63e31750ffb4dff31f05560789a980d93298abacb50b2ad01da6401029cba1711b1c11449e0e433e77311ee8e6f3444cc661e
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.0.0.ebuild b/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
index 8d86d4a643c1..decfb6bafb4b 100644
--- a/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 5dcf561b0e51..fcf2aaee2688 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,3 +1,4 @@
+AUX librdkafka-0.11.3-fix-memory-leak-issue1534.patch 938 BLAKE2B acc607465285b2d5860f74a313a70bd153e0e850d1949cd345a920de69d466a8e75c89983b85056c6d8e40fbe93d40e4a5dac26b6a617705fd376cfe6c1baa75 SHA512 6f6406589ddf76e4168a6df50b00d8f499d3a6c22404696a4160eac3a10de7f8c8e03d01d6fd1aff831eb5cab962aec0eb164031e5aee3751e15a12c75e9f15f
 AUX librdkafka-0.9.2-remove-lz4-automagic.patch 1595 BLAKE2B f41f8f731ff1b9dd1e8e5f1982e4abc7ca7d71da905a0ea65369d212433d83b2e7b4cafb49efda855b5b8cd65c027f4e4384623cd0ff25b9c68adce9d9cfe9b0 SHA512 5903f2961cfb3066722ade21c944342b0ffa0af06b065dd1350b77f65f38025e3357fca3dca3e8756c20fb7ea104f33a565f146615d4e5a0284ea83106581b9a
 AUX librdkafka-0.9.3-remove-lz4-automagic.patch 1721 BLAKE2B d7c458bc12a59aec86bd61c44b2d249208323148220ba0645ddd767e1d16b336a26d2f04fdbc613e82604d825b1713c470a9f2cf7cd69dba766d8088291837a7 SHA512 c2ee9e9c429ea3a5348b9f47b739e00ee8e526e2f809b67545b253a57d726a7ac92565511c726aa8a8a705ed2396d8b2cdba54484b8da33efc36659384ff4660
 DIST librdkafka-0.11.0.tar.gz 837546 BLAKE2B 32dc35a97c51353c2635965244eefb98ba0575f4aafe405f7cccbc1ce06a3c8230ebd6171f4519ab50f4d996dc934c868366f8520d210216697584d1d730bde6 SHA512 1c41bd5bb9eb93b3bf743e8c4f14684609cb47b0c4fb95d303ddc7c62fdb678d9e6928fa6ea57c0aaa7695d08ab6e7ec84b699d7d61c7f750af0fe2cb148c596
@@ -9,7 +10,7 @@ DIST librdkafka-0.9.4.tar.gz 696078 BLAKE2B fa3b5b1cff0ffaa495e0a62c2886665c0d57
 DIST librdkafka-0.9.5.tar.gz 753196 BLAKE2B 48e9c2aba02f1a3c720b48c7962af7a1e26cd7604d325344a1b68cb107420f37a2fad406e256ec5d1ac281cc39aaa2d9831f42db9888400d706b0954f35f5113 SHA512 06b2c7e3dd1c8a84322d256f2470804ba0ac205777cf66c0c98222d3f90ed26d6fcae375ee0343558ccf901d7a8d354009f377a435ecd0ce2d02c73848fbc8a4
 EBUILD librdkafka-0.11.0.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
 EBUILD librdkafka-0.11.1.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
-EBUILD librdkafka-0.11.3.ebuild 1236 BLAKE2B cd0ad6ac6ccfebbe37583fd03f3317f835bf7dda598e3b8c71b922b48db3541a28ac0462577ffdc62c9e219be4a6f1852cf6c591e7240626dda12bf5e636f5e6 SHA512 80e38fb2244bf009ea3102a34a10fc2de324576b77965583d04077af7281d00e6c259cef3a260eeb224eabc8fdb929ee9513bec19e6584f9c159022a9c335580
+EBUILD librdkafka-0.11.3-r1.ebuild 1301 BLAKE2B 1a464ec7dab06e61fc17b72d1427ef1c78264a10324ef5be28e81bd29cb9da04d221419a55314065dd957b82398310311d1b8dc7ad2254be854f930bfab45a42 SHA512 bb2f3eecc4d116bd61e0aacbda4ac0bae05f8657a34d593af8bee55f9ee4fbddf9d9a217851b772ef0d38e91bce91fe2b1c475505d0bea9e008999b91e70e911
 EBUILD librdkafka-0.9.2-r1.ebuild 1288 BLAKE2B cd9f140cb8c34659d0121af5e073a29871b6ffb9d1c963802c888927b3f1528d93f55c446c3a5f76c73c4183567414a1d0d55e7b152508555fd92947be924a40 SHA512 1269fc2b6392ecea08d09299f9740e5f2a90b121fcbc1617e63beceffa16db5dae0c2a7a289c0c33ca112ef75087e5c991272967d687cfeb636215cd64494880
 EBUILD librdkafka-0.9.3.ebuild 1292 BLAKE2B b23378509efa2206fb03bc7763fe1ee159fbe2f16983ede1e05971ba1bc534a5ed3617e34d65f42577b85049e641a693a33f11e4eb8c6f21cbdc3b3ab7e98d29 SHA512 a24bb014f1b8fdc8c946b618b0afbbb96a75b925e87d3cf85839c19013516da0a3b622a0373844a353c4022a9aa5b1c91428db0e8995a7d3d92b76934b1d8e86
 EBUILD librdkafka-0.9.4.ebuild 1226 BLAKE2B 62e334f66a75f44e92cd34f9cc23ca5d3f9f52301820f662f55e921741ce49fb53ef9e7de84ba62b8cf329b3718dbbf6611e3cccbd9ae0dd1ea8709afd9e6e53 SHA512 195b6d8f752f432eecf25d53fa3adfa61ed0c89959a582037035adde522814a8d1e0c60b410542e82508fbda5fb0aca1af312779401f932da193fece7accd9f1
diff --git a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
new file mode 100644
index 000000000000..ae4c3e5bc81e
--- /dev/null
+++ b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
@@ -0,0 +1,19 @@
+https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22
+
+--- a/src/rdkafka_msgset_writer.c
++++ b/src/rdkafka_msgset_writer.c
+@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw,
+          * room in the buffer we'll copy the payload to the buffer,
+          * otherwise we push a reference to the memory. */
+         if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size &&
+-            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len)
++            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) {
+                 rd_kafka_buf_write(rkbuf,
+                                    rkm->rkm_payload, rkm->rkm_len);
+-        else
++                if (free_cb)
++                        free_cb(rkm->rkm_payload);
++        } else
+                 rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len,
+                                   free_cb);
+ }
diff --git a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
index 00872b0eadc7..f7ec851be536 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
@@ -15,6 +15,8 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
+
+	PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch )
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 7e7615a8d5ed..35649feac6ea 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -8,5 +8,5 @@ EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93
 EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
 EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
 EBUILD libsodium-1.0.15.ebuild 1044 BLAKE2B d9a2defe3e152d92c626296b171d3cb4e9cdabf2ce0587e4cc438e2472a9e91ef9ea6107cbd879fc909a46440c4ba32c948125e5256d04b09539d43ff31603bc SHA512 ff96bc32fd2027750e020f9671e85dbd35d7a9d5a463f277043455ccc38cc6c8328dd6a6d5ef330c461db4bef05272c9c4373c20fe3de098cdfb3bb76ce75bad
-EBUILD libsodium-1.0.16.ebuild 1052 BLAKE2B 21aa9d136171cfde5a9106a35da055ed49e64c0003199fb227c6ef2e84c81f52aaef410d7e4f87d437a2fe2405db9a22cae678a21f559cab15e73c421da6243c SHA512 2b8fa23e372b705de59318fca3f4e06eb66a95ae2105da8d05c180f8d083f702c180b4b328191eb1d720ef05ec886b73c88cfb4f9882faf7cd61fa7a92be2113
+EBUILD libsodium-1.0.16.ebuild 1064 BLAKE2B 80b0f5bb116fc2da72b1d21f824c7a859feab1ae105222dfbcdf734ae23f10dacbe712c0320d4172b6b57b1928bf4432dd2c49cda21c803a061361bd9e2c6f2c SHA512 f21c78a4250393a583ec41f1f13fa14e2aff7106abf63d529ee92a65c346b5b62ce75ffb4528d538a02fbacdc018faee67e9440a9cd534b59863817900a7f19a
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.16.ebuild b/dev-libs/libsodium/libsodium-1.0.16.ebuild
index d4089d0a895d..6144b166e52d 100644
--- a/dev-libs/libsodium/libsodium-1.0.16.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libunicode/Manifest b/dev-libs/libunicode/Manifest
index af055757e066..2280fc837120 100644
--- a/dev-libs/libunicode/Manifest
+++ b/dev-libs/libunicode/Manifest
@@ -1,4 +1,4 @@
 DIST libunicode-0.4.gnome.tar.gz 211622 BLAKE2B 299e6ed5e3991b836ac43c07aca058b7c96a030648280792ec1c83fc590817147f577c86ef7e3138c431a3f54a175349a32a9ed3363e23d032efe8f0c7e69e3f SHA512 acfd67f80f194780ee6784abe3e41ae1557c177b8f07ee4bb9c9767499bd5f4b2e6ad7ce66653fd55b7e8ff765e5f7e8134cd5e3e28735e0c4f78cba60f6205f
 EBUILD libunicode-0.4-r1.ebuild 711 BLAKE2B b251c4b058c322f2cc50384fc361133bc7ae4c6b9d87dd25f96b4144ac01108e74b3d9743c90e18c2de8893892dee85ae34f75703f8b98f93379cba9d2b9d1b1 SHA512 d5e8758738da7b39ecb59e1ddb9f8a819e34980fe22e619a2a25a2ce9df8404d376c0b489c7d798101316d42e10167ac9f8e1acb5f7887226822997b93023c9c
-EBUILD libunicode-0.4-r2.ebuild 758 BLAKE2B 27adfc8e62dd885a2802f4b0a1d7127c7200873e0872183b7cba5d9e282c9cc13a7baf4ab7b21668795e3d1c94d8e0631e2574f0dea9c87ed5fb853d06e5186c SHA512 59294bada37115bee5b14b07e5d05ffe9d6e5e1516d3e29f32e9a3d5bde335c276c64da9287764ac7f1756b2467db8cde3f15b3d546fe93a9115386bae22da48
+EBUILD libunicode-0.4-r2.ebuild 754 BLAKE2B a13703dc737671dea71aa522fadfe3fd62b3b1e6d6b5bc7a36fe994905b27f27e0957862126c55b2b67b404665af26d1680118182288dbfd31d23016f387a0c5 SHA512 2301f6710b72f6ae626d51270d819610c7e0300bc3e4612d5b2f146ef4acf4b946741c9e2bf69ad15bb2469f85b25dbc5b0e5188b2d36165ecaa0e98331d744d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libunicode/libunicode-0.4-r2.ebuild b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
index ffece83e3936..de8eeaa51ac7 100644
--- a/dev-libs/libunicode/libunicode-0.4-r2.ebuild
+++ b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.gnome.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index e2a5db03fd71..f78ec574d65a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -7,6 +7,7 @@ DIST libuv-1.16.1.tar.gz 1165502 BLAKE2B 07f77f0f9f53caf44962c7ca5e107e6c71c7f65
 DIST libuv-1.17.0.tar.gz 1167930 BLAKE2B 2e38e400d312005f94ad671203b82794f96e5802117fe6577d04951687310a95098ad8d352add67fd356479fa6c63b7b7027f109a77987e7626d3f77a34b19e7 SHA512 274615dd67808a7b7481184aa9c1650f7646ffe714c5304ea123e287eb09cad2a4c677ac06ae68b7d0e70071545954aa6a80414cd7e37c242a2533563094870c
 DIST libuv-1.18.0.tar.gz 1167950 BLAKE2B 2c40adbc2c98ffdd3a8a9c30f90eb90e6b0ad16b23935e43d1e19c53238f1a57e422f6f9a3e00374283c4187faa65e13c3e1546ead3ff1fd8e30d98340947078 SHA512 d1ef70b0f060f40cf57b282279d1d63d6dd019b4b811211b2252db32633a80af46290d201b4a4338f84b3efdfe9754a11b29bfa4a7636b06540b1a65e1fd4fbc
 DIST libuv-1.19.1.tar.gz 1174572 BLAKE2B 097a8702420ab2536aedd8df95d01a9a3dbff447252f28ced474314506b717589828fd6c86f0e90234c3ebafded95e01b2dd8a422cf690d37354cb5efe95ba40 SHA512 b903dd460c4bbb11011821d1e1f6c92474462cb6ff0dd8185604eb7726cc61c545dc3f59f5b418e9b31d6512beacdf4fcbdb868dd0004e688a6e34f3feb17eb2
+DIST libuv-1.19.2.tar.gz 1176076 BLAKE2B 2ba7b7ebedffe5964a9ca7ebe52d6acc7546d415fb9015107b8ad8cf96ad6b0c60d731844a7dea29ae1255bfa1cf43f1851443652c1ab64cb6837dc26e472340 SHA512 4fa879e34c51ae428ebf72ce80873b8d12994ae1560f9d3577a693653bfd5bd4b4fda7ff457b98b5e60fc82546658300401d6545d677f31d2cd66be3d82e02da
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
 EBUILD libuv-1.11.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
 EBUILD libuv-1.14.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
@@ -16,4 +17,5 @@ EBUILD libuv-1.16.1.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109c
 EBUILD libuv-1.17.0.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
 EBUILD libuv-1.18.0.ebuild 1172 BLAKE2B e56d2dc284bb3941a78f528551b0285c25e2334a0d267f5cdacd8afebb8a67b1a6239b07e1f5c5b2d01dcbd80f9554ece094cb6860b23e137af78f59e25f61a2 SHA512 7c74b1645d499581c928b2c36d13c53449accb6a068b44a76bf7868c2a88176671a319f60e28242e0a7b5128a4e7536e0cdeabb2fb5474cbc27bf8e3c4abc01d
 EBUILD libuv-1.19.1.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
+EBUILD libuv-1.19.2.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.19.2.ebuild b/dev-libs/libuv/libuv-1.19.2.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.19.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/mapm/Manifest b/dev-libs/mapm/Manifest
index 95315c27b57a..75c340941bd8 100644
--- a/dev-libs/mapm/Manifest
+++ b/dev-libs/mapm/Manifest
@@ -1,5 +1,4 @@
 AUX 4.9.5-missing_include.patch 390 BLAKE2B 4ebdf5e0111f8e2db71e371d8ffb1c3d5cfa56e533707943feeec4757d7873023faf6977d612c42fbdef236d50bcf77ee5d2d4d519638673f09bfb42b3b67408 SHA512 e9e5b0af9021fa90c397b07adcbcdd2c437d656cf48036a31c63c4fad2a6770efda47891af4defd86cc506c438b9beaacfdf97a344a57997728b0f2f2b1627ad
 DIST mapm-4.9.5.tar.gz 162943 BLAKE2B db0ba331cb3eb526c13de24e6aeafef9ea5f4391b0450386a263507e164ed15616c747e6237b886a60bc186550f3c7350776a5c699952b20121c2ba766f03d28 SHA512 1d0b489395fdfcb0c23ce2d242c63de739c45e33827411c976f6e7c48b18fc2afe599270139f40108b1f30573134d9d5950f3316613a45f567f53cfd59f4dc3e
-EBUILD mapm-4.9.5-r1.ebuild 1053 BLAKE2B b782dac902f1a27a9042d08e4cf3424c6af8a2f51c7baa0489ff1bb20efae00ab11bd99c36780874208e0be96aa72bcb31824c3b7352d0f9be35c44e63b8ee87 SHA512 bc0c3acae85102231e7b126f5ec65eaf9c7168622d23d02fa83dbd2f0a8e50741a9196f3ebbf9e36f53edab8c16340182792365d88608c75c826d55247f3ed99
-EBUILD mapm-4.9.5.ebuild 1070 BLAKE2B 964e754d4c78a130208df0d1badd63b5254f5baebe54218943f789c2074609f1ebb402a7dc3184b14678ea555d82e0845f513bd843dc874e84bde2dc978a2d79 SHA512 ca2f67da44fb1e34808ef1431f6d7483aac6ce8aeabb40fe15572bcc2623a3fae036d6837e09c7a2e1c103acb10eb4cc47d08191d23dec9209613e57a6b2928f
+EBUILD mapm-4.9.5-r1.ebuild 1051 BLAKE2B f6349b48412a28f9b9ebd1d00dc271fee0ea720170968d8d377e383fffc3f496975fb904a032f920d99d991c4936b512c19a7e4f67ac6810138a5c6155e629f8 SHA512 7f5f4a4a3404ea6421f40a121f3baebdebd48b00cb10e83e38d340231f877485ab667d3e2cd4a7c397abc2421aaeb120820b507afc6eb696a9c3e561b76dd838
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mapm/mapm-4.9.5-r1.ebuild b/dev-libs/mapm/mapm-4.9.5-r1.ebuild
index e90f39c48510..cc8171276d8a 100644
--- a/dev-libs/mapm/mapm-4.9.5-r1.ebuild
+++ b/dev-libs/mapm/mapm-4.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.tc.umn.edu/~ringx004/${P}.tar.gz"
 
 LICENSE="mapm-4.9.5"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/mapm/mapm-4.9.5.ebuild b/dev-libs/mapm/mapm-4.9.5.ebuild
deleted file mode 100644
index a2c211d3ebcd..000000000000
--- a/dev-libs/mapm/mapm-4.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Mike's Arbitrary Precision Math Library"
-HOMEPAGE="http://www.tc.umn.edu/~ringx004/mapm-main.html"
-SRC_URI="http://www.tc.umn.edu/~ringx004/${P}.tar.gz"
-
-LICENSE="mapm-4.9.5"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-missing_include.patch"
-}
-
-src_compile() {
-	$(tc-getCC) -c -Wall ${CFLAGS} -fPIC map*.c || die "compiling sources failed"
-	$(tc-getCC) -shared ${LDFLAGS} -Wl,--soname=libmapm.so -o libmapm.so.0 map*.o || die "linking sources failed"
-}
-
-src_install() {
-	dolib.so libmapm.so.0
-#	dosym libmapm.so.0 /usr/$(get_libdir)/libmapm.so
-
-	insinto /usr/include
-	doins m_apm.h
-
-	insinto /usr/share/doc/${PF}/examples
-	doins calc.c validate.c primenum.c cpp_demo.cpp
-
-	cd DOCS
-	dodoc README article.pdf algorithms.used commentary.txt \
-		cpp_function.ref function.ref history.txt struct.ref
-
-}
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index ba2682060a75..132e80781ecf 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,4 +1,4 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
 EBUILD mm-1.4.2-r1.ebuild 829 BLAKE2B 31dfd5f23e9f9516d531428fe89482bbe56db4a222e38941d69420f66705135d1dd98ad4c45dd680e0a72c828fd09803b217b2c1524272e3220a66367a8fc7d0 SHA512 2d8134d6cbcbf8c7fbef54dfdf6c9651c56243f325c073b9310692e5eeac3ef4f9a88612d5f2f73de8e5b6939103528ccb7cd9c7cb216b600917483f4e2271dd
-EBUILD mm-1.4.2-r2.ebuild 713 BLAKE2B 9e682e847fca4b0edf7ba67237a5cc0f2e5df76477bce479291a5a39bfa35b08f397fe19f1e389fbcd4a7971bd8de7b305ba10124de73dc710bf5207af17ecb4 SHA512 56c41a233d8c96a9babcd2125adb1eba5eb2d47dd88a63de076ed436d97c3a7e8c9ca2766fd754fe8fe36d97738813d447a26f5cef472c6cb51cf569d7abee7b
+EBUILD mm-1.4.2-r2.ebuild 707 BLAKE2B 1356ac450dee6c69a0fde6fb2a24692ecb6a01d71e5cc1119e6d11fa91f5ce90613dc63de3ddf2e71174abc06742260c243b1d75e66f4daa7df283756aa7c948 SHA512 befef67d8ca25b50ca25a9c5bb5e8259cdd13c1f63a00512deea615516d51fb4e5a1a432aeb8b7b128aa353f219a81b3593be512c9fb5966ba9a9a6fa477fbab
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 23b44f79179c..7548eeccd4ed 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 102f56c5d0c3..42ad93e2c822 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -12,9 +12,11 @@ DIST onig-5.9.6_p1.tar.gz 605920 BLAKE2B 9f5ecd29d0dc583d424866e5a37fe92ae4c9874
 DIST onig-6.4.0.tar.gz 900425 BLAKE2B c2c76ea0bd1e47354169e386a495b8754da604be0dbcbbe43e7889e1c37f84ddf032b0874bdf3711221b60e717c1f1bd36edb35903102f0be55c323f81d42ec9 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa
 DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
 DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
+DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
 EBUILD oniguruma-5.9.5.ebuild 1075 BLAKE2B a4512730195cf7e2d48379ba4c4d43d02c9121eb142ff74541ab3233f5cefaba8bc03026a044680f6a54f45336c2b47721e2b4e360ea96cbbd1af4f9bb352293 SHA512 83ec9d45664414ba08759534b04f346641e680ee4daa94dfd668e5408bdb19d982f22bca41ec606a955777732043d6bc681d557270d1619447406a3435196c64
 EBUILD oniguruma-5.9.6_p1-r1.ebuild 1367 BLAKE2B 70deefd41dcea8158140baec264749af5279cae2456b5a55ffbfa2def6aa1c49037a5015d48982090e575083894316870ad89eaeee876925f8f2b830a9c455f9 SHA512 4ce079503ac7278f07bf34fb8bde3c7cd6afabbe5ec9bc5512756461502e02e23857e05f37cbfa2bb27273a8e204b1ab1ed2478ed2d6a15215d206b690327cb2
 EBUILD oniguruma-6.4.0.ebuild 1155 BLAKE2B 07dfe6707e0ce33eefcfd13693f38c47d40cbfe1ad6d6da73c76f1a271b0af677a5ed611599d8b1a8b1189fe0e2ee6701565dbddc62cbdc3a15261b944ad27bb SHA512 56f20dd2bd854d209674839e80505ef80b14a7dc8b61bc3cdcbba194f63d6a7dfe556ea83a9d78f1fec80fbfcf40fe94fee97bb89877de1e3221600055402f22
 EBUILD oniguruma-6.6.1.ebuild 1113 BLAKE2B 3472e1522aea74375b2e61693f27305387e6fec641474fa65ef5c6178110d85b4cd0c64b609e4771ba6a8c89944b390f30e68711919d893d67f4c8aea2dd05db SHA512 5db0a44bb2f6c9d657dc7f1543efc21bd496814a824fe44792fb90c0c1ef0cf6a563745fac6a774c3d79fa3d25db2bb04ea43a5f47d450b088ef0f18208aa285
 EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
+EBUILD oniguruma-6.7.1.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
new file mode 100644
index 000000000000..d040e1b6cb1c
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+MY_P="onig-${PV}"
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index dd820de5bbfe..f7ac66847aca 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -10,6 +10,7 @@ AUX protobuf-3.3.0-disable-local-gmock.patch 6335 BLAKE2B 72d079c878a1bd00855d61
 AUX protobuf-3.4.0-disable_no-warning-test.patch 900 BLAKE2B 6187eeba1912f1bc6732d944eba4617ab99946efa429b3a96bb3b984af7ef45098885ce6bcdada1bb8995aee4a61cde404175459975242acf263a57d2d74c7fc SHA512 6d0687d17b626493e7e57dcb3e34095c9a450ecb8e538e9ad7cab69bdaf19ba52fbf5d70187c773bee0ee28496850e5ab0f56dcd571797e62434d865bd8761c2
 AUX protobuf-3.4.0-protoc_input_output_files.patch 9636 BLAKE2B 6276c9b731a0ed8e6f437a4a2db57a79d245e02046a62ff7415f41d925ffe7cb115810a2784a7e41ec3f32311be1bbe8ff35660126535be55f9e2ff92a50af6f SHA512 036fcc8a169be8d96dd04523642d5f42a2b935d8b818d3f3ae6f4e8e08ed9bd10528b6c0b1f84901b8415e09e4375ce5b885177f08e757c2af5160640c0369d9
 AUX protobuf-3.4.0-system_libraries.patch 5788 BLAKE2B e82517985065f53793ba5f4914317a6c2dbd7bd2c1e3bdb0796c85c402f4ec7e9d6645c1ccb7f73bf0b559d44db14ace9657c059c07948c3baf11c4b450bb572 SHA512 f8b54087e755ab6ae07630e99ca542b5690429ed7c9801c04219b016fd361b39a01d9e4d594f5c5820a0ec90f02f7ef4aeaf864e1ea2b770078a198daf928db3
+AUX protobuf-3.5.0-atomic_operations.patch 785 BLAKE2B 7c7cc7a0000fc5472a8603a8770fd20f0577e099d66f280f9c111485159f34a3010fcc76e88e2feb6eca4283a3458cd02bedac58f100e14f7e911e305c06869b SHA512 a84b8e87efab8c4063bf9b8f2422170c3b08acac66ebdeafca700309ee27614bdec1ec18a57d188bd6170bcc966854582ec748b0caedbec1feb0c3602fe9d9ae
 DIST protobuf-2.5.0.tar.bz2 1866763 BLAKE2B e4cece402bbeaff4400732ee2401f1a80bb0e70728eb41052da26b969b6fa6672b11ca80e28343d03a9df97c72bb8d8e2f890b9b730bad3c23c829aaf36ff701 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee
 DIST protobuf-2.6.1.tar.bz2 2021416 BLAKE2B f58178a6081d58fff1582a907dfb9087f07b72e0701f19649b3adc9e1827a0f2670e25c6d177e60a59b965b3622b1eb11590b4b17083ee148c0da7eb07f02e55 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174
 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
@@ -25,5 +26,5 @@ EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69
 EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2521 BLAKE2B 72dd275ac43844d9e0576298c4080ee5a47e2231b2c7d1cbbb45d466ee1daa95613019af586ded00aa6c5a45a3261d15a67a25ae485d2a76547af496f9f7f859 SHA512 16197136c0d3a3e6fe10ed5a5022c5297096d5a00aff07c9166f908b9221e97cd42e728f10197a4dfa890e96622912ab61bc4d347340839c529fa065a56b09d8
-MISC metadata.xml 829 BLAKE2B 1a70e376287941c20f9a1f28b62e803c2d30037760802fd3a177aefb67222667f400093d372aaa2dcfc2db7ea0dae29d5767b09faf7784ca7ac881a2a38db62e SHA512 2b24521cdf16246d189dae7c62b53ba8516efa61002b3639b6b864d09fe9cde8a892ec63abc57ea8285bd772d6c5da7b60a60f6be9293f8fa5f34111390853b3
+EBUILD protobuf-3.5.1.1.ebuild 2623 BLAKE2B a1b41b1b845aa6f9472e9790c3c0828711e0dee4a0e509baa6e573306648c1c51f14a1aaec21c329d586c956f8b939884c62cfcd530596e8f2c0a076f83cbf9f SHA512 663b52da356157b3eae71a33e895ad5fe5d8608e0d861762619703da3833e902718af8280fd465ccd4e410d86a7602676913605e7718519b25bf9454dc18f912
+MISC metadata.xml 844 BLAKE2B 27a0d9277394c9dcc9a50956182bbc6f5282d805b59d8a3f1c7680cdd37616caa1f40b50cf0dcb04218d28b8e592d630da5395f7a232713b08a099a7fd9dfa0b SHA512 a9d9c398843fa2017bd16d530735824eab963119d8508570ede4523d2ea7143431bb72c964fd6be17189a0422e3747ff1208a33e8fe9f74de37e8ef204ba188c
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
new file mode 100644
index 000000000000..7a88e8379500
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
@@ -0,0 +1,21 @@
+https://github.com/google/protobuf/issues/3937
+https://github.com/google/protobuf/pull/3955
+https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
+
+--- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
++++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+@@ -146,6 +146,14 @@
+   return __atomic_load_n(ptr, __ATOMIC_RELAXED);
+ }
+ 
++inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
++                                       Atomic64 old_value,
++                                       Atomic64 new_value) {
++  __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
++                              __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
++  return old_value;
++}
++
+ #endif // defined(__LP64__)
+ 
+ }  // namespace internal
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index d242db0f825a..b6fe4f6eba58 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tomboy64@sina.cn</email>
-</maintainer>
-<maintainer type="person">
-	<email>arfrever.fta@gmail.com</email>
-	<name>Arfrever Frehtes Taifersar Arahesis</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<slots>
-	<subslots>soname major version number</subslots>
-</slots>
-<use>
-	<flag name="java">Builds the Java implementation. This is not needed for Java support in protoc.</flag>
-	<flag name="python">Builds the Python implementation. This is not needed for Python support in protoc.</flag>
-</use>
-<upstream>
-	<remote-id type="github">google/protobuf</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<slots>
+		<subslots>Soname version number</subslots>
+	</slots>
+	<use>
+		<flag name="java">Builds the Java implementation. This is not needed for Java support in protoc.</flag>
+		<flag name="python">Builds the Python implementation. This is not needed for Python support in protoc.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">google/protobuf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index 4f44ebc4d8c7..47519c697c1a 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
@@ -23,16 +23,21 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
 	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
 	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
 
 src_prepare() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
 	default
 	eautoreconf
 }
 
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index c12bd0a88f7d..e98f0eed2f74 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.7.0.tar.gz 18913 BLAKE2B df8d54b5436ee936ba9aa8b7613f035b8c23d7eb998565e5cffc68e286f1bd972b223968628d1bba008960bfb16a3451b2d83c7f412ba7140b53e150d4fb061d SHA512 b7e98fa6c7f6a8a5e4d79468366b30c859db4edf08984d685d2cd8d87c5ab60b5f4769b5af96c8d9ca306111e46a63e4d23be7c07d77d6c3492f2e81ae8cd88b
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
-EBUILD qtkeychain-0.7.0.ebuild 659 BLAKE2B 01b0eb1ac04c9ed7e24e0cbec4239ce092cf578cba3bb0d2f5e341ef12c8ee92fc3141ceea386063e51b19c21aab8d17d493f63532e77b9dae5661cf2a7bef5f SHA512 f5f62497692e7d28f0dea0e28ab182fe19143c807e042cbbd17abcc5ae20ee4797dcb8333ab2860bb52bd8f246656a82484c24560e756f49651db6d20e5f34d3
-EBUILD qtkeychain-0.8.0.ebuild 765 BLAKE2B 12863df1e0da5abad1c398d3f7b01ad25071734ffe60487730a12cbc28c303e620ff1ce5a134611e5ef1253e4518e9c3870db2af033ea241cb3919185df36f08 SHA512 998272a214121f03151ee7239d6221a3c4633db9a8044911372f96f3ac1735c2ab3d890831e82c15a528c90543ef1b3b9b109e6918b2a43ab8a80aeddb6bab80
+EBUILD qtkeychain-0.8.0.ebuild 764 BLAKE2B 923f91cba8264889ad97a19fe3521708421609d9b984e04dfdffd54ff483d17bb77d706b3b49e22b92f2acb2bd0b6315bc7d2005ad3fafc3c0d84d22fbdb31b2 SHA512 236b96bc7cbfecd005eba28d430f0ad172b01a2616e2766cbb924673a1c0ba3201274fe8c78e45653644e09344f380dac0c63d95fc7db11fb5dc9e77a6ab040f
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
deleted file mode 100644
index bf34a98d3df9..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt API for storing passwords securely"
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TRANSLATIONS=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index f9a4fdaa0077..162b6fb21bc7 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring"
 
 RDEPEND="
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 7d7466411d55..f20880a0da41 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,6 +1,6 @@
 DIST serd-0.26.0.tar.bz2 369280 BLAKE2B 4543357663bce0c532e944fcf85f42dcc09138cc8e1a5d6810ab329c9fa047a12fe9ddb1c28da7d68609a909e0992c3c8097961004107971211373e1a3db0828 SHA512 749bf161d38cb8489f196ece2bf2b7c22e9113d05b38452592d92f9ffdec25d340e680e697e9531dab80d2ef04600690f9333208a4ef22307b8ed8e238d5c7b8
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
 EBUILD serd-0.26.0.ebuild 889 BLAKE2B 81b4e7ef3ff900e5ccb1b27058f6ed716cf022c3e2de82fa3481ab417d01ba108cd07ee20b09875ff964e9fd995099472ac7eb16f2b4bf5473bc7722c600801f SHA512 e813f26aa1c7c84057a49be987e90f2e9b9cd7c2c7eef411a616b7fe633d13de16175beffcc66d347b72a7b5a8893280298bbfab3c36baa3e1149a94f61fe1cd
-EBUILD serd-0.28.0-r1.ebuild 1094 BLAKE2B 65f048a576d1dd3aa830923d403d7ea0cfcd05e31452c336772272fe76d8296fe677d8d7182ad4a58aef9d371dadf29a9410e896304dc0e9f1fd94febec1c9f4 SHA512 526e8601d48550981d20d7a2e283c8e53dfca58860d324b3745bec147c517247e062e478b67c3855e28602926929f4bee147a16949a0f4ab043ccf07a2e5eca5
+EBUILD serd-0.28.0-r1.ebuild 1093 BLAKE2B df7fb8a64e1243fa0d85ea529671b36bcc5d0217c3273aae8bb27ef2a69e72dcbfa136b3853fc4ca89ff2abb6fcbf02863393e7261f3a49ebc72d50b1367082b SHA512 af80bdf7d947331cc84e5adacde21dc465eb50cbf24644aca70ffad61dd904e8859544a7d924862833571efba45e195da772b05a396766c4db26df2a82f569f0
 EBUILD serd-0.28.0.ebuild 894 BLAKE2B c614e6c4866526d949e0f151d388873b29c60e9e970f49c5ffcc18dec1121832fe4ebcba87aaeef32651f6f101390e0d2db855ff1e2a6b4e4a52ed655d3abfe7 SHA512 9018d896a97fdaa0998a0bf76621334b7fc8fd7415e7188a9f977358ae2c15d8f303a33804ffd0deab50e99aefe85359cae6e2014d7b961f73b51c277469797c
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 1640a0cbfe09..7f9c437a09c5 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 4c16a9567828..f220ecac2bd8 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -5,6 +5,6 @@ DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed71
 EBUILD sord-0.12.0.ebuild 885 BLAKE2B 47e8bc55cd80ce9fbe0faf115d261e8a2dca7e1cda19278894484f01a4fdb3f36265cbddbcf99220501e9fa94ab2072f11483eb0ce81709f188e00790079e1a8 SHA512 4ed34e11c3131b02a8945abb5ac7b1757f76a722ae12f5ed98e17de3d4e9c9ff2f614754c8c3f71d98b304aaa4e52340dd167b0655538ae6254a312dca1d717f
 EBUILD sord-0.12.2.ebuild 883 BLAKE2B d9505d53ceb717aff9dd85107709a85cff3047c3f8e4f9a19e726be99ad2b40fea6a12410ff43486638022ad19c8a853b696e37365418036c83813bbf5d4e79b SHA512 2913e2c542e35ccdce230f892be569ebb92a86332589141e995f7c196148998c8d6d0701bca732c612cf2b542edd9158d2dfa5df0ac4d5a595accdaa7bf5131a
 EBUILD sord-0.14.0.ebuild 885 BLAKE2B 47e8bc55cd80ce9fbe0faf115d261e8a2dca7e1cda19278894484f01a4fdb3f36265cbddbcf99220501e9fa94ab2072f11483eb0ce81709f188e00790079e1a8 SHA512 4ed34e11c3131b02a8945abb5ac7b1757f76a722ae12f5ed98e17de3d4e9c9ff2f614754c8c3f71d98b304aaa4e52340dd167b0655538ae6254a312dca1d717f
-EBUILD sord-0.16.0-r1.ebuild 1096 BLAKE2B 08d983d91f10311af5a8ce647cea58de1819ffc2ed5169e9459c8abd4b7db8e2e961c568b10763061feb25b9bad4d9bcfd96aa57b643dd47af5fda7f1c6d49af SHA512 b194c7f7d8c75a81b3cacff0660fbdedeb7e51dd14d38c71a5a0f6bf11812ae31eec258735a1e33e8005a1e374cf019d4fb46398d98c91d62eafac28cb07ebcf
+EBUILD sord-0.16.0-r1.ebuild 1095 BLAKE2B 42471553e333aea18290ff743a3053d31590cbe8e777cced50eeb2928b4bc10a45ee12010eee37ffd41cb64968b2e29031b61a77c6d64ea33e4d11e570026bc5 SHA512 f43bc4a90843773605eb1a7331f44be36fd792cc0df2870fde3231e1beb0ec82d91619e016f9c4e3899db164e3a8885fed991c4078b5b25b9a3e1e3534dbd090
 EBUILD sord-0.16.0.ebuild 891 BLAKE2B f508743bc7f363dd14e2d1daa71a7097fe711101b27eb31610e4751cc6252b76d04369fca20033de8ec360ad08993db45edab5030d3cbf2fc758a478e7930064 SHA512 af9a89904bb6cc64ae423b53767fe1713f816db06bc341fd7c8d41c10447c270722785d9796127825319b4c77ac6bc4f1ac4b2d8b5f2ba2957ba1bf40892c1c3
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index c70efac44fb3..cee5f272be7c 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
index 144befde76e6..21a5e325c091 100644
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -1,4 +1,3 @@
-DIST xmlwrapp-0.7.1.tar.gz 1453771 BLAKE2B 33889ef53e8c154b10a1e8d3f0ff4ceaa6de9c68f61230028aeea86bb41be2eba9e464ad6717f57ee572297d218d1077108bb3fea5b54ce1d92a2620cadf8d70 SHA512 73aaa9821f861edaab8e83d97414c9525ae7f6281a4812d8df6239e10ec76dd941cc0a8ed4769469084f694642c2f0c978f6c7477c63f99735a8cc9d98d7b9a0
-EBUILD xmlwrapp-0.7.1-r1.ebuild 1052 BLAKE2B 459cc281854fd5991e0a4297eb29bca461ab0894e545f81554b689747ae3d94918cb133507bad328105b3585fd8a867ca9dd8e6b4e6849c11d847c0a6f7637ec SHA512 6d83701c4a47bc19664cf21fcc846eb9f765883070671e2d85521f05a129295eacb3b4257009dcbacdcf24bdd8f3eb9a7249a0c57d6d8a938e9789af91e382d3
-EBUILD xmlwrapp-0.7.1.ebuild 814 BLAKE2B 16b419fdfc6111f4c55f0a2306dbb528479044da62db6c9ba8e124b8c043c6f29f1336017cf53a52bd055e872ee24f7a513f62a3c36877ff96f11cd520dc9fc8 SHA512 aa7bf487d2ae7491d6a6fdbd3fd1b846878fc51a1187450cbccc488b5689c80683ce0f068ab7c720538546a683a79c8e9884c4edb84c68c39f3214052a1872fe
+DIST xmlwrapp-0.8.1.tar.gz 1470707 BLAKE2B 213923b5e74f79a6d966ded4b9c9dfb5e6906bc44dd5d79099ee146f852233675d59f33908ee4a2c844332e1b3f7b064770ddcdcd2cea0745bdac6e1329ec3de SHA512 f6415c7cbbe209f7ee148eff4ee5aca4f210b2ab420dbc89b2cdbca1f270097c362ecb456b0cc72cbebc8688fbc66ee3a94c1019d80e7211a9ebe44ddbd535eb
+EBUILD xmlwrapp-0.8.1.ebuild 1225 BLAKE2B 3be2e1162a50143aa2b2011cedbad361bbf413368b1e023881e8f06b5f39fe661b5693534e79924c3e33ae55462a828d7c0f5d336e463ad04c3364cf664a5803 SHA512 6992478f7ebf0fb04fc8724e96cfc231fa51046c10f4eae6910a61238a7a9e2b73f6f7ce4a7b4b999d0bb085b764f1c32ec41aae8416f923203ea36d1be4707b
 MISC metadata.xml 447 BLAKE2B 9ed79c4b6d20ad64a578e294021028b2469e9eb9ee4e93f528a572f418c93c13c2e1ad5594907dccb4470e22725860f24938fa78565f799ec2ef80810ef8cada SHA512 42783cd8d7990ae0aa06c28087c78f59b83940e6e871cf4146cf1212e4503f9cc11fd67720d8a7d7245e85cf727435304460b79a43adf4a1cbf46e5f593510f4
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild
deleted file mode 100644
index 0d4d77795537..000000000000
--- a/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/boost:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	dev-libs/libxslt[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/boost-m4"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# Unbundle boost.m4
-	rm admin/boost.m4 || die
-
-	sed -i -e '/XMLWRAPP_VISIBILITY/d' configure.ac || die
-
-	eapply_user
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default_src_install
-	prune_libtool_files
-}
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild
deleted file mode 100644
index fef05812a76d..000000000000
--- a/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
new file mode 100644
index 000000000000..ed8327256b08
--- /dev/null
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
+HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/6.4" # subslot = SONAME(libxmlwrapp.so) + SONAME(libxsltwrapp.so)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/boost:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=[${MULTILIB_USEDEP}]
+	dev-libs/libxslt:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	sys-devel/boost-m4"
+
+src_prepare() {
+	default
+
+	# Unbundle boost.m4, rely on
+	# sys-devel/boost-m4 instead
+	rm admin/boost.m4 || die
+
+	sed -i -e '/XMLWRAPP_VISIBILITY/d' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 619804
+	local -x CXXFLAGS="${CXXFLAGS}"
+	append-cxxflags -std=c++14
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /dev-libs
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)