gentoo resync : 15.12.2017

66 files changed, 1020 insertions, 2343 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a3803d9c8f6c..349981cb03e3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 3a6af2bcdbe5..9b0c2aa5ef8d 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,7 @@
 DIST amdgpu-pro-17.10-429170.tar.xz 121382128 SHA256 cb1ea7f9756f197a976138d2c00f239ae4ee43b839fbb1ea57f8770957d4afd6 SHA512 2d9d0a97478564e259dc8494083df8dc13e3bc664384978aff369070b1105703653d8dc4dca38e94dc8bdf3ddfb5c6f4de39cec5a9b263423de8fb91fd0117c6 WHIRLPOOL 1e07579d2c9d5d8a796973658cbb6627418b133a630ca5e977f93da0d27b900da2078d2ea8b35a13071b0b05e3d5e7f47e17d61042dcca60709f6599c18380a2
 DIST amdgpu-pro-17.30-458935.tar.xz 393634984 SHA256 3652a5c9476a650a3e3cd89bcd7ac119ed7d16a570501eeeea6a902cbc6f9488 SHA512 3f517ce13e102edb820f8f9538e0894c794d767816f99774fbfec342adb6912712664f069db2542412baabb24ee198204f38757407c29aff238ed1772dc3caab WHIRLPOOL 29a5b06657767255ace0529467ca56a904a021254f7dab854b1fd3ac843108ac346d3c4e97e10ef53844152de116581bff7c3aa8f4f066a08becb88e59918da3
 DIST amdgpu-pro-17.30-465504.tar.xz 394216628 SHA256 b74494d142542164b5582e8bed845315f788aa3d9eb0c1ed5f2a6c5f982beaf5 SHA512 fa515d5397488ebd4271988f7b9b538190c4277a3c4dcaeb4b05f5cd5bdec657f13546de644b1a6825c88bd3b73e6c1a6aaa6b6c74e3cf942783b2df530cf4c7 WHIRLPOOL 3a1617cd8b8fd096614cf04b7e716b607ec718d122b286533d8dabc862c82b644ba864eb661b1d5e5da45c8fe674192d3f8038dbd85311d9ffc5c6f793f7d32b
-DIST amdgpu-pro-17.40-492261.tar.xz 361491288 SHA256 b0645157577c9ff175dc02487c4c682ded2624c8c2cfd6aa603960962e1d07b0 SHA512 b10d67f4fc7bfbf8f1de46e5202fabc3443e969759817d497449d911d4c591256cfdf73372013fdc67bd89c44ffe389c021c9f77ba27f55cbb5257af550bd148 WHIRLPOOL 61af42850786eb585442692437327e8a1baeb0dc905b6d84586f0a58e77e36e76c754334e5da3bbd25d813a73a9cd1303885a1267821a53bb6bb99b780108503
+DIST amdgpu-pro-17.40-492261.tar.xz 361491288 BLAKE2B 72093e803ad163724d9708dab0085d18a6dfd994588005b7a49da6e0e94a892ac479c87cafb7a9c848996d1db0860ae591d1cced2137ca71be4966705d5413b3 SHA512 b10d67f4fc7bfbf8f1de46e5202fabc3443e969759817d497449d911d4c591256cfdf73372013fdc67bd89c44ffe389c021c9f77ba27f55cbb5257af550bd148
 EBUILD amdgpu-pro-opencl-17.10.429170.ebuild 2211 BLAKE2B 425cb2c7e6244477ba970d18b2762fe5829afd3f18cd978cc734d2294e5d028eaa6ff6a470c674a7e147d593970e1637569e8ffd9bae2e831635875da732db15 SHA512 7a9200bbb6c1c18910d7b5df032f0ec6abbd9e0727668cdc11c3f14ff85bc3244b955e1cf58fc63db7dc44ad672f4306327c1d716b66d6360bcddb796f25f789
 EBUILD amdgpu-pro-opencl-17.30.458935-r1.ebuild 2355 BLAKE2B e7af1544698ab93dca4680d76dd9c6f5afee196fff97827c82053cc60ceced8d8d16acecfb150f5adab8517ae726c8ee53174f9319f12c77be54c0d8036bca13 SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1
 EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2355 BLAKE2B e7af1544698ab93dca4680d76dd9c6f5afee196fff97827c82053cc60ceced8d8d16acecfb150f5adab8517ae726c8ee53174f9319f12c77be54c0d8036bca13 SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 43cfcef92d02..fdc9d0f93732 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,3 +1,5 @@
+AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
+EBUILD atf-0.21-r1.ebuild 640 BLAKE2B 706df2739402cc239334a82f6e6e3ca3341709be287c064c13fff689511c4005e13d35e2b855ae72667ce87ed69338564dc18a9c8e05bddbd40c64e581077ce1 SHA512 4f33193da9f1f5fbb22e1492581fff63a02dc3d92554345a0b89316a08802728b95f77e759665676cfe45dd158dbdeb56391ed12e504d3466f05e2e3ffc7b6f1
 EBUILD atf-0.21.ebuild 489 BLAKE2B e74c5ca6fbd9fc2bee96632d5dcbda578c1c363b64dfffbf8a52903c787f54e9854e7ba786a2a5b8f12f859db945ca0047eccedfe03e191924f7dbce03e9be11 SHA512 63027784fb4ed54582ba81c7c88ded888a5f125d3e768a5c0b6958d76971ad2083e6865feb6dae99fb9bbfd06fc4577da67a86f8228feef49e4c5c9415ddd958
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r1.ebuild b/dev-libs/atf/atf-0.21-r1.ebuild
new file mode 100644
index 000000000000..8f0c520fae81
--- /dev/null
+++ b/dev-libs/atf/atf-0.21-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="Libraries to write tests in C, C++ and shell"
+HOMEPAGE="https://github.com/jmmv/atf"
+SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-getopt-solaris.patch )
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
new file mode 100644
index 000000000000..d70af36ce40e
--- /dev/null
+++ b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
@@ -0,0 +1,12 @@
+On Solaris, getopt(3) is in stdio.h.
+
+--- a/atf-c/tp_test.c
++++ b/atf-c/tp_test.c
+@@ -25,6 +25,7 @@
+ 
+ #include "atf-c/tp.h"
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 9304a44a2c92..f78e44ed4289 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,6 +8,6 @@ DIST beignet-1.3.1-source.tar.gz 1136608 BLAKE2B 490b83b0d506c376b2ec38cb9d159c7
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
 EBUILD beignet-1.3.1-r1.ebuild 2473 BLAKE2B aa562dcc1164162dddd40baedb85f1a683330d9371d9269c8fed913a5ee865725821086dbc40e7013274ac7fb346a836830253ea48885a174c91b9d875a40b94 SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148
 EBUILD beignet-1.3.1.ebuild 2468 BLAKE2B 8f35c89e9d5510ba4c93eafe2df0d0913a571603e9df705974916b90409294a0b08ff0d56e692a98ecc2bb4a6bf69dfbfaf300f23a9eb9d0b75590405fd35147 SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c
-EBUILD beignet-1.3.2.ebuild 2555 BLAKE2B d8021b67f93b5d9d387e8f1de4dffea47a88a85a16a18448ff55686ff0130ecbb1b32a3fee53250f0263173baedc19dfa7805a53781dab7b5c7466d8bd910dae SHA512 686671fbd4062aa3127b865289a7f75d78988d084ce07fa38a308168eb03594a1390ee7e96e292b776032745411a6789f3a82f9cf0cfedd937e2dfe1ed950e68
-EBUILD beignet-9999.ebuild 2448 BLAKE2B a35f0d38ff5f4c7c404b5d980b2762fb0e0aee9cfbfef1fe5d573ca9d54d8ed5ba5701355ebcf963d6736f2883577b06c4987d3b8eb8c5b078079a72b8377dfc SHA512 32dfb4b910f7bd7d7f1ccddd64b452850c8cd63f9e15f08a1ae2f747ae1c0986dbbfba0be8d6c4b2a08a3f3a24b6ee8fc04c0b02c45281674fe17114a1ef7b11
+EBUILD beignet-1.3.2.ebuild 2559 BLAKE2B fd05b79a5e89bdd9662dd4038136e26959bf2e4bbb1524f503ba204b19f7bdc52a60bca53603b98a5038eb33fc1baf39522c4c2f20c89e43bd4dea438ee840fa SHA512 48cf3d64ed2cc57d6d8f8d08a30a060ed9477a60e589530e749814d356b719864e10866d66fbcb40f1449778178ddf3d79f9727b569c1b821337374db2317ea6
+EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index e70e9d24d2a5..16ff04d93f83 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index d25a0abde8c9..5c7dd730a34c 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 293c4441cd3c..6089d61ba896 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,6 +2,6 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33
 DIST elfutils-0.169.tar.bz2 8067758 BLAKE2B cf4c11619442fe19a5df95b79546af879771890b069de44743440ca5f6b44ac471125cce21fb4b1533d5265760e9fdf2ea3371c36bca39713c3e587987b69cd9 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 EBUILD elfutils-0.169-r1.ebuild 1807 BLAKE2B 3740f463d0df20cc0cc706f0ebdcc5785b6a1e3eef60722cbf322e073c21130fce50db293df352549a9eb1f1a26104b1c79e8b8e1d56f0cafada1887bdde2f66 SHA512 5ae2adb8d3263555993d269e015985e40a1d979bd65ee3731168455babc0c16169a3c32cbc1ef237db92edca74cb45d50b327721fd11cb5c1ad0a028cc5d1538
-EBUILD elfutils-0.170-r1.ebuild 1812 BLAKE2B 03b7c7397aae904f8c7b3f7c42b37a39541e4316be47ddba3dfb02f2ae7439ba04dc8e74331b4427d4f546e325b7b9bc6c5355c817ea81aaa6732fd8067d3abe SHA512 c0ade8440e1a4d18a97433d81460b74bb5b07cb34bf478b41cb8ee3e2adbf80ed1aa526a6350aca2dc64a2273b8a0e1a853500f547467a7c94ed98126016da71
+EBUILD elfutils-0.170-r1.ebuild 1811 BLAKE2B fbaee335b6ff376042eeffee7f4ae72401daaa05aaaab21a2459fc214042c79147452935879a23ec405cbf80a324f944659c5be329657ee80e9b7d70fae15182 SHA512 c690e4948befc542fbd700f186884585a4db2a48a809f2f015119de5ed06c8977c91805c620606eb1073ebeaea04a4128e05f87e7195e9edc2a54a3983a7b89b
 EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
index 222a271753b2..cbc4df1b2ddb 100644
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 785098ebd1c0..58fb272ec649 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -3,8 +3,10 @@ DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e5728953
 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 2518 BLAKE2B 9ad1856dad58248fb2b91dd0d529f813cb60bbbb6fce995086acceb6862416fc172c418f0b38c8a211447779cfbc3b875fe340290947dfc117bda38c6690959c SHA512 f2aec190980a1760d6412a4c5fe74c7a01708a60c3c80751201eb30d158147312394f7270cb1f2849c1716c314cadf8a3b90b6efdf9f101c7902852ffce19ede
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
new file mode 100644
index 000000000000..cb059aee76fc
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
@@ -0,0 +1,115 @@
+# 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/Manifest b/dev-libs/icu/Manifest
index 4ad5d514cdf1..c52a9062f3f7 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -7,8 +7,10 @@ DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e5728953
 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 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
new file mode 100644
index 000000000000..773d5b35d4ba
--- /dev/null
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -0,0 +1,163 @@
+# 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/keystone/Manifest b/dev-libs/keystone/Manifest
new file mode 100644
index 000000000000..000395b901db
--- /dev/null
+++ b/dev-libs/keystone/Manifest
@@ -0,0 +1,4 @@
+DIST keystone-0.9.1.tar.gz 4326151 SHA256 e9d706cd0c19c49a6524b77db8158449b9c434b415fbf94a073968b68cf8a9f0 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17 WHIRLPOOL 8ab5ba40dc3885c09f955f2c00371ccb8e7f655ae24aece318b8abbb734c065c9bff0c7241fb3a222cca2d4940ad517b25b543df632bd3874110b79af54422d4
+EBUILD keystone-0.9.1.ebuild 1756 BLAKE2B 41dfdc5d1d23fdb9d1cc53d219a768e941216c308d43bd0274d9089f8bd93d4e84d5c825bc7a94ef984a3ad3df6f1666c78cab11eed0303f82e2bbcb00db9706 SHA512 bceb2c00391b7d7f3889f42f2eeb0ff8aef5fc49843710141b6f3d3c66255f9a2fa090b476f595a24624a85a07e003e4eb9e5edf33a2ec7614c2bb5860e4acf9
+EBUILD keystone-9999.ebuild 1727 BLAKE2B dab4499cf878c8fc38b52f9e8ddb6db77b346056e105bf45048236c4ec4a500a31c0d731dd84dc64618f14aa6edde62d9ce8cc5e02adb1c7f8d935f0be2a7b7f SHA512 30b00a81d8dcec730b9f03f7d882a204a6dcb12c2c8efae7ec4b8e1a89909ade5ea840ed23cc4739ef220bb2b226a72ea2671d3ff681e0c83078c4147fc0bdcd
+MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild
new file mode 100644
index 000000000000..58dfd226f042
--- /dev/null
+++ b/dev-libs/keystone/keystone-0.9.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+CMAKE_MIN_VERSION=3.8.7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils distutils-r1 llvm
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="http://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P/-rc/_rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+IUSE="python ${ALL_LLVM_TARGETS[*]}"
+RDEPEND="${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )
+"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+llvm_check_deps() {
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${EBUILD_PHASE_FUNC} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	wrap_python
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+	)
+
+	cmake-utils_src_configure
+	wrap_python
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	wrap_python
+}
+
+src_install() {
+	cmake-utils_src_install
+	wrap_python
+}
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
new file mode 100644
index 000000000000..f3f700fb6607
--- /dev/null
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+CMAKE_MIN_VERSION=3.8.7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="http://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+IUSE="python ${ALL_LLVM_TARGETS[*]}"
+RDEPEND="sys-devel/llvm:=[${LLVM_TARGET_USEDEPS// /,}]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )
+"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+	)
+
+	cmake-utils_src_configure
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake-utils_src_install
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/keystone/metadata.xml b/dev-libs/keystone/metadata.xml
new file mode 100644
index 000000000000..4283547f970d
--- /dev/null
+++ b/dev-libs/keystone/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">keystone-engine/keystone</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 2abeccec3176..32797c4fa7d5 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,3 @@
-DIST libbytesize-0.11.tar.gz 68322 BLAKE2B c791ea1deb4af7942d77abc7c9ce77d25633913bfa7403c6225c2fc3acbf2dea7e182e68fd75a22abb22c97ed3c7b984bf8c12f45b69a54b015294be747be3c6 SHA512 3275116a74ead484508da494934062e77d19b50dcd124d7b309137e52a416474099685c39ddc63090d6ed124a667c7fc8c2a7a5844712b33f277703bb52d54ec
-DIST libbytesize-1.1.tar.gz 70495 BLAKE2B 852798a7d405ac65f2e6b8874f999a23a8d27d13e65eb3d168f25e8aeadb6af8037938e7059a2053baadbe8b62cd17f0c229a4e443e15a9a8db21054f2bdc6bd SHA512 3d376dd0f9a10974f2392e3417e8e99ac57313be3ec945eeb7c84f72ddd51a5f29b61c7268c8c870dbe941eebf8d9027f8f5b7e0140790510bd8fb6b2c8db35b
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-EBUILD libbytesize-0.11.ebuild 970 BLAKE2B 3a82590b75dc0d3f3ae0ff8046ac03acbe8432d29806f4bbe93813361b7ced0e341f11a056d5f9ec05eb05723d7537a881997f32d659bf8f9c926762e98cc7f4 SHA512 341dc58d09a0111fa11e58af14e982580cf1138a2a2e70d3e74779cca58bfbdfd4769450ec435f64d1ddb9de12a08794872e969df9101102c3a16f050c4c3714
-EBUILD libbytesize-1.1.ebuild 890 BLAKE2B b4f011f3363b0f05e2f9e4981fc2b9532d517db4e2649fb75d091dd32ae6404ca644127f7f03b0e279b7d75af931bbebe8389d7473707f080a5fa9c1c11f1265 SHA512 5f542290be53c702bbf8c7f6993e0a2e25488886a56a99929c5e05401012c26e313eda540154cb29c0534182892ccc9bd4a7ea2d8ab710069b1e88112be703fb
-EBUILD libbytesize-1.2.ebuild 888 BLAKE2B 663369a2e10c33652424854ec70a1851e0f2d6db5b768487b2eee945a0899ca5b81078ed5cdbd703ff76ed1b7c292c336b5439867649e682417f6254029b4d36 SHA512 c80719780ec44bb7d76517ec1ecdb917021ab808e5521c60d9aa2354777849a824af04a58383ca574e9a5afa3971d9c5cd46ffd0133f8f525d246f5aa73e6963
+EBUILD libbytesize-1.2-r1.ebuild 1059 BLAKE2B f25ba640735c3a6843a585e71550ba89aa9e7c90f1618e41c0bd69df376db3432089f040f7bf45d7a53a4dfe326e44572ee7c519eba2e4e917fab71c438d1b28 SHA512 b37ed5aa2385fc4eba357e41e58dc3affb56ec9e0b5900627debd64e3b25e0a90343f7ca3fc664126bee687fddde15df6d81c4cdaa0bea1165c873040459032d
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-0.11.ebuild b/dev-libs/libbytesize/libbytesize-0.11.ebuild
deleted file mode 100644
index 9a089877335e..000000000000
--- a/dev-libs/libbytesize/libbytesize-0.11.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
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-"
-
-# https://github.com/rhinstaller/libbytesize/issues/27
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/libbytesize/libbytesize-1.1.ebuild b/dev-libs/libbytesize/libbytesize-1.1.ebuild
deleted file mode 100644
index 61b601fbd627..000000000000
--- a/dev-libs/libbytesize/libbytesize-1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/libbytesize/libbytesize-1.2.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index dbb899eae3da..2dc795777df3 100644
--- a/dev-libs/libbytesize/libbytesize-1.2.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit autotools python-single-r1
+inherit autotools python-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
 HOMEPAGE="https://github.com/rhinstaller/libbytesize"
@@ -34,7 +34,7 @@ DEPEND="
 RESTRICT="test"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python_setup
 }
 
 src_prepare() {
@@ -44,7 +44,18 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--without-python3
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	python_install() {
+		emake -C src/python install DESTDIR="${D}"
+		python_optimize
+	}
+	python_foreach_impl python_install
+}
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 92f6132d3c67..c386dec0745b 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -3,7 +3,9 @@ AUX libcdio-1.0.0-version.patch 613 BLAKE2B e0332426f7ca2d4cfe1335e70bada237f536
 DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
 DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
+DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 EBUILD libcdio-0.93.ebuild 1870 BLAKE2B 30953f0973dc5656e26312606ad557ced8aa9a7a0672bee7e9fead2c002360c5ac233dbabc64c2232043c201ea41d9626ac86feaf8af743ed7267d4fa75a8edc SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945
 EBUILD libcdio-0.94-r1.ebuild 1888 BLAKE2B 20ef4b8bdc055c406864b2bd91022a5938f469b20be26c48e888d8d1b58886296989fcb784a07898c1f663d3cbc7fb89bb097c2885983a59f8327a28fe03d529 SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a
 EBUILD libcdio-1.0.0-r1.ebuild 1866 BLAKE2B 602b38ccbbd247f100bbc28eb0bece2132d280b9c6723f9f296e2e9906d441435c0c2f82ab0603fd8b80d47ce8f8bc28539377fa88c2a4aa950678aa65ccae41 SHA512 25b0989c158e152eddb589941dd16b9aee4b3e2783f2ddefd0939d9245a904829ec348c5337c84ddeafb7dfd4eef9b7298976fec3bc665fb8abbd87774dd6514
+EBUILD libcdio-1.1.0.ebuild 1788 BLAKE2B f3d6344d71d636aa3adb6e602fe43b8780125ea034c2509eb9482b71c76957f9671c977aba92f54130f770a3b9c2d8d452bc2fa473378348436fcfb10f01dc00 SHA512 532216f99f928150d76cda3be770a2565c2bb08533dfa809c7979052701098e70ea36db1d4db494ed567a433e5466b692b00f9d95436a93e24abd68e3aadfb94
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
new file mode 100644
index 000000000000..b8ba3e226653
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-1.1.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/17" # subslot is based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		cddb? ( >=media-libs/libcddb-1.3.2 )
+	)
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	sed \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i configure || die
+
+	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
+}
+
+multilib_src_configure() {
+	local util_switch
+	if ! multilib_is_native_abi || use minimal ; then
+		util_switch="--without"
+	else
+		util_switch="--with"
+	fi
+
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf \
+		--disable-maintainer-mode \
+		$(use_enable cxx) \
+		--disable-cpp-progs \
+		--disable-example-progs \
+		$(use_enable static-libs static) \
+		$(use_enable cddb) \
+		--disable-vcd-info \
+		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index f778f1f526bf..63fd0c460d83 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,5 +1,5 @@
 DIST libevdev-1.5.6.tar.xz 407024 BLAKE2B 1475de52bf27b505fca1aee3d98426b68cd8a7e05c126c94c7824915a091ffcf2495686c4d0feed628fec73a5b5c7c8bf70e062f25c06dd28024ae11e75b2868 SHA512 4e9f44e0957d9d83e46de095f1eb8a64d7db808ac5a397d266ec1149948b82aa3f123fcf3d47cd72aff2741cce13b2162324c195f892861de97d7beb19ef6b19
 DIST libevdev-1.5.7.tar.xz 407452 BLAKE2B 7558bee09dfa1bfe99483d32c99da6011b8234b3dd19084c9d88eb69aafbf221d6f51ee4f0f360225f2aed40b7ff49052256704dcb9e592947adee175a1f40b2 SHA512 53adf6c92ec61f0635b643a88d8762a18f7cd3088d23ac95831be32cc7150ebd19f20265b90f6a1f9a63420c2f8968c2d17d8dc4892c0e90f9dfcce82c622df1
 EBUILD libevdev-1.5.6.ebuild 652 BLAKE2B 2c58e3595d43a4502ad48bd05ab28e1d0b6193b944fbcdb97bb8d0e6556d4acd5e6dd27f2375e8a83feaed068220653160d32364d471158c96c1ab2d13133376 SHA512 27b180e3a64a0221fc8a10b4a7d7f26b7e37cec8206404a48d1628ef248948a7e5d04541ecaecc212064c482e8ed5856948cd6eb3a41b51df689d838389fd104
-EBUILD libevdev-1.5.7.ebuild 653 BLAKE2B 7543dcd7fa23476726da8833a54d3529da827360c1d1d9bcdde7b61ac57b127bf29934633a1fd834a976eb1c0a2b04a8e540f8267bfe988529ca2a12d4ca3312 SHA512 dea2e899753305c86fc28402492ddc610c26a8ae0094581aa77e1718eee2b469448fa44bc109c6be8d373123983f0b6fa5554b09232bb01fd03db1536c023595
+EBUILD libevdev-1.5.7.ebuild 657 BLAKE2B 85517866518fe08a57aaef66b5ce3f907f0e6548fd5cdd1354672126983489856218f9fc6092edb508baff78499f2d5aca5906a7be72aa655ef73e11653bb0c5 SHA512 86cd614cff11f8a8d9001a6933bd3a08a0165154c1688ec914facd1637677462774f82f0f7a3ae2aff02352800f867011db60c8351c1c76ae7a0e44e7ab625fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.7.ebuild b/dev-libs/libevdev/libevdev-1.5.7.ebuild
index 4c1855eb9015..66d4f73e03fc 100644
--- a/dev-libs/libevdev/libevdev-1.5.7.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit python-any-r1 xorg-2
 
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index 5babac7eceaa..8309d0440ac7 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,5 +1,5 @@
 AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
-EBUILD libg15-1.2.7-r1.ebuild 567 BLAKE2B ecbff03fbe167085af806aec603fe2a9e4be15d489c05f70c45a3737163fa34c2bc99eb3c6b303968ea7641ce6b72fe29c7fa2588bf43dca0d28fc0bb1597b2f SHA512 f09233edcf9a3e5e98c0e8a75fe63dbc561568212f1203a9b2af13a52794703a73f801dcfdce64e31c5eaebf57f5e11419e51cff894f05449848d4b30539fc53
-EBUILD libg15-9999.ebuild 969 BLAKE2B 2220e0ab32032fe7bdae313925cb513b9d8d3eee4e14d5b53f8474f01ca81e12bba21584263dcdbbdd5358328938246aa799af7cda9a276359dc5f1e477f4e10 SHA512 bdfeabc76fc6b00c3f6b9afc5e6b4c886d8e986480fe371d1ede848575d585556279a25b37e0ab9cf7d63177b3d2660000604ed533ccf4b1d261d8a2ad601995
+EBUILD libg15-1.2.7-r1.ebuild 577 BLAKE2B 7c691bd1a18b975f94b304fba02b5893e214a484c99e3d98cc2210fc8083590fc549ff38b2d50fa1cb49a6d3564b39a95381adb1ef89a88fbc4170cea0af9d38 SHA512 4f69993a3fe66ba8642eea1d8bb3aa9e6b1e86f579ed91c163fb1db2d8b6241ab2586d0cafbab3dc030128a170085d8eb2ce8975fee3afb55f4a4ac6cb10f343
+EBUILD libg15-9999.ebuild 979 BLAKE2B 023afc75bd44fe0e05ea3dd313e3df3b27d282f4b26ca56c682715c17c362695e5e4d7d9266bf43eae06a88d96639830ee1d7bc6ef1a1b84eddfd7856a9ed642 SHA512 8acc39a8dd1b341bb727d6958a253236880f0e240cbc57ae70285b6304ce431926400137c419289a9a2285fde6965c9a9771ac1a55c9836934d3e8afdad5759c
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15/libg15-1.2.7-r1.ebuild b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
index 9b340e408e4a..5ec490f2e523 100644
--- a/dev-libs/libg15/libg15-1.2.7-r1.ebuild
+++ b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
 SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libg15/libg15-9999.ebuild b/dev-libs/libg15/libg15-9999.ebuild
index 174001c15b58..a2faa8211176 100644
--- a/dev-libs/libg15/libg15-9999.ebuild
+++ b/dev-libs/libg15/libg15-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
 inherit subversion base eutils autotools
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
 [[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index cbfeb8c3d0a5..c3e66c8c63d8 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,5 +1,5 @@
 AUX libg15render-1.2-pixel-c.patch 527 BLAKE2B a345fc90a983de5fb1a728289196114c9085fb5beaf4e3812c2f27dcf836b4900dd6697e7296066ad7a313b127a510acb530e1a2e5135c2871945d45e5e98c2b SHA512 a6f3f2a0a6f5e33f6a201688afffbc7c18d3b591d1abba1e95c425bf53f9d53416c0e24fe2726ff752c3656ba76c3d3326d2d2b7f0549a8ff626798008048b3e
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
-EBUILD libg15render-1.2-r2.ebuild 807 BLAKE2B 4b48ec42625479862419479fb6207b002ed192107afa4a8e1f254768c1ac834e8fcdb09c2c9e8cde72670fbbc61f03f54216653428f2ba8bdc17204499d0026a SHA512 53856d69ad5003f66ef14e4941c28ae70bb71fdcf623a4aecde08eacf8d96e31b64fc1eb32df2f109eebafd0a502a2091c103ea0850ab4d05ff103ed1b96c556
-EBUILD libg15render-9999.ebuild 1158 BLAKE2B 93cdb9f8f52d58cc6b0e72b9abe942823090256b2feea0cc8cd05201bcf11eb3877104b8dd062eda5670aedcbe26dfc9e06ab31d2758d3bf1b75868731b55ae0 SHA512 bbdf73f7dabf207761bcd6b41b0dbc8477152f56d01f86695edb8654efd1b322a4357b90a6c4c6fa91b11b6989428701109b63e36b9faee5f884f19d3a7d3b69
+EBUILD libg15render-1.2-r2.ebuild 817 BLAKE2B 6ed3395c5ad2d297a5e56470619cff1411615111b5203f2f8bfc8e0bf89ba73507dd12d32c662bd7d99d7d3e12dbd73facf1fa0dcfd4b8730d77f19d5c578d4b SHA512 6169182c9c93e4d289bbf69ccc2be59f64bfe07f823b6e2238e470ae22932f7edf2efd0389ad37550edbffa0bb23f8350eedf9322474ede167f91e86ba48d233
+EBUILD libg15render-9999.ebuild 1168 BLAKE2B d194698228a89c3e8117cb87da0cdef47a3e68ad0da1a9938b213d06ad24b0845c8b3b6e0f21fe6dccbf3edbf6039c815b1d8f3a145a85498bf0ff354b0ec74d SHA512 bab94ac83adfbd395a9fc5ceadaa3f961377987ca5e2685abf8c2582cc43a63810ac774538ff6e8a4cc221d561bca015a571e0efdde53435f66ded723154a782
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index d5be67de45ff..61782d60444a 100644
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,7 @@ EAPI=4
 inherit eutils
 
 DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
 SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
index 5abc41d9d588..58ded405385e 100644
--- a/dev-libs/libg15render/libg15render-9999.ebuild
+++ b/dev-libs/libg15render/libg15render-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
 inherit subversion base eutils autotools
 
 DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
 [[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 732360713d06..942436cbb056 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,6 +4,8 @@ AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
 DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
+DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 EBUILD libgcrypt-1.5.6-r101.ebuild 1819 BLAKE2B d8c7173947450abfd72f78cedd5b0f0575d1a0395e12009cae295ffacfa1198fd2600cdd9251e7c7c4c92fc1ab01966899d15e64136278f293e374077728fe05 SHA512 c6f34489fa52dd333fcbcbb3ece2c0256e59653a7461e0531802ac477a19ef1cbe69266349e18ccbbe6b1cf98bff792c40e47594a644c26ce2360d29e251356c
 EBUILD libgcrypt-1.8.1.ebuild 2242 BLAKE2B a1b5f77ee305822d890299c85bd1c3fc3e980f5025de4fa4380f34aee611e124df9058ad9bbfeccc3643dcd46903e383c36e8191bbb5e6fa2aa3c74d14b1d2a4 SHA512 08798fdc1e444767a01804984d3dd7421cb866314cf9cd8b4048ea50f46954437be6515811e3fb45c0724619d310cce9efd2a11d37fbc1a73aed784be266d6af
+EBUILD libgcrypt-1.8.2.ebuild 2251 BLAKE2B b6b3e62d0d7038aefbd4ea52842b1ba02009f9fa129887963e2e7b044740f21e89d0b3099a3f1cc1c7bd6ca471a70dd7aa55139747d2403b64eb4af65fbfb40b SHA512 5e456df4f4466967b2f638d8c870134e85ddeca04e5a8b4186959b2cebb236454997ca881c4e009288e18cf544bb50a155d473e3b588b22b035d1b2f394b4a24
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
new file mode 100644
index 000000000000..4760de5bcf60
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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="doc static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-O-flag-munging
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index f99974f86a59..583b2958bc62 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,4 +1,3 @@
-AUX libiconv-1.10-link.patch 910 BLAKE2B cb22d6c63dbcaebda115563fea88879117252ead8596aa941409ad5bcc5d7ddf6d1a27d55982fc92234491bc4612702aa045b2740e94153d5f83491030ab8767 SHA512 348700cbc210aad66ea5ff9099b9a871210f211ca2f241be5332b90810b886965b2d5c4a462979f164bd51be033be1ad2f6e92c6efe4171afa0a12db8153bb5d
 AUX libiconv-1.14-no-gets.patch 836 BLAKE2B 9385fdfb2c924ae30ddef79a40bd8778a09f7da5da0adf085cb114a40670186d186036607c77d1665469a1ebe2082fe93d3967058502a0b7a5a418854963e647 SHA512 3bb04769c46964d4357aba57b16a2cbdb5c666d839d46fcc0a11be945da9e855f5e0682c2dccd2fd66baab74e3429040849c503e9bcd05e53962f7680b2c0713
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
diff --git a/dev-libs/libiconv/files/libiconv-1.10-link.patch b/dev-libs/libiconv/files/libiconv-1.10-link.patch
deleted file mode 100644
index c17019c93375..000000000000
--- a/dev-libs/libiconv/files/libiconv-1.10-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libiconv-1.10/src/Makefile.in
-===================================================================
---- libiconv-1.10.orig/src/Makefile.in
-+++ libiconv-1.10/src/Makefile.in
-@@ -92,7 +92,7 @@ install : all force
- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
- 	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
--	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
-+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
- 	esac
- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
- 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 429c60ae8314..ef35284814e6 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -6,6 +6,6 @@ AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f
 DIST pcre-8.40.tar.bz2 1560119 BLAKE2B 121d2c9f8c403a663fe27a68030faf09a06dec5e6a25ae8d62e06887850e219e87c71a14f6ded084fa25b719067acb71c89c66c81f6f09f55dcc51feaf41e737 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 EBUILD libpcre-8.40-r1.ebuild 2849 BLAKE2B 7bce89892b62a713618fd329b757c38ed542cf6689012949c06e973e975ae9d1bb83c891861b8469f861368e0f431f1563b2dada6a8263fe7597d943cf2f13dc SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f
-EBUILD libpcre-8.41-r1.ebuild 2905 BLAKE2B 621042bd4d4e5f49c9fc761b027260cbfc8c9a60dfe0e477eff5a9b1fc0507535ed54440bc19ccbd44c18c5c7a82161ee8583e3c0d9d0121ee3d3f31fa9564c2 SHA512 446e98d68fb06ecaf2a704e6d246cf677971e03ca1a5ca61a1901c65ddfaaefade0ed985915ab49bbb7c8ceaaa6d21568f6e8bf5a1b4ca0047dc700fcbd7d470
+EBUILD libpcre-8.41-r1.ebuild 2904 BLAKE2B 3595a2099038fce1615b7f91cbd44cf1ae6fcc10874920d3669d08c805068a0558f41b769663410d6348620b91a0ee3851e4d7f7e48e20700e400d306afd09e9 SHA512 8bca7e41e16ac22a8fca94b935abd6f5590485fbacc68fda01a147334d0d5307a89486aabfc18e922dba407cc576729705972798c15a91561b933e1e114d81de
 EBUILD libpcre-8.41.ebuild 2845 BLAKE2B 446911be253d61cd920160627bfa803333382958fc33398154756be8f7fb29c8e461eb7cd456831aa169882b6f9873e4ca8d9d9303f9bcb80e53fdf915b7b6c6 SHA512 7b12d7fa5da2b152a3ba581cebe3d2f5535f3bd810887b17acff16271441d0d5350853fb0e8f3b407019c7d2e0910dab01b7b9dab0f16426a909b73f6f6b49cf
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index 35666adaac5c..642b4a7165ee 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 055f3ea1837a..ba5fde66c968 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,7 @@
 DIST libpqxx-4.0.1.tar.gz 1582532 BLAKE2B e84f455de3cdce1bbcdb29ae0ff5fea6e5c624f910a3612976eea1f50e054b785b9b7f2b816fa5d0e11ec4f53498404eb2ec1d9c80fc60a8be27d0e0cef0de14 SHA512 00204985097ef8bb0a3376d6ba541dbb471d7c52d7135f6244a9f4acbf6c8e5254d6f813e4411421e49bb56f4a520fc6ac67e300141d724396ce0ac11bd3a95e
 DIST libpqxx-5.1.0.tar.gz 677998 BLAKE2B 5d486beff9d45249d191b380b2a552dcab621c0509c318e8745abfcb5d6d30b0c31dbe3431fea0c1c212b7a3d6d48abf15d537c6f5a6b3869963dd7615f3e4d3 SHA512 4e881bb509b36b6b48d18dddd0895ab6864ba0430630d3e1417036ff8ff0008b446467868f2672e0b49b46cc3a86c6a61a8a3e5c6b63e0bf422be3268d7f9702
+DIST libpqxx-5.1.1.tar.gz 678031 BLAKE2B c615094b7d872355ad45eb49c3f2e9776f314bca0fbf393ab9ec96daeae5732082c9907eef4793f575cf2cbb95ffa30e1d83cbfb9c4a2938019d9d207ebcc9cf SHA512 fbbefe37d01ef58dd7f73629b5174c7285c0fe7d2f2ae10d3118d55d944f7e92b88d0e9c8ac72425c3bc55bdcc12f3e110e1974b303b7fb227be805e935982dd
 EBUILD libpqxx-4.0.1.ebuild 2332 BLAKE2B a6d7affcddc3930d4a789ee7f7ae2cb2b1c1e823465a02dc8385930ac3951fb39bac8e1e85fe4dc577f02303143a26629aeadc98b05ad9f98a1b8687cda5412a SHA512 6d01421a6f56b160e51297cb02d73f5c0ad5c197a5bda8491efee96c8c46fc1cc0d792a3b3f21d9898e3296eadd5511e3be7b9e8482598db8b28ddf443c33b0a
 EBUILD libpqxx-5.1.0.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
+EBUILD libpqxx-5.1.1.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-5.1.1.ebuild b/dev-libs/libpqxx/libpqxx-5.1.1.ebuild
new file mode 100644
index 000000000000..83c831e8738d
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-5.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1
+
+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"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+	)
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_prepare() {
+	default
+
+	sed -e 's/python/python2/' \
+		-i tools/{splitconfig,template2mak.py} \
+		|| die "Couldn't fix Python shebangs"
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT%/}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			cd "${S}/test" || die
+			emake check
+		else
+			eerror "Is the server running?"
+			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}
+
+src_install () {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 0754e9c87275..85f40169e822 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,3 @@
 DIST libqtxdg-2.0.0.tar.xz 62404 BLAKE2B dc84654693c6504c36633394ce4bafb46705b45ac3e7576b03b92710603c86375fd70d5ea76a2864e498c5b33728b02d215da5b65eb3728218ff97defd883bf0 SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3
-EBUILD libqtxdg-2.0.0.ebuild 866 BLAKE2B 7d98837ec5cb346d425eb22d04d591d7ad0a2e18606c56d9c6376f36af766fb5075094d789737837cbe631fc8a6878b6cb8e462c431752d3f6122e8d3e5b620d SHA512 ef8a0ced7633ac439873cb0d5259c9161ed1c2ee0fb2cd17ab24f1e89d8a30c61f970646976e1cb90edfb48961e5935a4e91244fa007ca004d2ea17a54bdcdab
+EBUILD libqtxdg-2.0.0.ebuild 864 BLAKE2B f54f6e18e2e44454f5528d6cb20ec6b56b22b1d5f15da55fefcf32757aa4eea46239c61bd50ed129b327bfe5b74c6d31465b879731ae3d1e6585a597a53b1d4e SHA512 03a5998de4e0e855a29c2a9b9cb0a305ec950e9b6164887c8e9e133285e2a83657b75b4b84cc096b81b67b981bbd19f3fc58bdfd1312c85293aec1d4c47736b6
 MISC metadata.xml 354 BLAKE2B d02d04cc08da509cba043080d79a8c9974c7b5a1da876561e3998e59ec5a9bd91035f44c776b21cd6ff2e6d44fbebfe46c7cb1bd792b0d66e97f84aee757cc3d SHA512 1c79d30acbeb7bb3b6ef14e7357029e1f1ec4dce23ff6e2ce851f2ea36e981b5606e8863027edc8211e90fa75c66c37c17d9df4f00fdcc333955568de6a986ad
diff --git a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
index 5cb17f5e15be..194c8516ead2 100644
--- a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
 else
 	SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 6c43031c8543..b2d567f529fb 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -6,5 +6,5 @@ DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7
 EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
 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 1047 BLAKE2B ec7d2c53bf5732007d5c5e9304d3ed3ff2a35dcb60b08c823e7a18a5eee9d78c1d9e06ac51dd29341189c2573d55f59b470295dd49ffe76bada5fe158a295755 SHA512 f926573dc428510eb617733db225655fc8a95200e36cc9f47772afd0fa548f93893a98933fc5efaccd3036bd7eab54d5e3bb1d3bb07ca6fee652845d9e79b438
+EBUILD libsodium-1.0.15.ebuild 1046 BLAKE2B ad606013290b6c0850427a969e3824ad5dd218f96ab5a5ccdf8738f1c372626f19903ca752c2620f003674f0e3c2e69eaeb613a71f4ed37e4ea336c28fa117d8 SHA512 3dc47d37b700843c5f0f0c731338087f3dc1f2a7e9afb7fe9fb5543ec6efc16fcd49f35b86aa64bb23c4869f817dcbcef3416ae89c6dc5f9ea232e9eb18feca9
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15.ebuild
index 16700efaf4ce..9200cc73c31c 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.ebuild
@@ -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-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/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 60687dbc1b57..8b815ec93287 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,7 +1,9 @@
 AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55686983fb701c4eb3513fd1779572a8d8449a305e34c2194fa07fe7b74a63572addb764f3ba8c7cd3285a25c5502c25f842 SHA512 3ba5253df119d57e598167d4ea0c3cbc000c50395598a953462d24e21832d41bdb16631688a99266f533e133fa39a58cc271e32d05e61b3756697ddb06898999
 DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
+DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
 DIST ltm-1.0.tar.xz 2191540 BLAKE2B 8794d81558f8e4236256c12201e03aad423b9e69ebd35fde941bd0e70174509a09973ad5cdf432c5c0cbf43f78693351782d9c2ea1085f2fa2a5bb77bafa89c5 SHA512 da2ced516106fb056373d97f9ac443805c57ebeb0a33982c14703d6dd8c3925e49aeb690b790ba91768ed5d41f5875dc50a3d3435dbb4088cfa3fddee9162082
 EBUILD libtommath-0.42.0-r1.ebuild 1436 BLAKE2B 8a51bb249ec1c3dbccc9615dd815342224796215ccb4469ec7ed6cef2c1a1af460579cdf14430e15e1d54f7825b8bee1744b4ef2d7790408a900e3af0d27713c SHA512 83dc7913ebfad16d431bb6524b5a2fe032b52dd15cbc6d127b1e78785f36bd7787624d3459ff23cea37c29acd0db763b646e093cdad9292fb446829a526b3707
 EBUILD libtommath-1.0-r1.ebuild 1509 BLAKE2B 6b8f688f1b653f0c9f3c04f8c5f512fd651c723aeb61ab8ced2d7c0383d7e4147b898b6176d4d8aed4066a9829c8553151b8a67f9e2dedb2874d40d8aee95e54 SHA512 dcaca3dd34a3b669ea284bf63e61f473bbdf25936d16e7bb9fbe49285afdad4d3ce32c7a2dda8b3fce3fbc54231d172209836692b82f2809309b27589588d72e
+EBUILD libtommath-1.0.1.ebuild 1507 BLAKE2B 980126c931a91612084f917867db29fc6cb0b46f03237321fa33fa6d72dfa9f67932425b723a7b463e7982b583afad5b386ad872882329da1c771e7167034c88 SHA512 2dee1c3229776885d089af70b3112243e67592eb23e20e5b231dab738e9a09a12a4035267b3992195290d6a16fe3c0680e1f6f87d3ed9202613b18ee3c561eb7
 EBUILD libtommath-1.0.ebuild 1396 BLAKE2B e64cd2f80efb2ea6145c79a1b192e2f943a01a0cfca065cb652e1aa70f0da9ee54877df7dc441b892140239ed06ac588be969deab13d7015ae90163d59d9a78b SHA512 28f0b82b39166e74f7a6e87f5a992815f6465c05301a735ec4f2dcd9f6f64734d2cd0073fac5c015a06c79fb005cc2796497e104ad5e9bc6c2b5f41ae9e6d0f0
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.0.1.ebuild b/dev-libs/libtommath/libtommath-1.0.1.ebuild
new file mode 100644
index 000000000000..d369a6bdc05d
--- /dev/null
+++ b/dev-libs/libtommath/libtommath-1.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="Optimized and portable routines for integer theoretic applications"
+HOMEPAGE="http://www.libtom.net/"
+SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
+
+LICENSE="WTFPL-2"
+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"
+IUSE="doc examples static-libs"
+
+DEPEND="sys-devel/libtool"
+
+src_prepare() {
+	default
+	# need libtool for cross compilation. Bug #376643
+	cat <<-EOF > configure.ac
+	AC_INIT(libtommath, 0)
+	AM_INIT_AUTOMAKE
+	LT_INIT
+	AC_CONFIG_FILES(Makefile)
+	AC_OUTPUT
+	EOF
+	touch NEWS README AUTHORS ChangeLog Makefile.am
+	eautoreconf
+	export LT="${S}"/libtool
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+_emake() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		-f makefile.shared \
+		IGNORE_SPEED=1 \
+		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+		INCPATH="${EPREFIX}/usr/include" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test_standalone
+	./test || die
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+	# We only link against -lc, so drop the .la file.
+	find "${ED}" -name '*.la' -delete
+
+	dodoc changes.txt
+
+	use doc && dodoc *.pdf
+
+	if use examples ; then
+		docinto demo
+		dodoc demo/*.c
+	fi
+}
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
new file mode 100644
index 000000000000..cb87cb1a1fac
--- /dev/null
+++ b/dev-libs/libunibreak/Manifest
@@ -0,0 +1,3 @@
+DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
+EBUILD libunibreak-4.0.ebuild 1205 BLAKE2B 34d64d523e8f19a07fb9d4ef314f9afe3b01c84ee3454830f6a571d1bb551600d082b6b50eff9ffef8ea55bde9e820c87d072352427ad6a5e5cb142ee2c2d6af SHA512 1a6779b3e587a3c284a78cb50078eb4e5f6bbbd56a53642466309fe10cf4a335530beb102e72d2101f3cca2cb04c79db38f319ea02fd48a8fbd99619363b831d
+MISC metadata.xml 614 BLAKE2B 9a68d6b1935c236312fb74a18fe8d417c8e11970be97aad071d04b5a2c57cd18df55e2b48a855ff81a3287636af6afb4abf1ab0fa84c6391c013500f65585061 SHA512 bb9c9c2b2264cbb2c7596146c1be2b51a1e0d710432b86b3f68dd7fe9832abe7aa68ffe7806e58b6e4d044d269f86a533b1b9bc437eb5cb80bac39027989e62d
diff --git a/dev-libs/libunibreak/libunibreak-4.0.ebuild b/dev-libs/libunibreak/libunibreak-4.0.ebuild
new file mode 100644
index 000000000000..ec0bccd245fe
--- /dev/null
+++ b/dev-libs/libunibreak/libunibreak-4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+DESCRIPTION="Line and word breaking library"
+HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
+SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(replace_all_version_separators '_')/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc +man static-libs"
+
+DEPEND="man? ( app-doc/doxygen )"
+RDEPEND="!dev-libs/liblinebreak"
+
+src_prepare() {
+	if use man; then
+		echo 'GENERATE_MAN=YES' >> Doxyfile || die
+		echo 'GENERATE_HTML=NO' >> Doxyfile || die
+	fi
+	default
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use man; then
+		doxygen || die 'doxygen failed'
+		pushd "${S}"/doc/man > /dev/null
+		mv man3 x || die
+		mkdir man3 || die
+		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
+			mv x/${h}.h.3 man3/ || die "man ${h} not found"
+		done
+		rm -rf x || die
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use man; then
+		doman doc/man/man3/*.3
+	fi
+}
diff --git a/dev-libs/libunibreak/metadata.xml b/dev-libs/libunibreak/metadata.xml
new file mode 100644
index 000000000000..fc50d1f50d2e
--- /dev/null
+++ b/dev-libs/libunibreak/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Libunibreak is an implementation of the line breaking and word breaking algorithms
+		as described in Unicode Standard Annex 14 and Unicode Standard Annex 29. It is
+		designed to be used in a generic text renderer.
+	</longdescription>
+	<use>
+		<flag name="doc">Install html API documentation.</flag>
+		<flag name="man">Generate man pages with doxygen.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d54d60ff50b4..635e6e7271d3 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -7,8 +7,6 @@ AUX libxslt-1.1.30-simplify-python.patch 7487 BLAKE2B d4a355c285a3c62b1c96846c62
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485e7b62f1838cbe1f8eabc7617b67929640280f6f2b649ea090fcc818fd5e5e99809b960e1cd69a5df42ca73abe86839b98 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a
 DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
-EBUILD libxslt-1.1.29-r1.ebuild 3496 BLAKE2B 5f47fd3c06e97a1f17c97e1bc3b41b1b02e75a8015b2c48823999649289da82950cd6f02207e351c2ec498c389e0b702b0295fdf3267455c3b668c0950a344f9 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372
-EBUILD libxslt-1.1.30-r1.ebuild 3570 BLAKE2B 9f2220573c09f14745dc4e3d4324a2f8e65f7f8b112a0b5c2bd42239514b120ce78b19ee0c68fdbf449e260ca17b17f6f528c9b9cc15dc8ff217a77cae0dd58a SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad
-EBUILD libxslt-1.1.30-r2.ebuild 3666 BLAKE2B 4a703a0c1f65d248ab93657032c791d4f1475238da8fc73f65c10061e0dabbb4e54f1731b62d9366c2dbf780bbf888ff19b200765e2d8d6dc916133cd3f9e63b SHA512 fa572de8f213b2d87313506c000b7c75eb76973892f569f804b7fcee8c474bf22e0520ca9d6f44913ade325286759a258fe30bb429219037b9217a00d6619a23
-EBUILD libxslt-1.1.30.ebuild 3461 BLAKE2B 400aa6a6878a8d51799bbe536964bea029067a1e307eb2ad3796c33890d8abd17d79c87881fa17c3c24a4436a4e9040aaccebfcee68567f933ee706549ebee3e SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0
+EBUILD libxslt-1.1.29-r1.ebuild 3252 BLAKE2B 46ca2f9ebfda27d0795ad4f041028eac85fc456733d1e91e8bb3b57999fbad4d7e6e12b12584eaeb0db9d48c5d0bf9dc23f038d3fc8ca8e4823aa7f2beeb1b91 SHA512 719a10deac3cbb09b7b2ac407f80cabbdb44457d8308d9760a253322244a96f4f8af048037875df7da87357ae3cf00576c8dac292eef47f5c009f7bd13463c68
+EBUILD libxslt-1.1.30-r2.ebuild 3665 BLAKE2B 982b56e721411a3e5e00cfcc799deaacd76c963b4c9edde53fd586f0531acba81b03067a8f3b28adfce72ace0d854acaf89e44315dea21f8518fed0799ec20ea SHA512 35f6c61706022d4e272f502f6a8510bf1ae2beff230713cf201a635342c2fa3873524d52a4dcc3fe0c8419983a5e4b3193e48a55964025c9ca8fa71479527a5e
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
index ef56e81eb165..75eb84873318 100644
--- a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${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 ~sparc-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"
+KEYWORDS="arm64 m68k s390 sh"
 
 IUSE="crypt debug examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild
deleted file mode 100644
index 739f5be1305e..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${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 ~sparc-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="crypt debug examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
-	eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
-	# Fix xslt-config
-	# https://bugs.gentoo.org/630784
-	eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 210b219e9bb6..13a3fe82942c 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${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 ~sparc-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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="crypt debug examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/libxslt-1.1.30.ebuild b/dev-libs/libxslt/libxslt-1.1.30.ebuild
deleted file mode 100644
index c6c711bde4c3..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.30.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${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 ~sparc-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="crypt debug examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
-	eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index d54a313d179e..92bad067a99f 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -3,19 +3,13 @@ AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f
 AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
 AUX msgpack-1.4.2-cflags.patch 1438 BLAKE2B dfd16133411240eee2035d3a791d54ebbb4a4e60e8838c4dc87e5c6dbc6331126ca3f862b2a7a830d0598e54618657701bc0ffb5fdd299ad2d4c6945451c022b SHA512 84de04af80b6237595419ff78b7cb81007e1ef2e8b2e8cd85da5a8e85b0720649ec41c48e0906c908fbb088aee2ee69efdf6b89557c9e46b5dce887afee263ed
 AUX msgpack-1.4.2-static.patch 1617 BLAKE2B a9382593ea5976b3b3c68b6be2534aeffd0651938a4139789296f377bbd17dd112ba8f454d75ddbec0602d327c41915add12734068bd1543768212da387dfd1d SHA512 1e89e47094a0b2b22c32ed0685bfca06707ce89f460d01c44868708c6e3cbf38da65e9ab9940ad469a2aec59c80690fc66a3655125c4f28ccbd6b0c8c9a57352
-AUX msgpack-2.0.0-gcc7-implicit-fallthrough.patch 43138 BLAKE2B a7b274d93ad25ea0629a12993f12409c1e98310bbfa4d7c107644d556fdd3ed17fc5e4237a8b2a0d5176798a28d3c8ae21e997d105cfc475f820e8d05636a3bf SHA512 b17f7a6a7a4a463a81cc39ed8ac1c991fa50c8f865a691afdf0114377a763d70dba142d7c5584c7d9800c9c07d20d7fced902c478cc3487902459c97a4dc5818
-DIST msgpack-0.5.9.tar.gz 431625 BLAKE2B 655cab16b178c9b26893231983aa7324b2cb6321d620d9f7a298fde6413e445e1aabfb43153b95e10bcc6de7c177f0663746f74a7c992571daa14a6952b412cb SHA512 9488bf8d4aefb44ce7554cfc1e6a5fee50b774ca173a7cb8a344f421da64d51d5c60d58fd7aaf93490a33447ad2150098c164ef6a11b6b042c3b1b4a38d06435
-DIST msgpack-1.0.0.tar.gz 478108 BLAKE2B 2e624184453e1de2a183a2d90b4c642861932a60fdbee0157e85f91566d7c936575f7bef92941bf7e8ce4cf0df4c7a20ba05283979b85b4d84f3a729841b59df SHA512 afa9bf4e49fe619292e6bb59e11b0288381389d06b03778f77586ec61105a47c822eed4931a610495ac6965050266cd47c02a39095995abf702865a7b64abd88
-DIST msgpack-1.0.1.tar.gz 484598 BLAKE2B d89e71897d2d7238911f98854927e2b4b934c60cdf497b0784857ed2151a3fd4c3926a8b95cddde31cc1dcef3483c407b03322c05992a737d73584f47cd8a9d9 SHA512 da20ddafe6ec4b61b1ea9cc9e79070c5ce7805974c0fd18ed46d6dc422732b93f29c6b28cf72ada3c77770d55f00f8b17655538535f46a60252083e2afe12545
 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
 DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B c8605847aca3faa3aba2c573bc6f020fbfbc773e008c682978453ed353206cbb9d8ba4d521a11984f5bf7f9005b05f3ae33d6c48233f19b39f8b7f307031d36a SHA512 c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548
+DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B 273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0 SHA512 7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
 DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B 24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
 DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3 SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
-EBUILD msgpack-0.5.9.ebuild 700 BLAKE2B a5459b543eda5a2d1661cae753b161e18755e43ca8256955acba77375a1fa59daaab4143953e780f7ea698daac02a082a24f1b90474896824839b2453b8f158c SHA512 cad2ca980bfaef714b8fe3997ecfc77d51b5cc5a3713a85c1c2036d3ce4e8e11f9f7ac36b4b0754935c95988593fd53b3eee367d56a4f6c420a2f3db3f702229
-EBUILD msgpack-1.0.0.ebuild 1014 BLAKE2B 3a33ac7c767c379e09c2a6e963fa55ac36fb0d7f55458590882ea1ee30c41fa4ad3f7d2d2e5fe34849ccdd29ab2ba8961d64ec69ece0d94253360b4ef743d720 SHA512 74684aba0532f0b007b41687803b36819d80025b17a25e98eeb1384cc8198e4f33e73ddfecf7d0e4743a132993ccf9a8fe5a2ef7c2e9fc12b44ea9bfe5a7a5f7
-EBUILD msgpack-1.0.1.ebuild 1028 BLAKE2B 4e0f9c555c811da9b5a8d8eb51c95a7f515e41945ab51ddca3085dfc887b4dec220dba321503d949463de13e7405c985e7a29f7b243b2086c0121014bee71624 SHA512 d1ba2b5ebc89d88f6339f7cc2c374092d1fc552769dd0e50561e420ea15d3cc6fea5193c1b7c5b14d9b599c496c2bd1d5b9a12e2526b7915c3bc6a8357fa4dc0
 EBUILD msgpack-1.1.0.ebuild 1062 BLAKE2B fb23c4e6361b5f7d41dd2751cb01d5dfc9823b4fe933f1f403de2bdc90cd758de4595c972f5f64e38c43179884c9c84006fd8c2d0f30058ddbec776bcc66ce0f SHA512 614501ddab97e13b56575edb4257aaf873c22b6b1a7c238b8863e69e73f9434b7da0e35292b18afa896aef66a9c868d82ee019c15735f76f08bb5881efed4fce
 EBUILD msgpack-1.4.2.ebuild 1673 BLAKE2B 84b3a0729d92b3938a13f4fe57af33c7cd76f2c4f8c826936994b2640d7bf0e3565697fe56b9b637efc383db5969748b53bc6d7614708737a7cbc28b592c91ce SHA512 bd14e69ece353d2d4fbbae6dc1ecfa703893dd94e7863ac304beb32e556b0367ae002d3c20e17e6555a1442f944d33d58478df0b097401dd2edd2640081fc436
-EBUILD msgpack-2.0.0.ebuild 949 BLAKE2B 0a71e2541d635a61c6ee1fb075622e30b298ca8f99ad48e1dc32359a5a1107e60967de55139cf502f920debba5a6a19cc9ad63a73706ff040e13537bef3a78ef SHA512 41f4c8d4478266b48403360085eb11377f5d5f201a2dedc3b038781439237cb0e9f0212d88a2a96b66d1a1e0a3344378aba17935399446c84f2ba0c94a3ee961
+EBUILD msgpack-2.0.0.ebuild 1022 BLAKE2B dd96563fb62b8dea0430985cc43ea6483f0a551a1d0bd511f75546f01fe555ecabd5e0384342f2d6a2dcc6a52e5d78041e05ff5e168c34fbe73a57280938ab19 SHA512 c183376881b90b6f91d881b95333089877b93eec7781c5d7df7f7496605115d021c52346e7f602317976a844fb5e2eff1a6282fa13839fda05fee5ec8e91ab19
 EBUILD msgpack-2.1.1.ebuild 1672 BLAKE2B e8ed7384d232a285e77d0ba24e22d96df3d6b33d3ea037f0a75d04909ad8e834853b80e571d9f2d335d1249927f1303fa1bcd2c864865fcc7180ace906ab883a SHA512 91dfb6af964d74125dc828cf44b25f2cf3bf7755a8976d78160744278c261951c89d255445cf4e8a83fe95162b8c85364e074039bb6f83b253a045daeafb8bb4
 MISC metadata.xml 341 BLAKE2B b8566eee509987660a6f32475b04dcc59ac3d4864a9aaf4680b8d069648a8387a7fc7e2c5119b075dab419ff3c029058cb3bd89bbf91076eebeb9d456fc4990f SHA512 2f113e9ea3a53739a77440a16e5a980082d7bfac6ac8a3185e85233999324f81ad9e9a0fceb623c4f7bc103346b345979571151dd61dcf8cc1c748db13ce67fb
diff --git a/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch b/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
deleted file mode 100644
index 1562c0362687..000000000000
--- a/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
+++ /dev/null
@@ -1,1798 +0,0 @@
-diff -aurP msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb
---- msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb	2016-06-18 18:20:36.000000000 -0500
-+++ msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb	2017-08-01 17:20:57.803000361 -0500
-@@ -66,7 +66,9 @@
-             msgpack::object *ptr = o.via.array.ptr;
-             switch(size) {
-             default:<%(i).downto(0) {|j|%>
--            case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);<%}%>
-+            case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);
-+            // fallthrough
-+<%}%>
-             }
-         }
-     }
-diff -aurP msgpack-2.0.0/include/msgpack/unpack_template.h msgpack-2.0.0.new/include/msgpack/unpack_template.h
---- msgpack-2.0.0/include/msgpack/unpack_template.h	2016-05-27 21:10:28.000000000 -0500
-+++ msgpack-2.0.0.new/include/msgpack/unpack_template.h	2017-08-01 17:20:49.389000738 -0500
-@@ -248,6 +248,7 @@
- 
-             _fixed_trail_again:
-                 ++p;
-+                // fallthrough
- 
-             default:
-                 if((size_t)(pe - p) < trail) { goto _out; }
-diff -aurP msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
---- msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp	2016-06-24 21:16:43.000000000 -0500
-+++ msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp	2017-08-01 17:23:32.690993409 -0500
-@@ -67,6 +67,8 @@
-             switch(size) {
-             default:
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -105,7 +107,9 @@
-             switch(size) {
-             default:
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-             }
-         }
-     }
-@@ -147,8 +151,14 @@
-             switch(size) {
-             default:
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -193,9 +203,13 @@
-             switch(size) {
-             default:
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-             }
-         }
-     }
-@@ -243,10 +257,20 @@
-             switch(size) {
-             default:
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -297,11 +321,23 @@
-             switch(size) {
-             default:
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -355,12 +391,26 @@
-             switch(size) {
-             default:
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -417,13 +467,29 @@
-             switch(size) {
-             default:
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -483,14 +549,32 @@
-             switch(size) {
-             default:
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -553,15 +637,35 @@
-             switch(size) {
-             default:
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -627,16 +731,38 @@
-             switch(size) {
-             default:
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -705,17 +831,41 @@
-             switch(size) {
-             default:
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -787,18 +937,44 @@
-             switch(size) {
-             default:
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -873,19 +1049,47 @@
-             switch(size) {
-             default:
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -963,20 +1167,50 @@
-             switch(size) {
-             default:
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1057,21 +1291,53 @@
-             switch(size) {
-             default:
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1155,22 +1421,56 @@
-             switch(size) {
-             default:
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1257,23 +1557,59 @@
-             switch(size) {
-             default:
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1363,24 +1699,62 @@
-             switch(size) {
-             default:
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1473,25 +1847,65 @@
-             switch(size) {
-             default:
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1587,26 +2001,68 @@
-             switch(size) {
-             default:
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1705,27 +2161,71 @@
-             switch(size) {
-             default:
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1827,28 +2327,74 @@
-             switch(size) {
-             default:
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -1953,29 +2499,77 @@
-             switch(size) {
-             default:
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2083,30 +2677,80 @@
-             switch(size) {
-             default:
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2217,31 +2861,83 @@
-             switch(size) {
-             default:
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2355,32 +3051,86 @@
-             switch(size) {
-             default:
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2497,33 +3247,89 @@
-             switch(size) {
-             default:
-             case 28: ptr[27].convert(a27);
-+            // fallthrough
-+
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2643,34 +3449,92 @@
-             switch(size) {
-             default:
-             case 29: ptr[28].convert(a28);
-+            // fallthrough
-+
-             case 28: ptr[27].convert(a27);
-+            // fallthrough
-+
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2793,35 +3657,95 @@
-             switch(size) {
-             default:
-             case 30: ptr[29].convert(a29);
-+            // fallthrough
-+
-             case 29: ptr[28].convert(a28);
-+            // fallthrough
-+
-             case 28: ptr[27].convert(a27);
-+            // fallthrough
-+
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -2947,36 +3871,98 @@
-             switch(size) {
-             default:
-             case 31: ptr[30].convert(a30);
-+            // fallthrough
-+
-             case 30: ptr[29].convert(a29);
-+            // fallthrough
-+
-             case 29: ptr[28].convert(a28);
-+            // fallthrough
-+
-             case 28: ptr[27].convert(a27);
-+            // fallthrough
-+
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
-@@ -3105,37 +4091,101 @@
-             switch(size) {
-             default:
-             case 32: ptr[31].convert(a31);
-+            // fallthrough
-+
-             case 31: ptr[30].convert(a30);
-+            // fallthrough
-+
-             case 30: ptr[29].convert(a29);
-+            // fallthrough
-+
-             case 29: ptr[28].convert(a28);
-+            // fallthrough
-+
-             case 28: ptr[27].convert(a27);
-+            // fallthrough
-+
-             case 27: ptr[26].convert(a26);
-+            // fallthrough
-+
-             case 26: ptr[25].convert(a25);
-+            // fallthrough
-+
-             case 25: ptr[24].convert(a24);
-+            // fallthrough
-+
-             case 24: ptr[23].convert(a23);
-+            // fallthrough
-+
-             case 23: ptr[22].convert(a22);
-+            // fallthrough
-+
-             case 22: ptr[21].convert(a21);
-+            // fallthrough
-+
-             case 21: ptr[20].convert(a20);
-+            // fallthrough
-+
-             case 20: ptr[19].convert(a19);
-+            // fallthrough
-+
-             case 19: ptr[18].convert(a18);
-+            // fallthrough
-+
-             case 18: ptr[17].convert(a17);
-+            // fallthrough
-+
-             case 17: ptr[16].convert(a16);
-+            // fallthrough
-+
-             case 16: ptr[15].convert(a15);
-+            // fallthrough
-+
-             case 15: ptr[14].convert(a14);
-+            // fallthrough
-+
-             case 14: ptr[13].convert(a13);
-+            // fallthrough
-+
-             case 13: ptr[12].convert(a12);
-+            // fallthrough
-+
-             case 12: ptr[11].convert(a11);
-+            // fallthrough
-+
-             case 11: ptr[10].convert(a10);
-+            // fallthrough
-+
-             case 10: ptr[9].convert(a9);
-+            // fallthrough
-+
-             case 9: ptr[8].convert(a8);
-+            // fallthrough
-+
-             case 8: ptr[7].convert(a7);
-+            // fallthrough
-+
-             case 7: ptr[6].convert(a6);
-+            // fallthrough
-+
-             case 6: ptr[5].convert(a5);
-+            // fallthrough
-+
-             case 5: ptr[4].convert(a4);
-+            // fallthrough
-+
-             case 4: ptr[3].convert(a3);
-+            // fallthrough
-+
-             case 3: ptr[2].convert(a2);
-+            // fallthrough
-+
-             case 2: ptr[1].convert(a1);
-+            // fallthrough
-+
-             case 1: ptr[0].convert(a0);
-+            // fallthrough
-+
-             }
-         }
-     }
diff --git a/dev-libs/msgpack/msgpack-0.5.9.ebuild b/dev-libs/msgpack/msgpack-0.5.9.ebuild
deleted file mode 100644
index e78a1cac8492..000000000000
--- a/dev-libs/msgpack/msgpack-0.5.9.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"
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	sed -i 's/-O3 //' configure.in || die
-	autotools-multilib_src_prepare
-}
diff --git a/dev-libs/msgpack/msgpack-1.0.0.ebuild b/dev-libs/msgpack/msgpack-1.0.0.ebuild
deleted file mode 100644
index 0b5bdcd69b1e..000000000000
--- a/dev-libs/msgpack/msgpack-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cxx static-libs test"
-
-DEPEND="
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-static.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
-		$(cmake-utils_use static-libs MSGPACK_STATIC)
-		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/msgpack/msgpack-1.0.1.ebuild b/dev-libs/msgpack/msgpack-1.0.1.ebuild
deleted file mode 100644
index e9316807c0c3..000000000000
--- a/dev-libs/msgpack/msgpack-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cxx static-libs test"
-
-DEPEND="
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.0.0-static.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
-		$(cmake-utils_use static-libs MSGPACK_STATIC)
-		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/msgpack/msgpack-2.0.0.ebuild b/dev-libs/msgpack/msgpack-2.0.0.ebuild
index 334b5e5f0eec..11a00b6a7a3e 100644
--- a/dev-libs/msgpack/msgpack-2.0.0.ebuild
+++ b/dev-libs/msgpack/msgpack-2.0.0.ebuild
@@ -9,7 +9,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	SRC_URI="
+	https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~monsieurp/dist/${P}-patchset.tar.bz2"
+
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -30,7 +33,7 @@ DEPEND="
 DOCS=( README.md )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-gcc7-implicit-fallthrough.patch
+	"${WORKDIR}"/patchset/${PN}-2.0.0-gcc7-implicit-fallthrough.patch
 )
 
 src_configure() {
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 865c9962b42f..64bc565e659b 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,4 +1,6 @@
 AUX nettle-3.3-ecc-add-eh.patch 977 BLAKE2B c33cfc4c8903d92a98ef853f72772f7ad2e5a48c0405647169bbc8fdda2d439f3ca373c6d48b536b72426c07a3b7bec10c0dad5edf189b750cf134d9023bc50a SHA512 8a5e991fa87c8e12ff812d570bc3ff6e397cc95cd2011a0dadda15371efc7215a8df067a427e62f707e1bb19078595230fe45f1ec85a2f8c8e09bf95ddc82dc8
 DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
+DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
 EBUILD nettle-3.3-r2.ebuild 1908 BLAKE2B 5f35cb25c79edce05cee9c19a413398f8d02c43a470bad9d496a503f49bf3b9f289d7566eafb0e10649af5ed1d91ac19242170f711b26b767a7c7302d9143450 SHA512 f220191ea33f04f8bc100d06f9c324dd6c051d17a6bfd8dabe25a3ed929441976f7911a3800f7eb3df33a8dcc4a3ee9446f5316a8c4c02e733f38171993dc5de
+EBUILD nettle-3.4.ebuild 1904 BLAKE2B 3b43930b5715ec9d3e9742711c511386026d238a802ab0ab51c8f79388d42b94ad04d72a288ce60751ca4b3e045c7f03010dd9cc9555715412f019de56564ade SHA512 67ecae77d1ea9e351d61a46b5a502e3e54e8c14f63f8c8d50f23eec44829720436287e6c857ee864f3b990479fd977ea16af34c06a0490f8233f18b07ba525f8
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
new file mode 100644
index 000000000000..8de7ef006fe4
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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="doc +gmp neon static-libs test cpu_flags_x86_aes"
+
+DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/nettle-stdint.h
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+S="${WORKDIR}/${PN}-3.4"
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-e 's/solaris\*)/sunldsolaris*)/' \
+		-i configure.ac || die
+
+	# conditionally build tests and examples required by tests
+	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-openssl bug #427526
+	ECONF_SOURCE="${S}" econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-openssl \
+		--disable-fat \
+		$(use_enable gmp public-key) \
+		$(use_enable static-libs static) \
+		$(tc-is-static-only && echo --disable-shared) \
+		$(use_enable doc documentation) \
+		$(use_enable neon arm-neon) \
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 34a6571dba3d..69f96e757fb7 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -11,7 +11,7 @@ DIST onig-5.9.5.tar.gz 587874 BLAKE2B c3d691757d920c3690f6f8b4f0b3c7fac1fea0127d
 DIST onig-5.9.6_p1.tar.gz 605920 BLAKE2B 9f5ecd29d0dc583d424866e5a37fe92ae4c987408d764f840f1f765e11e469f9f9db0169e670221d91ffeecd8ad4337f10d7f9c8559d3dd61f5edf82c244ce24 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48
 DIST onig-6.4.0.tar.gz 900425 BLAKE2B c2c76ea0bd1e47354169e386a495b8754da604be0dbcbbe43e7889e1c37f84ddf032b0874bdf3711221b60e717c1f1bd36edb35903102f0be55c323f81d42ec9 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa
 DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
-EBUILD oniguruma-5.9.5.ebuild 1129 BLAKE2B 7c78358a30c0ebf440ca0f63460c194efb515ef68b36d9a535be2e25124197330ecf35ebd4fd936dab79661ec7fe6bd1c4583577b921e9665c4db229b7aa9112 SHA512 0889defa5f3a79337e4bd353f49d19a88870fc4657acddb88b47cc49bd2d54e64e7a10afb393a8e2b93cf196d7ff140d9117c61c7ba0551d0903bcd13703bb6b
+EBUILD oniguruma-5.9.5.ebuild 1087 BLAKE2B c5f088a0823653d0a445f409394c4d01c5de84978f107941736cc1acef0073c059c7d8bdfb8002187c6f28cc1d979207db60959cdb699becfae5f3504251a5c9 SHA512 f805ce558c5413dcf06800a0321335278ff089ad1e2e16ad57ea117b893a81e398544dec22058b1021f897274aa9cc084e2bb872a02de6c406fd68a7507e0b2e
 EBUILD oniguruma-5.9.6_p1-r1.ebuild 1379 BLAKE2B 0a497960069fb276d91eee2b2edb1e4ad5e6ff33b6b684e986d0106e2fc26b987fbcc74c830b3dcab4d0a80e54dc7714d026e556d6c35ff0227238d9490082b2 SHA512 6817357097456c702b5488cee375135e54bed44360a2edf0dbad9b2712c8c824b4f5433b73cfc8dcf460075fd95a6a396916a79032de4a69d633c856bd52fbea
 EBUILD oniguruma-6.4.0.ebuild 1167 BLAKE2B 7adb13bd230209a8f72a04df6399ba47a1664f980b1119cd1fc78b1531b1642eeca3e141a170294bddd70a5f9342166cd50b49f8d3c57ed431d70af970629aef SHA512 684194ee689ad9fb79fb2c933f8eb64e8dfa20c79da0c76907cc6b913391f2e4bbd42793a4d11204c66d87651c349f71c75c4169f2ad87808b9f43b6a14b63c1
 EBUILD oniguruma-6.6.1.ebuild 1125 BLAKE2B 550452a672bfd84186873eb1bc7ca0b4fd7930a9f9e7d48ac2e686f4e64cfc66dd68d3d88cb96c2060436ebe2fe4bf7a856475eaf045bfa18894a7a61ae0bdda SHA512 2f68311e1ba9a3999ec4cb0a026fe31afc3532678353eb34e6060b263533af3dc2674becca85c91b9f9919b459354da42f9a7722405caba4b5c32453364d816a
diff --git a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild b/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
index 76fc996f4d9d..2127baf35212 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
@@ -10,8 +10,8 @@ inherit eutils autotools-multilib
 MY_P=onig-${PV}
 
 DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma"
-SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 81301670e265..b996916b1114 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -32,6 +32,6 @@ EBUILD openssl-1.0.2k.ebuild 8334 BLAKE2B c79e9dc5d3f456cce76d99b388d7920083c7cb
 EBUILD openssl-1.0.2l-r1.ebuild 9930 BLAKE2B 724272b844780bc005bc0f202519adf01e2f2e39412fe4e8c10b4e07e897bae486e7420abd89abfd03dae7c303d238ca9d4ca1ea36be43792fa5711ff06c34b2 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23
 EBUILD openssl-1.0.2l.ebuild 8338 BLAKE2B 86556289e8c1189d2c552623a96f8b14c4f5f0b5687951d64f04ba58463645c3395ffbbec158d378fd1589af2337fa4552368d34543280244a10dcea01b50492 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d
 EBUILD openssl-1.0.2m.ebuild 8339 BLAKE2B 5f38ad7c7fbf5ed897deea4594b2131bcad8853cd7692274f8758236aedfc9da3d271a6003762d6673b2afa3e0a73d6a14783abd6bb140ff2e914549b5485532 SHA512 b7541775edb2be3294669f3fcb42f266ae781081f22b07ea9bed465f6f3a654e0d4bddcf5ad17d075f0e2281b0a1a18e1e8dbb834b5039f9b219e5c650d123bf
-EBUILD openssl-1.0.2n.ebuild 8044 BLAKE2B 3a3057a10e20534461bc4162e21d5d0f2a2db343a1331e45e70d9c4aa78d37042b267efa9884918133d6104a1cbc23e6363d485683bf9697931504b32173b1a3 SHA512 745e420f1d315e6d1a5bcd0e58409f0d4a9d449f23e01e90e78e48838fc65bb3ebd239cfa350a4bebd5b897625c2513de86ca29f26961b56c800aad2d8f26d58
+EBUILD openssl-1.0.2n.ebuild 8037 BLAKE2B d1f608d0bc6a27dd80a56238562eb87c146fa1e6deb186aa29a909a0affe343508f99cd87802a2631c48eea31a13bdf6df5724c20faa4df5427f18eb576f1cb9 SHA512 dcc181406923ed773eb05116422d71b1ba6d8ba08746046b3e85351e210924a1eee5dd325ed8465466bb2319c05428587eb6c9b5f3a32439f77b932b5f74daf0
 EBUILD openssl-1.1.0g-r2.ebuild 9045 BLAKE2B 7693bbe13e6bc635920e260895380ba5ddb163351860ae7f69ae3cb20076f1b0faf61b1fbc04f439281609f35a21603156ee646898b2b006e0ed668d08ac7232 SHA512 c32902a4f49648e1fc118586abfe38defddff8418f338d3d8334cd45b9a0d605fe2450af5fe4b5dbac648776c41e79dfa589f666ee2daa9dd2474a30b7290c9b
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index d717370f8d56..a88355e47eff 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"