gentoo resync : 23.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-23 07:00:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-23 07:00:28 +0100
commit: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree: 5a4ac448a3b288b731c24d947e0ce52df3cab07b /dev-libs
parent: 8187a741807f3e9a9e26304973cf18087dcf2560 (diff)
111 files changed, 897 insertions, 1259 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 36d5d73646a1..7aed1fafdb8e 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 cd92aa940874..56d93b6d497b 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,3 +1,3 @@
 DIST amdgpu-pro-17.50-511655.tar.xz 547875548 BLAKE2B c3e396d9846ca15297ecbfd8ff1c9ca3aae6352080f280dc13f2ad4d32da7b84a6d069fd4b64c6e4d9814459cc5cca1ab838295a83ede953a9df6cdcd1387f91 SHA512 d4d995eb596f94656d2fb6e43a2db29bcbfe28e09f75e19e23d1d446de899dbb6e4597ef833955a8b1788055fa848bc14e45a32c820ed8e97c667a784cf816cc
-EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2318 BLAKE2B 3e10a4c7175cee812461c34520ccd0c387e4982534d0d87596564662cf80677603c7cc7c472f5bf6d3cdb400d41a425c5cc53afc0fc8d68cbc1cba9353beb0a3 SHA512 17ac8d30044a2ba5c875b7ff828a61e16a303074f4fc2f84ea0b844138dcbb4fce210daf9f0b40bbded180f4b3e2ef8302a4b34289e8ff82a9c98fc2b7147fd9
+EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2308 BLAKE2B d0368da6709472e95c19b427bc6bca553c9569994d3ccf58d98e2fecff9fdc1a65a67c91ee6873631e4ebf539232500b433789590c6af547ca12fe42913b4625 SHA512 520e304dc4cd32745db6f7d9ef6286c45a496bbfc60281cf1dc8beedf0acfd078ba72d2cabaa5eb4132d93df74f29b2ae160d0c4bdbc78945c24e33561e1af12
 MISC metadata.xml 656 BLAKE2B 5af3c00c551e7fd2b0de6d8c24421a58986ef20c24b7f2799a428dc7e07e2da4841ce93ade51edae33c0ba79dc55ed6df3452c0b5a610499e7e79e09c31b22de SHA512 5f6933f6ff6dd222a54e4c3609b888182ffd136bb0b58c905624cc9b404091b4e46917cf20d4d24585fa3ed710fb9881f3b6437e015371743d23d07fab488fb0
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
index e822eb2d141e..19744b81c4cd 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit unpacker eapi7-ver
+inherit unpacker
 
 SUPER_PN='amdgpu-pro'
 MY_PV=$(ver_rs 2 '-')
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 80b7b06cff49..8ce2286db69e 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7749 BLAKE2B c37e7ba228f4cf3777a0ff769f92b265f59e0029417239360c801bb15a146beb05e78d1b94f3b781295515321423752daf36d55fb0d6858286198f19520ec9bb SHA512 108c1e6747841f1344af3e2bae387a8b55479883f9ecccad4a272f2ad33c7b4bc543f3afeabbf8defec75f07d58d07ecb8e6b7734205b4170d42842a3adfd780
-EBUILD cyrus-sasl-2.1.26-r11.ebuild 8399 BLAKE2B 24d061e613baea0c9dca4e6efd424adf3046700fb3b7c49775817afa65c597a4ca775ef1b348a7de5b082a0445b6dc43f8fa91d8349d91ad6330155533a4acfc SHA512 1de7c68f7f46de0729825c5818170a1824529c045abfb34785ad9a9496cac8cbb58f7ed607818900cd2bcd8175d91f6fd99c046daa2dddc017dc6622a252a487
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7658 BLAKE2B a223be2a7e75e6609bda11740115cad087732b8fe6e4992ec80a5c4ebe576c4d6d5d3965bd525bd8bc2df4e2e226d4f8835a2d40cd44846cad1e802c8925f875 SHA512 b33c28fd73a673fbab30fa2281226d889b855e7562e666ce3ed2f98662999b60abaa496e1f44b5d28c524f5955050e8489aaca60843e82c7ef26eddebd976d8c
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7751 BLAKE2B 8af27fd54e6b9a3418cd4929f5993cfa6e79e6c08c743161ab23e2859d950dad6b25877d91041f8ef4612fd7aaba48e12ed5bd84f7b96b77dbc79603a4cee26b SHA512 e98e9ba6c55c0767b3d95fc34cf5d7193f3b7a82ec1d256aa26392a0036c532128a99e114b88d15af87b56c88cc8831be6540fa39d8f7f78a7f32e4495d5f201
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8401 BLAKE2B 23750f3f5b6cf63dd1c6e80dc8591ea175c76d4abdf121fcdafab30cae631ae72e10cffb2769b2a8d7df8669d398061abd7a26c0b3d492cf9822b848ece30429 SHA512 ba488a57851285de62c53bb74bc61231660d924783cb354ffbddfa62657f6f8d3b3a3a4d357bd46ed694c1fc006ad9b189bb9456d75cfd2427f640811e6f1c0d
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7660 BLAKE2B 3a1594ef7878d89065aaabefc5928a9ad4489ccb2812de4adc9fe1979d6861238e26a32d523c6bc63c32a1b83627797416df74d857156425ac8d8aa544dcf1c4 SHA512 c1db771512006137faa09716fd67ac04bf984870a0aca83e393b577d6a6c4b4530796b53c8d5bc91a0bd6963226953f2d2e80dfb4039016d60554e904d57c15e
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 33e0266d5480..d37c40eafd29 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -20,7 +20,7 @@ srp ssl static-libs urandom"
 DEPEND="net-mail/mailbase
 	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	mysql? ( virtual/mysql )
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index ed27f67acc27..40f3d8655566 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	net-mail/mailbase
 	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	mysql? ( virtual/mysql )
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
index a4e9d78047f1..1179bd79125b 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -20,7 +20,7 @@ srp ssl static-libs urandom"
 DEPEND="net-mail/mailbase
 	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	mysql? ( virtual/mysql )
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 547c989b3dfe..c10d9310be1d 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX double-conversion-2.0.1-scons.patch 350 BLAKE2B 870bb737ed41db86f438743cbb0b
 DIST double-conversion-2.0.1.tar.gz 7014148 BLAKE2B df8df63f601076bd827ef95b2a2cde8bec6a85fb6ee81a879556481a168c2a101b3ca130ed6f45ca515281ea139e4a607a03934b05fc0a2fe5bacdf56033f2b3 SHA512 a4773dc95e9267d8426dda976586aa1ba968ead28b118caae9b1b7c123d1eea4aba5b588fde9a109a99a068a79a3a2426f12d6caadea8c548d4250e56eff33a4
 DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
 EBUILD double-conversion-2.0.1.ebuild 1053 BLAKE2B 4ba64d131e5b5f954ba588ffdc1ae6bb6e51165d9a8d32776bb81be49cd31b33ab790bca1c0dd8f587f701bd43033fb0ad91f4efa86bca8b091e2c6dd1aa3e7e SHA512 dd9bbe6cfd4d816dd6595a76cbf223eecbd8122966bdca2050f3835610fead7ace07c478f1fbd27c291e26f1bea80898eac7f6ebfcf02730d7b896109905fb7d
-EBUILD double-conversion-3.0.0.ebuild 619 BLAKE2B 299f801cde5b536e5b18890b5607d3c990f2bc1c1df54786df8d1242be51e148421bfad2964aa7565d4aab39de1705e832624e75651e58e86536ab5d995c82a6 SHA512 8ad10bd00e0f7ead124436fe8db77840c77f23c729cb71183f05392958cf8023178518c439aa189c4c7d4620058af3a53bb7522f4d1e9c6b151c5145fa696cd9
+EBUILD double-conversion-3.0.0.ebuild 618 BLAKE2B 94271512713f78ccc9dd3a46d912985bd6f70674487616eeedfab1afa839c896005eb9a5a94f30501a14bb0e0faf7a957c62418570951ebd21856a0cfe608593 SHA512 d2c41c7fe9d4db25cbf60ba203fcbc24c3359ed9cb2e31ea662b7eb7988458d5a67f82b3d61fdc68f3b51b76894ae07869360f492a88ede91fc9c19fc472ee91
 MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0.ebuild b/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
index 8c84f53934e6..d7e52cc7fc70 100644
--- a/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 src_configure() {
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 18abaa224db3..dc75c789b74f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,6 +3,6 @@ DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
-EBUILD efl-1.18.4.ebuild 7236 BLAKE2B 2da08d09505f7b2181b942f8c36b7ebb4b228b1634da871e3bd091ace2beb68e824361c163b474cf47ad21ff4166b3195d7b0ae592250deb6a95b04a739590f4 SHA512 966bf8069f1c7e2a87e21973a877c3ccaa530a18b2f9f6f772245e988fd18c34bae7dd37648299a3b87344b1bf6da4b7e6270d44b4d90a00bbe334e0d83a21cc
-EBUILD efl-1.20.7.ebuild 8726 BLAKE2B 340202316bf86613902028e84626e9c9973624c5986649e2a2e2f705278f75b2c418d6560d09ff22997aad29a05fedd1e82d044dfbd4af13975f19abb918a2cf SHA512 8096f235e961c0fab334499795b04634757adcf289060cff1ac49dde4464788b5a73646d922f2cb37799aa0a5b1fb3b9bebf59f1fa108371d3cb20bd8ee9252b
+EBUILD efl-1.18.4.ebuild 7235 BLAKE2B 9d4da7da33ec8d7ee4431d93cd73c176a2424fa2f3e107fe9096aa1b8693929be195d98ee96259e7a4a9e125824a0f4261b7d6dd71c15de818b85ca4234b90a2 SHA512 51b4d39dfdb1222272ada369dbea3b38df7f79bb62b39984341fa3fb22937564656f3e413c00f62e399ede6b1f813d5c477d0ae21c2d27819a9fa6372a83c73a
+EBUILD efl-1.20.7.ebuild 8732 BLAKE2B a9d1650012beaabce5e423b9d15ac362e9298f30ca67033950f1fd2fcf0ea233ac7c1f923c3f7ecefa04cffe52d4e4bc4017e6ec68049c7588c51f2436dee513 SHA512 befffaca4129e3ddc6a4db04efa0c58a04eef1343f656b22541c0423fffaa7f9e63fd62d1d53171c5cb874ae0494de77a1f0d4c95307dfe1dc8c5d6b1af1d791
 MISC metadata.xml 2091 BLAKE2B 3c97d0f22ba6ae0a6aa2a75b60590414da3a25f955990be2cec07991f779a3e63034f19e8b826fa7632fb546162d8d4619413882e379dea46ee6d45bb42e6ceb SHA512 1ebe31d782aa8fd4eb8e21f2bdc030d1d88d2ceab85f3b3713a5da51d55f6342473fbbd41ee7b99d82b1d67ddabe52a1003e02d850c71645eb370d26c08b7556
diff --git a/dev-libs/efl/efl-1.18.4.ebuild b/dev-libs/efl/efl-1.18.4.ebuild
index 6047e25ff9fd..3e76a6359ddc 100644
--- a/dev-libs/efl/efl-1.18.4.ebuild
+++ b/dev-libs/efl/efl-1.18.4.ebuild
@@ -13,7 +13,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
 	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
 else
 	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment pax-utils
diff --git a/dev-libs/efl/efl-1.20.7.ebuild b/dev-libs/efl/efl-1.20.7.ebuild
index 9641b4080cd7..248449f62f20 100644
--- a/dev-libs/efl/efl-1.20.7.ebuild
+++ b/dev-libs/efl/efl-1.20.7.ebuild
@@ -13,7 +13,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
 	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
 else
 	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment gnome2-utils pax-utils xdg-utils
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index b56bbc6047da..6f386552e667 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,8 +2,10 @@ 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
 DIST elfutils-0.171.tar.bz2 8654558 BLAKE2B 709b5a4090867ec536563ed31178f7fb820f6b0ca8fb7c379b9081fa0d0027c8c2904cf17e9ee36245dd1fea8d2853ee3e7af457167e007fb7b08eec2e921a30 SHA512 777be2d63ca9b11440bf358a33428d9ca974e2612a880934156c9f7194af596ed627c1ed2d48dbd47a3761c94913b8f39565f9dcb6b62c92bf229f04c96d5ee3
+DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce SHA512 b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
 EBUILD elfutils-0.169-r1.ebuild 1813 BLAKE2B 3050d7c94ab236306795626353c96b1c28fb060a3fbf1df64be0a32c62984e7108c560bce4fd7bcc09840de99008e0f3ac7e705c452b5e02802e217b64265128 SHA512 4bebf168549fc83432752f167445814ee78ae0b3f583f8f2ad9a30ec8f111c7bc8658204038ddb61cb2c924686f92376dbfb76180a922b008048b38d6bb53f7d
 EBUILD elfutils-0.170-r1.ebuild 1801 BLAKE2B d4052f7c28551fe5fdb97bf6dd59b72dfdf399a928fb218ba644c45131dbd18e3ab022e6d1b895ddbc13b65e0477813ce9aa8193aca88b4496bff9efc066cbe1 SHA512 c7ca487e67420bbcc9d0ac30a8338c0088f9b49ad23344dd7e0054596b20b1808ce123e1868d807afc87529ccc710f1a8fe1096461445fcbb77aa5d25ba3a4cf
 EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8
 EBUILD elfutils-0.171.ebuild 1814 BLAKE2B 97d472102a5d75ab527ee84e92f13a2bdeea10ee7542a0ac09eee94673deb854af5b2c99d3be08b3372c3dcaaf66b3b81dc21f284eb840170f802dd401cbd47b SHA512 0f11ae704495140b4ba028c8e6aa6517f013278355a6db9334d66d812cb0e8acf148a94daacd8b79a6bcd4001f629c6b260fe5af95a5d72cd4165957f8d40243
+EBUILD elfutils-0.172.ebuild 1824 BLAKE2B 2766930b57ff25716ad60dca35aa71494ea41732f1be9b342d8217748d348c4db4256df3b859ab6bfa23e14eba0aa5d3e7c56f717b8da4c0f0b2ad77073134ee SHA512 bf79df6347d8d34f1020753adef3359add34c2dd3c16384f2091853e2dc691e2fe0aeacfe2f5f717a3449b18b9d1d914506b5cb3d1cf159527d973de0bdf9445
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.172.ebuild b/dev-libs/elfutils/elfutils-0.172.ebuild
new file mode 100644
index 000000000000..12da334a1b00
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.172.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+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"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 165de689d976..b356c7dc2b52 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1293 BLAKE2B 060f824d1524cd9813215f17729c3ab033efe0eb41a15789d8358c3441796fb40b5de92a2b148df7922f40aba420639f252cdbb0626e7f3c685d13154c88d420 SHA512 f836361ffcbf97004ef7f534e81f9fe79d2ff0d5831ed4cd91c6a2ffa6b6d596e51eeb51c4ecd08a943170cd23039ae4545fb65dd3d8e686fe5d20a49589d8e6
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1298 BLAKE2B 50bc22b594a27a37cd122719b574634029eb17050c5f9e3215677de8f2f64b348a4fa53dacbe24e211b84c6a20d8f912c0f961d2e483fdfa920143d45bc061a5 SHA512 a4417f284421ccadbbb92a339fdd76fb5d30b7986308ea9516d1bae16132807513bf19ea81f0241f069a13efdeb0cf81a20540902847864338f96a69eeff4f1b
 MISC metadata.xml 322 BLAKE2B af18d8a4fc584c7512d4967123df7e5785e1efde8475c8d73277a244b67c00e0b80b30ddc8de15844beedbb454aeda583bb6021c8d3e2c681ffd529fbd9dd01f SHA512 d4d683173a6acb775871efc762823f186867e446c931714e8b04475a7982845e2d8152d871f123a1c8b08e7af307c7d1453c0309c26f7e6da131f120e1c29c7b
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 088ad6e3c474..3e769cb26ae1 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 DEPEND=""
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index fa48ebc3aeed..91ba27807cde 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,24 +1,11 @@
-AUX 6.0.0a/gmp-6.0.0a-arm-thumb.diff 829 BLAKE2B 5864427011bffd6fd67763b3086dd8462c6661d18ee11576a71b37569a5ad40e92dc2e29a99e77c5c2b7fce53a5e6248ea541b15448b8521c50f6fccd69b9fe2 SHA512 17e4daff2ebfccf220fb147e7e9adac19ea427614b2195b51a46d6590941aa34d0c02769c72c410dda733c71cc8453174024fd11d5c9e86f598e3095214b09b1
-AUX 6.0.0a/ppc64-build.diff 668 BLAKE2B ad3be77e3ed21d5b1ff21814cb6326d7594e4d13dbf9c95452ec2f85ef9204ce1716a7d3b96625ab338d8765eabdc6f2d94ed3e8fea781a1a4afbb522f986406 SHA512 ab37e9205da14479b852b932285d16cce02d4c266a3b431d1ad65feabd0e36bdd71da762ee15a783576c6551c080fc212ca27146fb8b8d9c7c77df6aacb7e85e
 AUX gmp-4.1.4-noexecstack.patch 474 BLAKE2B 9b2e6835a9a3b4c23adc3b9569a507d43429b5a8c1e4798717438c84675571bac90ec8202b90b526e46a50a69db1f0b9afb83333d9a69de4397c6c97e70485f3 SHA512 74b8b68061a1a5ac0f8b163974834465e86e930884e1a9cd15c4c948fdae95ffdcbb6e0210d56df6d0dcf1ccbe13dbdfe45552e645c3fdea6454747731b63bc8
 AUX gmp-4.2.1-s390.diff 1848 BLAKE2B 9c7a36b5b203dd5c66084d42bbfb0800269a9c2f534632fb14d94c7561af7eab978c18d66b9a3997f65bf6efa7d800cd673a9b0c329d7f15bd7c646b9fc8efe8 SHA512 ab13186cfdb2a217edb5bd77379d68442685319ec3ca5b9ccadd67a68356f56881ea5feb7dbd40821d6587553d46b63b19ba454a9e3ede27baf72a6857169c44
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
-AUX gmp-6.1.0-tune-printf.patch 1339 BLAKE2B 679ed2bf85e868898a64b79df13ac7ad0a43cd305215c0e8dbcb82d54784334da444d1513707a051a51a9724f2a51300cba8029aa9cb041e922650c65e17fe17 SHA512 da9dc4f6c63d5cc4b80899acacb23d7060b6042aa26dd80f5d5d73768a129360cb75efd6d2695c22958800776ba336b4c4bedd0839d4621ac3cea7ce0047ea07
-AUX gmp-6.1.0-udiv.patch 1737 BLAKE2B 4cedd0d06bbceba3bee7317d7353affd9f758b4fa0ef8d47909c902582bddf65fbdc4f1808c94898d9632ed1ec9788ce349ca69226107eadc01cd4c7d6ee4cfb SHA512 977966e5b3c21550c6bb148b3f0717e7a6cd86cfb0211a8ea1275c4b9368aa3275c9d71a5d4146da0ddd131570745e5037872c918f0b267c424e729227be432a
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
 DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdeabaca09f7971560fb0fd504ae8e405256913acbef1434146868885c98068ff59efec92c92fdb73b853cf9396 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
-DIST gmp-6.0.0a.tar.xz 1904112 BLAKE2B eabe9976a7c89e94d9b6aad3c4251f7cbad0f9b8ec597d270cf39d9abbc68207e47604e0ecc1840dbeefb3bd22312cd5451f80046d5a8c577781d2a264b40719 SHA512 50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816
-DIST gmp-6.1.0.tar.xz 1950316 BLAKE2B 81303b8c4dc02de202502d7d1e2df5a538ab2ea9bc36b0a0a8c8d030250bf26471e57ecee26144d0758366a8cec8b413dce88e7e1c89f32c7d1f9add1d833d7d SHA512 3647f07914e6c01b28d94f2d9783e50b0ca9f742a694f56d5759e79a057143ded578b71707ff909c6b0f5710862974606461608e73b33af3114b5338670d8630
-DIST gmp-6.1.1.tar.xz 1943164 BLAKE2B 0cc4d8959f03d8f00be4d393b47936f0a056dd2d88c25a4c705779a1175a39028dc987352186d61ebf2a361cdc67a550ec3fb9965708a35dc029b98a3160e96d SHA512 6ead5fdf15891e0c47b094351497a052cc691973f09c60a8322546418eb615bddb180a93fd7846b88b096b5644cb9d375eab2a4a07af64399f5159eccf3edee2
 DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604 SHA512 9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
-DIST gmp-man-6.0.0a.pdf 1187496 BLAKE2B 6d10b139cc9d54a5c5a3264393623dc0d8efa561e0040ceec4ec79abe42172d0244e2917a4399268395defa06739fb04c0b2fc005cb833eede07c34fbffbea23 SHA512 528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2
-DIST gmp-man-6.1.0.pdf 825716 BLAKE2B aec5a26abaae4451aad621ee8594f67caf705e6fd730b225ee25dbdd7f4f9fb2447f9234c8763b6f8b2cbd9522b9e1bd6c0c486cf6209bd119884d39178863c1 SHA512 cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0
-DIST gmp-man-6.1.1.pdf 825669 BLAKE2B c33e5c77069a39f96d1fb27885adf4851ef4bff806f9709f9cc75161d0c00bfe0cda907471e908e9db76ab4c3d5fdcf42e42ef6da93b906d57ab469eecfd5cb3 SHA512 18e6aca87f5ff8848f82456d86233f127328bfbe309e67902c8dd6f25228db344bd3e6cc3a55e48f2c3f19d0a57358bc4ada7cd623799b273030a5119fb1257b
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
 EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
-EBUILD gmp-6.0.0a.ebuild 2889 BLAKE2B 59d9bd1fa8c98fb58207d11eb691ef8da083f171eb74b1e6a1bafab1f2d59d304609b9f6fe8fd969a2e04ed9757b108cbc4b41aaa1d37f042d69e09d75fc0596 SHA512 a6930908c70e09da57ab7dc221fe23109293d0564a2e40b54c6b17dc9d5b9523a340626181911eaaa591eb964efb62435b6d93a80dcc261829d74de98e1a2b63
-EBUILD gmp-6.1.0.ebuild 3015 BLAKE2B 029305d00fb61c5867f5b5298b3e3e18ae03243e6498f3ffaf2e303e8b23b6311e7f32800ab20daaccbaf0d438b94a85b2e60ee94c3a641f1894032f69d04f79 SHA512 52ce1f6b7c2e826f0825cecb1b557768051b6a9d1f403b530732cb24924422bcc596937bee22475bda86518d12d3e757bd8cb8f7e7ae9c5b827c805530b4d13c
-EBUILD gmp-6.1.1.ebuild 3028 BLAKE2B 159bd4f2bfdb7ba5a6ff72d1ac65cdfe69bcc67f200fbb750472080e1fdd0fe22ff96eb07c084a06ce42f572f31738171469aa2845442a6b3408fcc9af682985 SHA512 8dcc6c3a5973edd4904827c4a91046c4577184da8c6664930007e60c59197c5e9c66822ea6c4bd5e8b311e42072b376feb7ff5249753ff73be025fe9f89beaac
 EBUILD gmp-6.1.2-r1.ebuild 2958 BLAKE2B de0265f9c529f831d2ca59ae5a639193038ce0b2536eb47a1dc71ca7be3914115f1241806cc2ddf0017676674968dd3ae492eda449581a9ffb46f764a41364ba SHA512 554f7ce0602cbde43f7a731ab2e40d3ba11509f4f0664b362abb0fe285d7c1be5d824133e01591bca5a5693b2874761413411c16fe8740aa3cc2b4e2209b63cb
 EBUILD gmp-6.1.2.ebuild 3280 BLAKE2B a16ae5ff9ceeaa79202cd447e64257862d9f551514a44902c5d5f3b4f3698f1c6137b50eecd513ae3f08b40baf52fbfbc839f3bd00e29c1ffbd5d8b56f039f69 SHA512 ec377c3d66be37a5232fc431039fb38672ff6200d24a8c1d780effbb2da1c6f336f478781a5f01af9d67e59f5657cfb22485e67632fe051356fc21f8f76582ea
 MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
diff --git a/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff b/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
deleted file mode 100644
index 8b10d09395fd..000000000000
--- a/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gmplib.org/list-archives/gmp-discuss/2014-March/005537.html
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1396602422 -7200
-# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
-# Parent  0194a75b56b21a9196626430af86c5bd9110c42d
-Conditionalise ARM asm on !__thumb__.
-
-diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
---- a/mpn/generic/div_qr_1n_pi1.c	Thu Apr 03 23:58:51 2014 +0200
-+++ b/mpn/generic/div_qr_1n_pi1.c	Fri Apr 04 11:07:02 2014 +0200
-@@ -130,7 +130,7 @@
- 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
- #endif
- 
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
- #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
-   __asm__ (  "adds	%2, %5, %6\n\t"					\
- 	     "adcs	%1, %3, %4\n\t"					\
-
diff --git a/dev-libs/gmp/files/6.0.0a/ppc64-build.diff b/dev-libs/gmp/files/6.0.0a/ppc64-build.diff
deleted file mode 100644
index 4d0ec5efcb83..000000000000
--- a/dev-libs/gmp/files/6.0.0a/ppc64-build.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-from upstream
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1395835068 -3600
-# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7
-# Parent  301ce2788826a2d4d2725bd5cf01e998638db37a
-Provide default for BMOD_1_TO_MOD_1_THRESHOLD.
-
-diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm
---- a/mpn/powerpc64/mode64/gcd_1.asm	Tue Mar 25 15:34:52 2014 +0100
-+++ b/mpn/powerpc64/mode64/gcd_1.asm	Wed Mar 26 12:57:48 2014 +0100
-@@ -43,6 +43,9 @@
- define(`n',     `r4')
- define(`v0',    `r5')
- 
-+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',,
-+  `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)')
-+
- EXTERN_FUNC(mpn_mod_1)
- EXTERN_FUNC(mpn_modexact_1c_odd)
- 
-
diff --git a/dev-libs/gmp/files/gmp-6.1.0-tune-printf.patch b/dev-libs/gmp/files/gmp-6.1.0-tune-printf.patch
deleted file mode 100644
index dd9d46ff1bd0..000000000000
--- a/dev-libs/gmp/files/gmp-6.1.0-tune-printf.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gmplib.org/list-archives/gmp-bugs/2016-November/004032.html
-
-From f440c9134fb89cadf54daeb59c7a0feb7470562b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 26 Nov 2016 16:35:46 -0500
-Subject: [PATCH] tune: fix spurious clock_gettime reference
-
-When running the tune program, the generated gmp-mparam.h header might
-include an invalid line leading to build failures like so:
-In file included from .../gmp-impl.h:145:0,
-                 from mp_bases.c:4:
-../gmp-mparam.h:1:1: error: unknown type name 'clock_gettime'
- clock_gettime is 1.000ns accurate
-
-This is because the tune source has one printf that is not protected
-by the verbose flag leading it to be written to the output.
-
-Credit to Conrad Kostecki for analysis.
-
-URL: https://bugs.gentoo.org/568320
----
- tune/time.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tune/time.c b/tune/time.c
-index e0d262096396..d1efb0a6d35d 100644
---- a/tune/time.c
-+++ b/tune/time.c
-@@ -773,8 +773,9 @@ cgt_works_p (void)
-     }
- 
-   cgt_unittime = unit.tv_sec + unit.tv_nsec * 1e-9;
--  printf ("clock_gettime is %s accurate\n",
--	  unittime_string (cgt_unittime));
-+  if (speed_option_verbose)
-+    printf ("clock_gettime is %s accurate\n",
-+	    unittime_string (cgt_unittime));
- 
-   if (cgt_unittime < 10e-9)
-     {
--- 
-2.11.0.rc2
-
diff --git a/dev-libs/gmp/files/gmp-6.1.0-udiv.patch b/dev-libs/gmp/files/gmp-6.1.0-udiv.patch
deleted file mode 100644
index 3a6e8072b44a..000000000000
--- a/dev-libs/gmp/files/gmp-6.1.0-udiv.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://gmplib.org/list-archives/gmp-bugs/2016-November/004031.html
-
-From dadb1954c8305ea7c7d61d30f7c6338024702280 Mon Sep 17 00:00:00 2001
-From: Torbjorn Granlund <tg@gmplib.org>
-Date: Sat, 26 Nov 2016 02:58:34 +0100
-Subject: [PATCH] Conditionalise udiv_w_sdiv inclusion on --enable-assembly.
-
----
- configure.ac | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 689e137f24c2..66c8b057574f 100644
---- a/configure
-+++ b/configure
-@@ -1269,7 +1269,9 @@ case $host in
-     AC_DEFINE(HAVE_HOST_CPU_FAMILY_power)
-     HAVE_HOST_CPU_FAMILY_power=1
-     cclist="gcc"
--    extra_functions="udiv_w_sdiv"
-+    if test "$enable_assembly" = "yes" ; then
-+      extra_functions="udiv_w_sdiv"
-+    fi
-     path="power"
- 
-     # gcc 2.7.2 knows rios1, rios2, rsc
-@@ -1306,7 +1308,9 @@ case $host in
-     gcc_cflags="$gcc_cflags $fomit_frame_pointer"
-     gcc_cflags_optlist="arch"
-     path="s390_32"
--    extra_functions="udiv_w_sdiv"
-+    if test "$enable_assembly" = "yes" ; then
-+       extra_functions="udiv_w_sdiv"
-+    fi
-     gcc_32_cflags_maybe="-m31"
- 
-     case $host_cpu in
-@@ -1603,14 +1607,18 @@ case $host in
-     GMP_INCLUDE_MPN(vax/elf.m4)
-     gcc_cflags="$gcc_cflags $fomit_frame_pointer"
-     path="vax"
--    extra_functions="udiv_w_sdiv"
-+    if test "$enable_assembly" = "yes" ; then
-+      extra_functions="udiv_w_sdiv"
-+    fi
-     ;;
-   vax*-*-*)
-     # Default to aout conventions (i.e., no register prefix, '_' global prefix)
-     #
-     gcc_cflags="$gcc_cflags $fomit_frame_pointer"
-     path="vax"
--    extra_functions="udiv_w_sdiv"
-+    if test "$enable_assembly" = "yes" ; then
-+      extra_functions="udiv_w_sdiv"
-+    fi
-     ;;
- 
- 
--- 
-2.11.0.rc2
-
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
deleted file mode 100644
index 84c305ca602a..000000000000
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P%a}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-src_prepare() {
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped}
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		--localstatedir=/var/state/gmp \
-		--enable-shared \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean
-			emake
-		fi
-	fi
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
deleted file mode 100644
index c679c5b9630e..000000000000
--- a/dev-libs/gmp/gmp-6.1.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils libtool multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+asm doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P%a}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-src_prepare() {
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch
-	epatch "${FILESDIR}"/${PN}-6.1.0-tune-printf.patch
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped}
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		--localstatedir="${EPREFIX}"/var/state/gmp \
-		--enable-shared \
-		$(use_enable asm assembly) \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean
-			emake
-		fi
-	fi
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/gmp/gmp-6.1.1.ebuild b/dev-libs/gmp/gmp-6.1.1.ebuild
deleted file mode 100644
index a8231bd54b5c..000000000000
--- a/dev-libs/gmp/gmp-6.1.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils libtool multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+asm doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P%a}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-src_prepare() {
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch
-	epatch "${FILESDIR}"/${PN}-6.1.0-tune-printf.patch
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped}
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		--localstatedir="${EPREFIX}"/var/state/gmp \
-		--enable-shared \
-		$(use_enable asm assembly) \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean
-			emake
-		fi
-	fi
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/hyperleveldb/Manifest b/dev-libs/hyperleveldb/Manifest
index 929d24a148d5..f81dbeac8d19 100644
--- a/dev-libs/hyperleveldb/Manifest
+++ b/dev-libs/hyperleveldb/Manifest
@@ -1,4 +1,4 @@
 AUX snappy.patch 1092 BLAKE2B bb134a799bae1631e8158787a54c059093555276d0006f975b1294bd8f3865601d45fde6c8473335015c3497f9151e457f3e1e03e322f037258f43ac1979280d SHA512 e6cb0bbfae14637a7ff084100c5347fafdf2c87ca5bc32457be9bc65c45cc79986ac70f2d23881cf5691e987853d6934dc2e929ad008e246809c7fbc3cf2c45d
 DIST hyperleveldb-1.2.2.tar.gz 584955 BLAKE2B de578b83ae3ea4e3802bee9936d5917af421baf2513da9e4575b8965a8bcc53565fd56105eea70a0c0c62ddefc3c5c11bb3511b52c6c09e68c5a416d6aa06ac0 SHA512 6fb7a84ec237a5a1a3f5f7c90965a0b0661a6143722a159a189c4c54231d8c5746dcbb76713fbe9b8b2529467f287365d30dd7115fb5c1ef54f864686a709eb2
-EBUILD hyperleveldb-1.2.2.ebuild 472 BLAKE2B 8c03b9281edbf9c3614ee0d53259c6b315f740c67eb4175f31f97e76151c6c16ca849f258117f7285287ac84b62797628b36413fb989d390342dd07218a2abbe SHA512 bc30422e2e5a9e99c9ff14185af5b3b2d7e49eaf35dc8a8fe8825e9fed8e2344c184e580be9fa1b3d4bc5723f87eadeb6495d832a063a3e2a3690457f32dc6ef
+EBUILD hyperleveldb-1.2.2-r1.ebuild 474 BLAKE2B 43d3f09e08d1319ebfba5254d5c660b1ad8275d1b7168ecd88c3aa48353624d180f88d44839a27e93c3ac3ba86eeaa70a05ad452d884d983f0c0c0af523a21a3 SHA512 54ff35eb32c7f555281f6fa96cee853373a1d562ee885a213ad3f52dab503974ce80bacdf7bc0997a17a0beaeaf58c32b3d1513fbf7b6bea5e1d244dc2e2819c
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.2.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
index 8300c836bc2f..b9f1cd0e7a48 100644
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.2.ebuild
+++ b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-libs/leveldb[snappy]
+	dev-libs/leveldb:=[snappy]
 	"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 116db0d19373..9ad07222f18c 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 398 BLAKE2B fac3edcd4ae4d8fbb87d0fdee90c7b552169ee974c98f8be8240d708ba31a6bc9a5367af488446bd336620d8125da605e0a6c4608d0c09fd4df6222c30a07980 SHA512 894739b11b5350cd722112e69ae6661f0dd7e2f37dae832f9861e94ff698c7d534273a4d1841d1133c08718e44acf9f98a4d0c329f043bafd3979ed02fafc0ba
-EBUILD ivykis-0.42.3.ebuild 403 BLAKE2B 8439b203af880ddf82257b705fb8024b80b21b4d9d7fac1f3cf7627ae774cbaa57127200bf88393c60eab59b1917c877be0d1460cbfb3258e9a698056e1978f4 SHA512 e955cbaf3e35b079a173c60fa7ff6c338d5bb4c8a8ddd41ed7d5d7b19a53abef8585987bce045b6e22f291d16272ced4309607dfe9a00380654ba2b838432028
+EBUILD ivykis-0.42.3-r1.ebuild 554 BLAKE2B 3bbf9240398dab08f302c801927b7ce5ef810bba527679b788812e3c1d16a8877497d5e46a250a720b15189c6dea415c5ba9ef1d13e323ad4c9a4469db129468 SHA512 b4f26efc40a2a5b50d47967e18bd3acb54678695871d0e4ae4b09062348a07d3cc3b547575918f325bdef7b29c7ac457a0990c55fa6a58ddf91c7b0b260f69e2
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index 0660fddcca95..a5ee1b0d17d3 100644
--- a/dev-libs/ivykis/ivykis-0.42.3.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -10,3 +10,14 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 1b3ca3d9f94f..e61cfcdce1e7 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,6 +1,8 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6
+DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.4.1.ebuild 1222 BLAKE2B 7aedb4f5a32614583bc4754e25cf8fe875948c79f85dd816766208061d3d778e15aaa69e639b0d6ec578a74c5f84b1f742c486600fe064ebd97425898feb1a82 SHA512 8b3d6ae0c8d7057e0ab55d9a1dc37b763c0898b1ad0dc1c79a682987f323fdb60b1bf967a516ce8e93ffe3f4d70c62851cdb5ddfeb1efe771d166cc07fed8cb6
+EBUILD leatherman-1.4.2.ebuild 1224 BLAKE2B 1b70a91f1dcac7daf0985723f0dd12ffcca0474acac18812318a07fc9487b3f174ae697f9cdc83b477e3e38f936f3ba7b211ca52ef3c48f662dddd102a91d727 SHA512 d0916476dff03385e5b0d3d073e762a32bdef4f7f3dc34c34e4a824c5d913cb82decb77c16c41b44e6f083e6c5488c5827965e6fdc0912f1cf707790efa3cd83
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.2.ebuild b/dev-libs/leatherman/leatherman-1.4.2.ebuild
new file mode 100644
index 000000000000..1bbc1551d010
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/1.4"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 9c2dcc3c67bf..5bd09b070dc5 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,27 +1,20 @@
 AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef31dd01c4813794640ca7f40be8e0c09a084205a6dc954748b2877d8fac1b419ddc9d2461a894bf9de8e53b48852926 SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e
 AUX leveldb-1.18-mips.patch 1399 BLAKE2B ea9bf52ce2c6482c8a43116c5782b2219af3d8a7eafb39a7d0742695b144f50c5f53e33c85ec562c690b78313146eef7a1edf41eb178bb6b9d8e179d87d72576 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54
+AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200
 AUX leveldb-1.9.0-configure.patch 990 BLAKE2B 8e658003078100ee071d79709532e37edec29aca816cd5864faea8f2cbad6d4212da09a268dec767b695823557f0d38744d13932eb0fcb50dee7ad065018ed92 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5
 AUX leveldb-1.9.0-forwardcompat.patch 3464 BLAKE2B 628e0898b9648d14bdd8a043b0646d8af0300310b9b03d7224e52b5be2a2be60d39934b1885bb602334aa64f5f3dbcd7d0ed32e936f3575047005f0d27e03438 SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824
 AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75
-DIST leveldb-1.10.0.tar.gz 204270 BLAKE2B 4418d8894d8b3b03958153132c4e9c2e88b58d5c0a2c85914f218500b82987623bc34606947c3d013521dbfd29d1c7518097864e0173b639387f96ce08319ba6 SHA512 ba9829a203c25d00184b77382ee8db6b383058c527771a795443e0d3ae02b93dd29c3362f12fd89b08ac24f784b7ed2f3e3325b30abe2763df1cc9e4b8a12948
-DIST leveldb-1.11.0.tar.gz 205413 BLAKE2B 751b81e657fa569a85e8cb3cca19bb2cfa79fec484a77d6cd434bcedc596fafae96924cc7dcacb33cbf2fd2cf2b7033f8614879f3b3737715d0c9c76ce777aef SHA512 2b01227d3339d5ab09a6488e43f4b92f1c8f23d9d9b3a1636710aadfebb2a291622b83d636c96314a651f7a774ec39b404490dcf7cd4ac6ec2997d5d651582aa
-DIST leveldb-1.12.0.tar.gz 205436 BLAKE2B 0506ef5a1891d36f8961a70fcd637ee59e71a0736ed24e508c30c9a33f2cc10c7a50693403d5ffa4b8dff2f8b844c08d163f096ddf2bc1de4b0c00d58570d3dd SHA512 b0798ecc598a7dcee38887867521face02b11ec93bc55e28fb3e1e16fb9c4d2068564f7779849a0dc0d758ee9665c2297c004947bedd149e392c129fc39a921f
-DIST leveldb-1.13.0.tar.gz 207718 BLAKE2B d0dd4590a3806679e413e502fb38a7b0ca73d8afd3e2a1789f212ec2b430ff3f86d0ba2b4b7c0d998a39fa5c81a5cfb64e07472d3d975f6e4c32734626e5f4e5 SHA512 f7fd7421a0c00fadae44cae4be8a473a8827472229bf95aed0642401943f4fdf3d14026270dce59cd7bda2b2a2856d92c253a360c80ea8188a3fb52985b7e3e9
-DIST leveldb-1.14.0.tar.gz 208282 BLAKE2B 438520df4fdaee3cd2439d8f242b119a923e53b9a109692804b00d5e246cde773981d759cf973686a65d713b2530c915cd5a12876d76bc5903eb04f8c5d73996 SHA512 c8dc837b77b7aa0be4fca03f31061685534d4280c59b929e5c3e7ef9ceb29e7ea75f8836a55c9df49cd3bc67143d91a2512fc5d9a181f440ec4961a256c77108
 DIST leveldb-1.15.0.tar.gz 205691 BLAKE2B 29ebe99ba8b2c44943a2c07c6c0e3a2136c53e15cbbb1fb807cb198b8849433c84ee5c4976fd898a84f2bddb38e543a0e45aedfabc1a46029ca23d39f8b0103e SHA512 af5b18a7750ac553659075c1c34aa2fddf6322b6837f096589cf5908c7050fd19053cd98d19fd7097e0840392b318f0166360d3a0595adcaaabcfdf393246775
 DIST leveldb-1.17.tar.gz 207037 BLAKE2B edeb366b9b17fec1a2bc0c0ca8636068bdd65dd1c017a4508c787714da0a202912d1283de9c77c94c9d34784fe552ab344e671fa351ec14f775b1e1037ffbef0 SHA512 d35401a92fa2b59c46e97ab94a9c70d0d5f97dbc7868a75354e088489338c078f47feaa3371489c481317b45ace6bd207d29676f5c18076ced86aa3f9fa44e58
 DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
+DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.9.0.tar.gz 203872 BLAKE2B 5fa6d361d82bd386a722b24f52b851791555c6cf77939bd6b55feaa75f0db0e216f84b2b3d23f4cac3bf522fb5fcbbf8b7adb46e4731d0ba161c82124cde9abf SHA512 47b0a3272eef2d677ddeb8d0c973e59a1be4bff580528c3bc3f83a654f41485ecc86892d9124ce21ef747c220f98cdad687436849dc978adfd42f8c8c05b9160
-EBUILD leveldb-1.10.0-r1.ebuild 1303 BLAKE2B 00a39315755dca8491d9006fdd7ed2e6847f3593fc36e9885ce44a4c2e777d1e95d592f98595400dc1073a58998faf8a6b1a31050e79a491d276f55a82705f43 SHA512 548cec6bfa8a1c3b78966b593b239aa49d7c21f21309729f00f44ea76b484f633fdccd2810d39475372227eb252ff91d554b2cbdf4f543b98305f744c04ec042
-EBUILD leveldb-1.11.0-r1.ebuild 1303 BLAKE2B 00a39315755dca8491d9006fdd7ed2e6847f3593fc36e9885ce44a4c2e777d1e95d592f98595400dc1073a58998faf8a6b1a31050e79a491d276f55a82705f43 SHA512 548cec6bfa8a1c3b78966b593b239aa49d7c21f21309729f00f44ea76b484f633fdccd2810d39475372227eb252ff91d554b2cbdf4f543b98305f744c04ec042
-EBUILD leveldb-1.12.0-r1.ebuild 1303 BLAKE2B 00a39315755dca8491d9006fdd7ed2e6847f3593fc36e9885ce44a4c2e777d1e95d592f98595400dc1073a58998faf8a6b1a31050e79a491d276f55a82705f43 SHA512 548cec6bfa8a1c3b78966b593b239aa49d7c21f21309729f00f44ea76b484f633fdccd2810d39475372227eb252ff91d554b2cbdf4f543b98305f744c04ec042
-EBUILD leveldb-1.13.0-r1.ebuild 1303 BLAKE2B 00a39315755dca8491d9006fdd7ed2e6847f3593fc36e9885ce44a4c2e777d1e95d592f98595400dc1073a58998faf8a6b1a31050e79a491d276f55a82705f43 SHA512 548cec6bfa8a1c3b78966b593b239aa49d7c21f21309729f00f44ea76b484f633fdccd2810d39475372227eb252ff91d554b2cbdf4f543b98305f744c04ec042
-EBUILD leveldb-1.14.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9fd195c54cb4fcc50d1ae5327eff1d4f116b60b79e03a4a2d561bd592eda2a5ad91c3dc09ba1e1d778ec9a50a296 SHA512 0b235df8d0bc8559a1e9b79498c2a3009134683a6edfe671abeb29e6a1517817622e03989e9d0c3a6e59aa6127b74a0f86ea6bb08c28974f1ca1dfb742c80033
 EBUILD leveldb-1.15.0-r1.ebuild 1434 BLAKE2B 9f38a16de6c75e7f6d0b4ac8172d7c7abbc6b95da6729c3ad67977dc17702486d1f5b10b28a7259ee8d7a32b9c6891666113f90e9fa797654bf068ad15314ee0 SHA512 686476d32f6922e79672b07c934662b09a2b9615b6014b9048dee4398fde71c8c26e46a47ee048c258568d5cd723ca6857db2fd046c846f187092b04e6dd15d8
 EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9fd195c54cb4fcc50d1ae5327eff1d4f116b60b79e03a4a2d561bd592eda2a5ad91c3dc09ba1e1d778ec9a50a296 SHA512 0b235df8d0bc8559a1e9b79498c2a3009134683a6edfe671abeb29e6a1517817622e03989e9d0c3a6e59aa6127b74a0f86ea6bb08c28974f1ca1dfb742c80033
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
+EBUILD leveldb-1.20.ebuild 1742 BLAKE2B c8056fe84b4af769dc00fd4e0a78df77a38fbd88de69d9a854322644a699738a7f58e126092f64f6fcc2a4a13d5e53bcec6d9b2f049e72c181c9eebfcaecc83b SHA512 a5b8b296dd67fef075e71bbdf48d0c70ae8f723f8f7087b396ec8d3f44a552ec43674a9054ccfa19488ee7e5b3af4c43e61cf0742d5e566a07640360d7e5a1de
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
-MISC metadata.xml 423 BLAKE2B 78e731c14b9096490f6500badbd462406d7650090aa183cc9ba45c7c85cbf05439eb66782dce3bf32e7487785f00d9431c2cc49fd46b627092811a90b1a5d7d5 SHA512 0c0b3abf79f52fc0c42e50899afabb32bb9f214b685c6dd09d523dd777f32d00a58a5004b8cc722c9c3a104801b69fbf8342aa64232003ae057a81ee4c822e5c
+MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
new file mode 100644
index 000000000000..d443ef0ad262
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
@@ -0,0 +1,33 @@
+# Create libmemenv.so and don't compile programs by default
+# Add a static_programs target to compile test programs
+--- a/Makefile	2018-06-03 16:52:28.839614213 +0200
++++ b/Makefile	2018-06-03 16:52:18.209544310 +0200
+@@ -128,15 +128,27 @@
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
+ $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
++SHARED_MEMENV_LIB1 = libmemenv.$(PLATFORM_SHARED_EXT)
++SHARED_MEMENV_LIB2 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR)
++SHARED_MEMENV_LIB3 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
++SHARED_MEMENV_LIBS = $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2)
+ SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
+ endif
+ 
+ $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
+ 	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3): $(SHARED_MEMENVOBJECTS)
++	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_MEMENV_LIB2) $(SHARED_MEMENVOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) $(LIBS)
+ 
+ endif  # PLATFORM_SHARED_EXT
+ 
+-all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
++all: $(SHARED_LIBS) $(SHARED_MEMENV_LIBS)
++
++static_programs: $(STATIC_PROGRAMS)
+ 
+ check: $(STATIC_PROGRAMS)
+ 	for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done
diff --git a/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild
deleted file mode 100644
index 9c017847de4c..000000000000
--- a/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild
deleted file mode 100644
index 9c017847de4c..000000000000
--- a/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild
deleted file mode 100644
index 9c017847de4c..000000000000
--- a/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild
deleted file mode 100644
index 9c017847de4c..000000000000
--- a/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.14.0.ebuild b/dev-libs/leveldb/leveldb-1.14.0.ebuild
deleted file mode 100644
index 0b1c19884483..000000000000
--- a/dev-libs/leveldb/leveldb-1.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
new file mode 100644
index 000000000000..e8b13b5798a1
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://leveldb.org/ https://github.com/google/leveldb"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+# https://github.com/google/leveldb/issues/536
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy:=
+	)"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/651604
+REQUIRED_USE="snappy? ( !static-libs )"
+
+# https://github.com/google/leveldb/issues/234
+# https://github.com/google/leveldb/issues/236
+PATCHES=( "${FILESDIR}"/{${PN}-1.18-configure.patch,${P}-memenv-so.patch} )
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+
+	TARGET_OS=$(usex kernel_FreeBSD FreeBSD Linux) \
+	USE_SNAPPY=$(usex snappy) \
+	USE_TCMALLOC=no \
+	TMPDIR=${T} \
+	sh -x ./build_detect_platform build_config.mk ./ || die
+}
+
+src_compile() {
+	default
+	usex static-libs && emake out-static/lib{leveldb,memenv}.a
+	use test && emake static_programs
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/.
+	# This matches the path Debian picked. Upstream provides no guidance.
+	insinto /usr/include/leveldb/helpers
+	doins helpers/memenv/memenv.h
+
+	dolib.so out-shared/libleveldb*$(get_libname)*
+	use static-libs && dolib.a out-static/lib{leveldb,memenv}.a
+	dolib.so out-shared/libmemenv*$(get_libname)*
+}
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 1b1686f1de67..056bf21ff538 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="github">google/leveldb</remote-id>
+    <bugs-to>https://github.com/google/leveldb/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index a479ad04daf3..a7bcac4a518f 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 EBUILD libassuan-2.4.3-r1.ebuild 1099 BLAKE2B b2df568fcd4c2e50fde71a384e85a829753915a74164582f01a0be20f30d5a8a4dfa61d645b6f90ede321cf7bcffc674cb7872c6ef313cc06bb0689f3facea45 SHA512 a3cab0a03de279a18d49db4bc521dbfd04340f66edddb1cb05ac1dfdf6ab4096d1f082c3115e8cfa281873f2d25f810fdbe514aa083313e66a2c470e0e752db8
-EBUILD libassuan-2.5.1.ebuild 1099 BLAKE2B a4d4abf85c3f77fa87d82cab807296d88796b917fb28f5ff7ea1c0c59d4db26d834b3714e89c46124c8c8b536a1a552c7b41d42b6f3d274df9686bb9823acad6 SHA512 437a8d4fc3c708dc0d3fcfc83bfa6539c15ae895ff23017f1cc057c943a14b3cdd0baa0d89c0a5e7a45c3cd1e3e962a9712487b485f9da369c89c29abbffa60d
+EBUILD libassuan-2.5.1.ebuild 1098 BLAKE2B 2b761fdf571da3cb5006d8054ebd765927f3c09738229f13d54816a7e889627e05f370d1abc5b0c1b14c63cb98b4adc91b7049357f255f4e40a20e8d1bc1b3c0 SHA512 8b39c918da219dcc573e230a1ea17fb9d00d0e326e6206181a7155c8cbadd5995771eb3d5ac5e006981c9b6bacb459a0f8c34aa7aa4694ff21b2c3385595e16c
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index 00a754425af0..a91e146f7a01 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index a367f6cd28fe..9db0b606f722 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,25 +1,4 @@
-AUX libatomic_ops-7.2_alpha4-x32.patch 1644 BLAKE2B 482c7c24651b1eccb928434a51491c0b27fc37f555109500ed5c4b743e652c0be1baf5b3e70b641ad8e3120fc6ae7e6bd2d100babbac041bdab0dc912376216b SHA512 59e148fc48ee15f29aebbe8e100796e0c959e8a21daffd54c9678929123faff3d126ba06132a6b42c64f26f15f63db37add1a062d3d664763104eab2c54ff1c8
-AUX libatomic_ops-7.2_alpha6-x32.patch 1960 BLAKE2B 347cf180b524edaa4c55c1884d33fe9716ea282fb33aaecdaecbbe931d35dc728362ffe2cc4325d730caa40f2bda4f7052a49145f380b13ce2a9d4ecd9537bfe SHA512 6b0dfdcccc51494015b842ef41419f3a6b56c6b60b242bdecd98b5aefbd4039ae43912f1823effab3352ec3566257294ae823febf27b95bed6d3fc2f1097a02d
-AUX libatomic_ops-7.4.0-docs.patch 544 BLAKE2B 1ff5a857607a6b96b819f4958c852a91ad4e24288becf7116ebbc2e436013a238fd31b60845c439ff92618ea8f65e6e94a90fcf1714f07a20a71bdc2fd9c1618 SHA512 1dcabd372e62cf4ced7ba1f2e2dcb3ccd0c2d7d98aa1ac2c2ac20fc141c94e8bda46bf03dee1d6785d8bff510375ab28ecc24983407d62b2960bdb195728ce3a
 AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd002260294ae90726a7c23262e97d2f27cf985ce3f2a7e0038441b1d6e2fa39202d800d774d44b8dd69662acc8a35aa7b SHA512 a7e2efa8feb5c8e9f4468f6a74a4191c1e95112a5f646dd9635e76790899504242f94500a1599fa72b781159166b61c39e88da6c01e7febab91afad6f099bcf8
-DIST gc-7.2alpha4.tar.gz 1091329 BLAKE2B fb55adfcd122ec5e695a0ab198a4a9ea816cc036bab297e38270d8f673ec6b5cca49de2b383b0fc9c05bc41a417bbed11bdf19370bfa92ba87f63ac34f119a2d SHA512 79c4439989c181add9b80467b1c19d2b61a5e7c510a84a61ee27017220ef56a2b0f4945a4e850019a6c0fe7a9cb3a982ef656b97d988d8e6f3c3fb8270a3e783
-DIST gc-7.2alpha6.tar.gz 1241386 BLAKE2B 0bb3ce73ebfb91ee5ca3222c1b466d77c37d34466dafff2f16462c567fe89f17a27155ce4c5ffa7caa8eb01bc32b7a93a67e547f0adbe509c42533717ecaadcd SHA512 19e8cbb5d4698998a07725dedc204fd707ef3d47a0184129b418e4da44814f0016a834b6ac3766f754e76376441dfbad4b86e8e1b6ada8446f54e70f590628e4
-DIST gc-7.2d.tar.gz 1263064 BLAKE2B dfc90b7a40418216cac31df790a8868d271b7a363ef55ecd62170983a8926f19af716af57777d94ab0a50f20b1f08b37bbb863d42a63b1f6e8aa49c97b1d29e2 SHA512 5b342754a1efeef0cf78983b7a0e48a36495beac04fc881ab356b26dc153b343e940ec7af070f4fc875be44adc559f7be995919fe9229f68d2e0237cdbeaabcc
-DIST libatomic_ops-7.4.0.tar.gz 455143 BLAKE2B b13cd06bdc0715097ca1759594f24435f8e80b707fe77d1f8be1824b3be7bc992c98df222450dea1facba4da8877a0ac0752a6e82881781d68779492f8b273ac SHA512 3a2f6eac7c5f0fe0abaf8650047b8ec1c9c5abe732982a294a2afa920b588e17d64cb9f05a44be31b8cca9e52cc5ac79a26e1779bf60169c228344df4bbe86a9
-DIST libatomic_ops-7.4.6.tar.gz 479437 BLAKE2B fe3199df827a170f328997bc24cc2b717d5df8704aa90e4db5b82add5861b2a08f5d60e6b35491cfb656f086d489749a73dbff6507b30aa5c5d350cf07b03649 SHA512 29c6f937aa5d21343741aa0661aaf33ec9196b7784b7165d40dd87ce7bf8a7691f5ba94040663f078465ded1935ca01bb829a4b56b190f9db63cc141515d9819
-DIST libatomic_ops-7.6.0.tar.gz 493177 BLAKE2B e1f8ce79de18192a5dbb2dd5834928fb8a385cb1d2174186049a269e1329ed32adb975bf461e7d29a75332916719d4f3197a30a1839221c6ab71249f17e9be98 SHA512 58f1f1df94ff33bda5833af2e3a6a4af120ccfc0cec0fb15e2db24341e2ffd5a6436169cb4e7dbd96a6cb0431c1295dc4b5270d4b01806e470bacadc902720fc
-DIST libatomic_ops-7.6.2.tar.gz 496917 BLAKE2B a59ecc1053df8a5ae2fe9aab5c8e18c09e33c2c477425ccc0919c87d01538ef703547b2ebb1dc9f1606e76c9d48b123a4cdd496e7e05c694da8778e9c83ec1cf SHA512 9149c9328ec22ab80469892b40c135f20b6cf6edff63b8de6f16ab0b209f40d1420ad012a40c80009dfb4cdc826feb72fa826d6abf61211516aabcf463c17fe4
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
-DIST libatomic_ops-7_4_2.tar.gz 115132 BLAKE2B e08622dddc3baab17576a893f893898ad4d09bb994b680641b98edc3da7eb2cbab4ccd45a02c4e7f6d4d500c3866f1e7c0354bb692eeaf4784321356cfeacfbf SHA512 3d06d5de930a369dd2af4413d8f573993eb927b45941ae8eba14ada91abd34a6baf31e1030d1ef6aa02bd6a2d8d59f9f306dd8dda6a68cf552a2745041111b2e
-DIST libatomic_ops-7_4_4.tar.gz 115469 BLAKE2B a76fc56937f2c6ae129ee249214f7bdb3277a90c349f2713d14b1f11c7dcede9e6a76390ca329969e585f3ce105ed3883c1d37a3f12795abbe62e58ca5387e7c SHA512 2c1a773c61b5fecab467746e872f7eb1541c1f6770d2055d0440dac461294e896ff73460097a73c932ad07d6c44eb820ebfd039e5d87f1699d518498da6fa25f
-EBUILD libatomic_ops-7.2_alpha4.ebuild 952 BLAKE2B 7d5a33f4b7765cc663b536b6d89d35db26ce62d769237d10ebc553c03cb3048cceee4e4ad8f4aa0cc9c683c8c1bab72dbe2e6995343ef9e7c1469eeebb816b5a SHA512 ccbb482eacd7283f9cf157604d66acc76f33914f4a7d21007640c60d8950a16e6f5abd1cd9b346e0fdba2f0d97d6e385c3d4efa8ef9801a4a96c03d33a51eef0
-EBUILD libatomic_ops-7.2_alpha6.ebuild 938 BLAKE2B 45d31774261ff308970555e6d6a2a3c5bf14d4075457bb5acf27c63c2cc953a98fdf3c96884a3ea08373839528005f794b4c8582b97d57d008fa6804be48b54c SHA512 fc233651c4f7220ea5d38951fc703ef461fa1da9a9f33f852d1154ef7aeecf17285287c42a00611f5bc7cdd186edfe96e6212fc6cc1604442209efe894c6776f
-EBUILD libatomic_ops-7.2d.ebuild 907 BLAKE2B fd40ad7f81cb14888d41723452104775775178929d2d4696b8f0eca4119967e7a3327acd062c220da7bdad6f08a86190ae6f3570480b74def331f757fddccab2 SHA512 e7345dddf64686f2c72d8313bb494618307ecff639201ebd6c0cd6f0f753a31cec284e1e11a89fe5224d700ff5d68059f01d9b819c446db1d5ade19f5894b905
-EBUILD libatomic_ops-7.4.0.ebuild 746 BLAKE2B b254c2f523a7c400ead1b27f7a940c71de7d2509d1449257995a23ace66d0d288fb3a1ff346f9b5a5c954094bea82d963b18615bddafc41e03b7a020a01ab435 SHA512 f351fc3bbee40fae228201db9e6a89d14fc91d45fd72a4efab8bf71c4c09ce26c8fafec7db1cbf71a0290f74bedc6db5f3c0c2adcd42b3d614fcbdd3461f0c10
-EBUILD libatomic_ops-7.4.2.ebuild 770 BLAKE2B 486ef6be2e5c018ef9fd707dc92988e0947827827370e318070732dad056ab6954baa3822a878b7eeae83e2b15ea2d714deecf8ca4e3e629454b097f7548e82b SHA512 d50b50c9fe0ad3f353467516b697a9eb4cb4a14858aeb3490a6d7dcb7d672c8e8b7b3059d6e1519093bf220e8385b6a78fc2614b5383ad70d25690ce992bb9d3
-EBUILD libatomic_ops-7.4.4.ebuild 789 BLAKE2B 6a39dacf0c431116607949e9b60db9a3904b5d34cb80281e33faa968449b4fdfde02f3d5ae536c60d54d857283d7b157005455e80adda231bbdaec4563439c0b SHA512 d2c8b009b838dbf524e4f5c168f6087967c058da14194032eb3a5821ed117ca2a1690e666a956a9c0615fcae5d67f91c268c06dea612df1f4f0ac87ed7c64540
-EBUILD libatomic_ops-7.4.6.ebuild 652 BLAKE2B 8eefa79a0bda76b93d752abe2cb40f39f700d32e78fd987a8ced8fab9fa1f96b589ceca06748d4264b24e89eafd7a8bb04af694722bfc509567850640c942b0b SHA512 73263d13bdee63c73d4ca7551ec2d9c2172de4d3daf1d62ca2ab18282173e444baa4430d046ca5bea085223009e11a05feff2a11e89756f7ec05f4fb90749f4d
-EBUILD libatomic_ops-7.6.0.ebuild 643 BLAKE2B 5fd655911133c08b02288e8d6c194e2fe73c23e8577e3e36e79da77c94fe985905d53769586becc3b69cf07ac3d12bf6a9c077713ea0df1a1ef7916f35a29617 SHA512 e15b8c149dba4db082f88dabcbba339d90d9264dd418e0a9e72359f546fc6555786ab4e335daa94df5bf2161709075a6697190a57c776001b82e07fda103f02f
-EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
 EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha4-x32.patch b/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha4-x32.patch
deleted file mode 100644
index ac2b57fb1722..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha4-x32.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e3a384578f677c05d812d99c2c92aa13670bd06a
-
-Upstream-Status: Pending
-
-Remove the `q' suffix on x86-64 atomic instructions.
-
-We don't need the `q' suffix on x86_64 atomic instructions for AO_t,
-which is defined as "unsigned long".  "unsigned long" is 32bit for x32
-and 64bit for x86-64. The register operand in x86-64 atomic instructions
-is sufficient to properly determine the register size.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/02
-
---- a/src/atomic_ops/sysdeps/gcc/x86_64.h
-+++ b/src/atomic_ops/sysdeps/gcc/x86_64.h
-@@ -56,7 +56,7 @@ AO_fetch_and_add_full (volatile AO_t *p,
- {
-   AO_t result;
- 
--  __asm__ __volatile__ ("lock; xaddq %0, %1" :
-+  __asm__ __volatile__ ("lock; xadd %0, %1" :
-                         "=r" (result), "=m" (*p) : "0" (incr), "m" (*p)
-                         : "memory");
-   return result;
-@@ -106,7 +106,7 @@ AO_int_fetch_and_add_full (volatile unsi
- AO_INLINE void
- AO_or_full (volatile AO_t *p, AO_t incr)
- {
--  __asm__ __volatile__ ("lock; orq %1, %0" :
-+  __asm__ __volatile__ ("lock; or %1, %0" :
-                         "=m" (*p) : "r" (incr), "m" (*p) : "memory");
- }
- 
-@@ -131,7 +131,7 @@ AO_compare_and_swap_full(volatile AO_t *
-                          AO_t old, AO_t new_val)
- {
-   char result;
--  __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1"
-+  __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1"
-                        : "=m"(*addr), "=q"(result)
-                        : "m"(*addr), "r" (new_val), "a"(old) : "memory");
-   return (int) result;
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha6-x32.patch b/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha6-x32.patch
deleted file mode 100644
index 838e4a8d27f1..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-7.2_alpha6-x32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Adopted from
-http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e3a384578f677c05d812d99c2c92aa13670bd06a
-
-Upstream-Status: Pending
-
-Remove the `q' suffix on x86-64 atomic instructions.
-
-We don't need the `q' suffix on x86_64 atomic instructions for AO_t,
-which is defined as "unsigned long".  "unsigned long" is 32bit for x32
-and 64bit for x86-64. The register operand in x86-64 atomic instructions
-is sufficient to properly determine the register size.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/02
-
-diff --git a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-index 0f68c1e..3bcde88 100644
---- a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-+++ b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-@@ -47,7 +47,7 @@ AO_fetch_and_add_full (volatile AO_t *p, AO_t incr)
- {
-   AO_t result;
- 
--  __asm__ __volatile__ ("lock; xaddq %0, %1" :
-+  __asm__ __volatile__ ("lock; xadd %0, %1" :
-                         "=r" (result), "=m" (*p) : "0" (incr), "m" (*p)
-                         : "memory");
-   return result;
-@@ -93,7 +93,7 @@ AO_int_fetch_and_add_full (volatile unsigned int *p, unsigned int incr)
- AO_INLINE void
- AO_or_full (volatile AO_t *p, AO_t incr)
- {
--  __asm__ __volatile__ ("lock; orq %1, %0" :
-+  __asm__ __volatile__ ("lock; or %1, %0" :
-                         "=m" (*p) : "r" (incr), "m" (*p) : "memory");
- }
- #define AO_HAVE_or_full
-@@ -123,7 +123,7 @@ AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val)
-     return (int)__sync_bool_compare_and_swap(addr, old, new_val);
- # else
-     char result;
--    __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1"
-+    __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1"
-                          : "=m" (*addr), "=a" (result)
-                          : "m" (*addr), "r" (new_val), "a" (old) : "memory");
-     return (int) result;
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-7.4.0-docs.patch b/dev-libs/libatomic_ops/files/libatomic_ops-7.4.0-docs.patch
deleted file mode 100644
index 06c03677f605..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-7.4.0-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libatomic_ops-7.4.0/doc/Makefile.am
-+++ libatomic_ops-7.4.0/doc/Makefile.am
-@@ -1,4 +1,4 @@
- # installed documentation
- #
--dist_pkgdata_DATA=LICENSING.txt README.txt README_stack.txt \
-+dist_doc_DATA=README.txt README_stack.txt \
-     README_malloc.txt README_win32.txt
---- libatomic_ops-7.4.0/Makefile.am
-+++ libatomic_ops-7.4.0/Makefile.am
-@@ -6,8 +6,6 @@
- pkgconfig_DATA = pkgconfig/atomic_ops.pc
- noinst_DATA = pkgconfig/atomic_ops-uninstalled.pc
- 
--dist_pkgdata_DATA = COPYING README.md
--
- EXTRA_DIST = autogen.sh
- 
- #distclean-local:
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha4.ebuild
deleted file mode 100644
index e0db6d1faa08..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${PV/_}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/gc-${PV/_}/libatomic_ops
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.2_alpha4-x32.patch
-	sed -i \
-		-e "/^pkgdatadir/s:/.*:/doc/${PF}:" \
-		doc/Makefile.in || die
-	find -type f -exec touch -r . {} +
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	find "${ED}" '(' -name COPYING -o -name LICENSING.txt ')' -delete
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha6.ebuild
deleted file mode 100644
index 322dbb674edd..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${PV/_}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/gc-${PV/_}/libatomic_ops
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-x32.patch
-	sed -i \
-		-e "/^pkgdatadir/s:/.*:/doc/${PF}:" \
-		doc/Makefile.in || die
-	find -type f -exec touch -r . {} +
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	find "${ED}" '(' -name COPYING -o -name LICENSING.txt ')' -delete
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild
deleted file mode 100644
index bf675a1df929..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${PV/_}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/gc-${PV/d}/libatomic_ops
-
-src_prepare() {
-	sed -i \
-		-e "/^pkgdatadir/s:/.*:/doc/${PF}:" \
-		doc/Makefile.in || die
-	find -type f -exec touch -r . {} +
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	find "${ED}" '(' -name COPYING -o -name LICENSING.txt ')' -delete
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.0.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.0.ebuild
deleted file mode 100644
index 04b604e8efb4..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-docs.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
deleted file mode 100644
index 949457b9f1e0..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV//./_}
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.0-docs.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.4.ebuild
deleted file mode 100644
index b6433ebd790e..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_P=${PN}-${PV//./_}
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4.0-docs.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild
deleted file mode 100644
index f94a74e634d7..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.0.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.0.ebuild
deleted file mode 100644
index 1c0f138eb625..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild
deleted file mode 100644
index a34dc5c6c63d..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 9bf2a8f99e66..bb9ca91ae61c 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,6 +1,7 @@
 DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
 DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
+DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -9,6 +10,7 @@ DIST libbson-1.9.3.tar.gz 4957319 BLAKE2B a4e4ebc96f876e52173fbf41e9cb995824683f
 EBUILD libbson-0.98.0.ebuild 975 BLAKE2B f5d79791d080bd8fce54c8cf351cf6910c916bedd7bf094b255b022a29182c8d32151a56141a43b13bcd9db641b87cb35e41e215d9506f629273562d901d27a9 SHA512 051fb16d7dfd19f69c906d929b6294b7bc0844318afbb7efe5c3d9be6e7f92b04f3ded674197a1ec6108aa4ccf8913de928f1e8ee1d82c7b69529792b50f8ddc
 EBUILD libbson-1.1.10.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
+EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.10.3.ebuild b/dev-libs/libbson/libbson-1.10.3.ebuild
new file mode 100644
index 000000000000..e229e5ac1bdd
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.10.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index d996b548b742..9631399d6fb5 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,12 +1,12 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
 DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
-DIST libfilezilla-0.12.1.tar.bz2 397506 BLAKE2B 79f2009329195c51c81b6013b2ab14899a604cabd2a421888959690e57d67f1c0a30881bed5e7201f6a8d3f5ecdf56944f8f3ff7f2fab9bd8884cde6a0435a99 SHA512 3eeeb549eb5e07c712246a21c41e4ce076f4e9de8a65ad56f2a33bd7390a42950442cdb7113696b9673071f1f4253e847e4f961e97d4c8fad0a5369e790928dc
 DIST libfilezilla-0.12.2.tar.bz2 398156 BLAKE2B a7dee7d6cc14964b105f4c2227f67202d573d879c2428f815568ef0efcfda9349f372b07a10abbb735dfd44a9d52358985144e3b67388dd2ee2b65e8af33cd51 SHA512 8fb77ad2f55e5a2b9066b2923591d51408942ce4ade2b4f21d20ceb818d3b7e7f01da2e41693aba4f4044b1913b14d54719101734792bfec6fc5432593ffa92a
+DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
-EBUILD libfilezilla-0.12.1.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.12.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
+EBUILD libfilezilla-0.12.3.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
index b546fecc3c4b..28b3e2505fd9 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.12.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index ade720112e50..ec2dd4135892 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -11,5 +11,5 @@ EBUILD libgcrypt-1.8.1.ebuild 2098 BLAKE2B 05f395da3900dcc66b319f25c1a4ad57fe51a
 EBUILD libgcrypt-1.8.2-r1.ebuild 2145 BLAKE2B bf0273a1c467077406890da14fcd055dc7b144a834b04554fbd1cf9949530a6c4905dc701a42fa945b93bea6d6ae031b2dc22073d9873487906b75aed60fa0d4 SHA512 e3aeeafeccff8e5c70c7d3c5784dd26c7f250f08a8dba378856ed065e1e7dfa18da989fce814872a36d548829ebeddd48758ebaf40d4c9031ebfd012575fa580
 EBUILD libgcrypt-1.8.2-r2.ebuild 2210 BLAKE2B f34057ad59eca6355567b72bbfdf1985e44e4746d7fbb1b0522f2306ebf645aa73f4760561520beed81ff51ad713787fcced4f4af0fbbeec3f6865e325a95850 SHA512 d2e53d31e04a409b5dd58012416ed0470dadae9cc8a0eabaeffc35131d390a9a77466c2a8bd61ce3e4a90585db9a8352660ca7e66df7849a90dbf1c23edc807d
 EBUILD libgcrypt-1.8.2.ebuild 2111 BLAKE2B 8102d7a2504f12054a8a6b99960651930b22df9961d9df8efd72ba4f5ce76e89741a4607ee96118eadc2cd91cf2f1c2467405d2aaae145e709d382091b1ace08 SHA512 e8977abb9bc4313b09222d4945f487b0f3dd39e7bd1455e2186cb65965f77f653c7618b7c8b10d9d8028d50ff3d054b06b9565df7ecfd0f8849188fc783d78d1
-EBUILD libgcrypt-1.8.3.ebuild 2207 BLAKE2B f383e6c6d2eecd74db672140c0a3d6ee7fd7f2e23c2b9e6cd9df2df18d4fec4294a254e265c547f951f2700e089a9709449207ac60c49dd011a9f2d33060dd66 SHA512 ab6333ea85dbc50949d9f83709fc06fe8c7293dc4b917dc0f4e9aaf5160c95d0bd2527e2986d34f07778ebd3f7311ecd09c81fbd0a473e0e11e5261e901cd8cb
+EBUILD libgcrypt-1.8.3.ebuild 2205 BLAKE2B b8e0cde0766c46523883a014bb08af14faa694424fce291d4ab1ecc50d55796aa6c563b5437e2b37dad36f38e563d49b307b57745cfe989a809589980d2469ab SHA512 05ed9c4790c46b4b4d3e670b67647284b4ebd63ba8ce2f90599035923c6626669c398143eab189b9387d53872ec19e6f135a82ea29303fac4992f7a457f7808e
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index e74a7d587ac5..c89f517fdd00 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ 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 ~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 ~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 o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index f5504f69f72e..2c3f31f9529e 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,5 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
-EBUILD libgpg-error-1.29.ebuild 1309 BLAKE2B 2f84fcfa98ffd6fe7dd709ff24a86574db2d8b9b0d191addb6ae72e8882bd7baef444c4342a6cb17dd18a6cbc8419eae2756bf1ffb5a8792fb13c6f813063aec SHA512 fa21e6a2a860aa53df76d17578f8b884ac959c759e3aec586b39c65a70eb7376b80612e4adb2adaf9ead3b70943cfe1a982095b9168976b7ec9d3882ba8dd47b
+EBUILD libgpg-error-1.29.ebuild 1306 BLAKE2B 502e904b9d87fc393b3487ad4aa964411afad0c30fe003fcba040dc3cfaa2fe8c7d44f6b20eaa77e560df8014c43f94af4fdb0f735d022c854774c447d96aa55 SHA512 2bdaeac79faf6dad712a976dd07c1eed4d5fb6f432b8f6e368c646ae00f2d03277700bceb46f6deba53dadb27cf1c41a0a9f9dca9286de3884d95c5272ecf195
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index 878d9a18ace1..82a4deb10bf9 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 5b46aeb508c4..11d21555c816 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,9 @@
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.0.tar.xz 485976 BLAKE2B f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8 SHA512 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
+DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218 SHA512 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
 EBUILD libinput-1.10.6.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
-EBUILD libinput-1.10.7.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
+EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.0.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
+EBUILD libinput-1.11.1.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.10.7.ebuild b/dev-libs/libinput/libinput-1.10.7.ebuild
index 9e10a1005467..bed8843385aa 100644
--- a/dev-libs/libinput/libinput-1.10.7.ebuild
+++ b/dev-libs/libinput/libinput-1.10.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.11.1.ebuild b/dev-libs/libinput/libinput-1.11.1.ebuild
new file mode 100644
index 000000000000..0635ed1b8faf
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.11.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 37dc5d413215..2bedaa7c58e2 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,7 +1,7 @@
 DIST libmaxminddb-1.2.1.tar.gz 614448 BLAKE2B 6ab92e0313cf745d8820db7239c5760b9fe8a813a14008e415068a263954d48c99c3d3d771d746959c85a5ff6cec28a0b287b15ced83697c8594761599b99fa9 SHA512 c77e2714c30dbd9d83a755d7e4d24016534510f4cc7213fe9549d610bf79aaeb28f761a9fb769270d9043b1baab537c5a4b3a9994b525d48f395fe94c104b5b3
 DIST libmaxminddb-1.3.1.tar.gz 610031 BLAKE2B ab073da0d8e2a84b95f1d8da8bcded8ab4166fbe753ae752e7e5db03a65cbd01748701749a67fa66f7e234709888cd53159297b03fab804a072c451dccc88505 SHA512 c13a18483caf720808d6a02baf8abe48c3aa4dd38ddc7ddd79b5d95d686600e19bb4b2242da08623f5d363a5be4b7636f7fcb59a5a7c9df9ab5a359ecd30b293
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.2.1.ebuild 514 BLAKE2B cfdc5873a4858ee1a6811e4a86f321acc524ec067eb9a91a66c8df4f2fac5a2f4b6f6d0d7010147d31ffc9235c1c29208a8398f0c72e84dd6a160ee0c09cf7cc SHA512 f5f646d1c39a5aefe699de2c3608a54325d1824fbefe67106ec4c438d89800f8612d5386c3eadc877ad18382cb89efa41b3f45bf184e56a5fff3fb702c3195cb
+EBUILD libmaxminddb-1.2.1.ebuild 520 BLAKE2B 16ba6d46b201330d4711ff362b7f40c53ed1dba6da9065848609c31c91882e9c0276474941e5b8d60229722f745755fee57f92a8fe4fe5da7b4c9f2db6d1c5b1 SHA512 efa7ec4abbd61930267acdb4de2c17f121c6a78287760fbdeccd9591cf55e71fe434dfd04638056403a962d03897c10ec42aa393ca00bd736186c19542d208bd
 EBUILD libmaxminddb-1.3.1.ebuild 511 BLAKE2B 623f2664c2bd8474ad7848a0a570200990d27c66458d1add0d75ee8ceab3634dde68acf2a12a2aa545d1dbb65e16bb688f15429fccfbee02cb29c641f2f52633 SHA512 c7b69a68463c8a6fc38bc1c73f136a918c20b38a62a6ca3f6cd6bbebf173eaf63958f34aa47fc81f952a06f44b39bb6896f19f20ea123666f4cd8ccc50818a91
 EBUILD libmaxminddb-1.3.2.ebuild 530 BLAKE2B deccf5864aecf0e590e463aee9f5a1ff8ec0b4a3210f6954a55dc5f5704c4cece34bcdfb681b48ef4497d5bfae02cfb25581e0ca4dcafc0c55987febb13e0fe8 SHA512 86c592d35fcf463277735510ca1b459b594da019cc6095457d7b12e2fd491cc8cab1412ce42de1e6fe107d3eee1034dbc46347fcac8fc2d77ffc29e2a6bf70fd
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
index d826aa97a8a3..7bf6185fb539 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="amd64 ia64 ~ppc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 982585e8b3dd..475474d94a1b 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
-EBUILD libmspack-0.6_alpha.ebuild 1164 BLAKE2B 63ac6e7b99a635bafaff98867a3833f5de846f8ee88e434a61547b4e1d07fdf594a05acdb7b2e1664c56992e6f37f98c4aa6a2bef650e1f0f538af6b1ef6fb02 SHA512 dc63f55d9bdfde17c62279d1a76572b847f2e38757e66025d233bf55a863521584092ca936b52f38f1549ba6d651bebb945ef714b1e15da630216f8bae494755
+EBUILD libmspack-0.6_alpha.ebuild 1171 BLAKE2B 41bbf26a893cdc85f016d288d7374745c077e5bd72bed9ea870a9c2786c39ef4c66f5d5477411d67a03a142e14983356256ee09f7da2c71ad2b0872df5a47613 SHA512 e384b00cbc8dc3b150a72c44b8c1acfae1539e1a7a15751b9995780ed258b0cee9ddb55b56bddac3de3abe2f7dfe2abe0dd227afcd6a94ab9205af1edf2fee56
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 340e1eff032e..2d660ecef548 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 7cc9f4211a03..1119eb2c6cfc 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,5 @@
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
+DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
+EBUILD libp11-0.4.7.ebuild 791 BLAKE2B deee6654c2673641184da3254103cc92a88aeab710206ab9719044b269b943483abf8f4085e87c6e5dc10ed1fd782b0601f70f00c408befbf1ce88ec2cad53ec SHA512 edfd4f52afdd523f4da8df41146a75379d867e7b19abe5ddbc0660173d8ec28ee92458412aa550bff71fdd3615b111dd8fca7376eec6577c9f6310d8e0827889
 MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
diff --git a/dev-libs/libp11/libp11-0.4.7.ebuild b/dev-libs/libp11/libp11-0.4.7.ebuild
new file mode 100644
index 000000000000..ef1ce17e2ae0
--- /dev/null
+++ b/dev-libs/libp11/libp11-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl bindist doc static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable doc api-doc)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 206932103959..ce429f9f4335 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,6 @@
+AUX libpcre2-10.31-cygwin.patch 370 BLAKE2B 3dd868d520c6c4f7f64213ce6854a3d603c6dfd26073eb36238dd04fe7ffb46395ec2002a519269ee28a31e1510251e2d532c46307f0fa2b332cbfe7306b09ed SHA512 7e1eaa3f9a9284c6a21e5971c1c37d8d032da15e7cf98b4b7814e502a3c76221e6939c332ccab0fad5b812c7d9dc55b26532a18a57f6ed715fca3eb79ca95200
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 EBUILD libpcre2-10.30.ebuild 2335 BLAKE2B ffabdb786539182e475225186a21b27e1ef059e728af83696bcbf361d37cc98d13e124f4c51e89efbb9004e5a28fa9d0d995f5e21e469107adbf9ce1af6ca1f6 SHA512 89e37f6decc384fa5c499c3978a3eeae03144cf4340d94ec3e4f41fa507b57ad2f8ec2eb6a5dc37718e5eeaa37fad400077fe1d05c61f33606cc389b75dc79cf
-EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
+EBUILD libpcre2-10.31.ebuild 2402 BLAKE2B cbd62bb53513a121a65e576bac4a48064b575c6ba0cc31b64c211c11c34acfb39b7bfd7ad3c3a67d9c4497c8820e8b55cf32ee5a8bcbd7abf3456e6b7b2be32c SHA512 0f1fdb609859b949c1b4b87a7113893e405fc3b1407bdcc31800e39638d9ed87fc4a4cc578204c4cbf7b5c8559fabaed59d9ac421fcb5e15c5bc8eab0c23143b
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
new file mode 100644
index 000000000000..3f3a33b366ad
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
@@ -0,0 +1,16 @@
+https://bugs.exim.org/show_bug.cgi?id=2152#c14
+https://vcs.pcre.org/pcre2?view=revision&revision=939
+
+--- pcre2-10.31/src/pcre2grep.c
++++ pcre2-10.31/src/pcre2grep.c
+@@ -64,8 +64,8 @@
+ #endif
+ 
+ /* Some cmake's define it still */
+-#if defined(__CYGWIN__) && !defined(WIN32)
+-#define WIN32
++#if defined(__CYGWIN__) && defined(WIN32)
++#undef WIN32
+ #endif
+ 
+ #ifdef WIN32
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild
index b3366003de68..6cd15f0dac3b 100644
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cygwin.patch #633612
+)
+
 S="${WORKDIR}/${MY_P}"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0545ea27cc90..15b985c6a1e1 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -4,7 +4,7 @@ DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
 EBUILD libressl-2.6.4.ebuild 1431 BLAKE2B 84f8669b2e544e7f226969999abedadf72879296a07b736b080aa9e103ebd49a52c5ea1fcc6bb7008ab3870ee74ca7a3b9ae40bafb4b2a9cf8de314e62303eba SHA512 b15cc16115a1b8e46159c9b1e384df4d97107ab634fcdfd6fb048ace13eb0527a79763239892c36116bc3872f74dd5149df5e21ff071c4a43b409beb759abcca
-EBUILD libressl-2.6.5.ebuild 1438 BLAKE2B 72de0f0538220d7244c551c6eb9788640f52c4e78d462a4048730aa4be2d9ea3e19dbbb7f4f3502ed4e08d31b3436922b466dd52da1fb3464aa10082c2e94544 SHA512 0f1c7ab2e3a3a139ba87c95c173d3a9e929232f110b81d8e4a538fe500406ccbd4bf145e5ca58affe65df8bc0213a8bc87674f8c03c7af18b4bafa06e52db2c6
+EBUILD libressl-2.6.5.ebuild 1435 BLAKE2B ef210a64c51ed2fe196972e373006f04c487fd3882cd3dd55747b78374d2e0dfb0cb583a5bdaee64ea352d779787e06d7fe85f859984b718e9c9915eb63a81cc SHA512 62c4cfb225bf3194d34e9a2bbc197b81c0047edb56385078ff55b33af04be0d73807bbe1d80e7a7165bf527b17aa597accf57ccab44c4cbabe757a0dd59c0bb0
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild
index 9031ee476cfa..ea6984e7a5e8 100644
--- a/dev-libs/libressl/libressl-2.6.5.ebuild
+++ b/dev-libs/libressl/libressl-2.6.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index e0ec95fc8f86..00030d952101 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
 DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba
-EBUILD libsavitar-3.3.0-r1.ebuild 1016 BLAKE2B f81a89e2d509e44aaf12e483e5a855bae712c4b17ebd4b75e79296320c260f5a6f1bdcb89bba4b3729c6674c7cc6999e071e6750d430a6be2b5a4753f936ec9b SHA512 523b35d258d51151fb47a001e3531c21d5a604723bc963f9b9ec0d2284f210230e3957cf8ae457a9369dde60bc3a0e5c2a1dfeab62148a5ee5cfd2b55d65977b
+EBUILD libsavitar-3.3.0-r1.ebuild 1034 BLAKE2B b82848b61888ced896ee8c6a4aa4e121db0aa75303fd1470f52cc8ed9777d8544bd14ad4e2a172734b71550a15241073a7d3bd97934951f95c2c56ed4308dc1f SHA512 f1fec09df09fb5629de89ea3804119286dd1b2c81ee374671aa820cce89f5e74e2ede83ef6cce6d8830b17468949c06131f3b4517024352c50b874c8ff431b97
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
index 3aca6609e16c..4b686c7e432d 100644
--- a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="+python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
 	dev-python/sip[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 5c985829a284..b6073947b969 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,6 +2,6 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12-r1.ebuild 781 BLAKE2B e1f0c87a985e7a7ec432d1eeeaf8b7e201cdfa6c8ff0acc8294890e346e22430929582dc36bce40f8f2431acc093b066b1ec225223d3ae5472711666d8338f1b SHA512 6f4685cc5900bdd14b66121c2ecde758f69118f50c2ea434d717ddc1dca322c7de66d0c18cf9027b07a10a068c52460d2e823d61a716f1d949577165a8f5b81a
+EBUILD libsigsegv-2.12-r1.ebuild 780 BLAKE2B 354787b89238987e3c0457c4f8e13bb5615099966ab5edeea5ca991d07da275400f6747d2092b7019a3a0acef491c26ccd7165aaa0498685ef1032eaab30654e SHA512 fad0a80d4222d7451e3cbee5c2a9b7179b1601bbc28fd4b86d453228da3cea48d6167ef146a9fc1c55a5ad31ffc1a975e3dda4af86f8c9723cbc98c672042017
 EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index ce8dd71479c7..f989d9732643 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index ff48d3f7c5da..1e24cd31d7d0 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,3 +1,5 @@
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
+DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
+EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.13.ebuild b/dev-libs/libzia/libzia-4.13.ebuild
new file mode 100644
index 000000000000..faa975e860ad
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		   -e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 2dabc21a2b9a..b04977db4012 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,9 +1,11 @@
 AUX 0.8.1-api-version.diff 421 BLAKE2B 77cd7452029021c098f3d9a40a94e0af63a30c986148101f9b86d0dc416873f6081d8530001e9c478cf3c1b6d933fefee227987b9ac7e2305c82c16903259a24 SHA512 0ee058b1f16feef966cbddc9502507f8890d9a9ce5a6eca70bd0b831909d286caf7c09cfdded4ac97a28efda2215b11df8e9f747ace727b4b972c79841a7400e
+AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
 DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2 SHA512 10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
 DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
+DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -13,6 +15,7 @@ EBUILD mongo-c-driver-0.8.1-r1.ebuild 1204 BLAKE2B 1dcdd5945923fde34f50fba03998f
 EBUILD mongo-c-driver-0.98.2.ebuild 1692 BLAKE2B 247c26866b8eb10aef7b0894300157a7522d2e579d7c5f19022f086e0352afaca4d5f6a45f9eea94f99049b102fcca84bcbfa56a138ef8d6afc4cd44008ebe71 SHA512 b74806852fbc46322c52966c987d882866fcf551c865eac0bba641b4ccf0f7f4a2129feb3f610e4fa57d3a0be99f50cd1e4796aafec2a1d6ed851c16125c370e
 EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d2c72562542d5588c9219803ee408ba8106829945ab22d1cb64b49428f7a78991d086652f68bebc592ba5872f7aeba2a86 SHA512 3f5a4deeb9115b9a31b1229cf560f62d28611281fa76e1c2d043602f49264a0b75b67540a872621a72bb20bf3aafdfdc4b528aaccaf206ad538127bb69e8587e
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
+EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
new file mode 100644
index 000000000000..af26b6953139
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2eeb6cb..aeaa23b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
+       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
+       message ("--   disabling test-libmongoc since using system libbson")
+-      SET (ENABLE_TESTS OFF)
+ 
+       if (ENABLE_STATIC MATCHES "ON|AUTO")
+          find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 51514ed..accb251 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -18,7 +18,7 @@
+ #include <bson.h>
+ #include <bcon.h>
+ #define BSON_INSIDE
+-#include <bson-private.h>
++#include "bson-private.h"
+ #undef BSON_INSIDE
+ #include <fcntl.h>
+ #include <time.h>
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
new file mode 100644
index 000000000000..e2009f3e717e
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	>=dev-libs/libbson-1.10.3
+	dev-python/sphinx
+	sys-libs/zlib:=
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		for f in bson-private.h bson-iso8601-private.h bson-thread-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
new file mode 100644
index 000000000000..f5c3bacb3808
--- /dev/null
+++ b/dev-libs/nmeap/Manifest
@@ -0,0 +1,3 @@
+DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
+EBUILD nmeap-0.3.ebuild 1150 BLAKE2B ae0492569c3ade809f666742abf3dba71fb0d4f0421d1777edfcf129a3c2084a7711b0bb12b1da3d9d2736a5d7f8d6804f3ab55d2ff46e66e1bfc09ed9d87cd8 SHA512 067a0c9a5a9834ac05cf659e4e0f13ae82aaa7b64182a67c8de0f47a0af4d4dd5dad30ee652432fe9ab8e0dd43689e867a1e2c45318aba39451a1f203b15ae9a
+MISC metadata.xml 654 BLAKE2B 523e88d73eb697049f2ac07c0ee3d42afc2e5f349f32e872d3671f5c70f5122565c108fb869b4a93644f55af82dd488ab85a38480ca68ac7481a63c4791e33d5 SHA512 84398ecadc7c15731e396625fd3f428760bb3797cf35627fffc96d741b3328582b75a4b80d510bfd44a81e1659b3d2a7757d3ce5998573e11641fff3c55d64bd
diff --git a/dev-libs/nmeap/metadata.xml b/dev-libs/nmeap/metadata.xml
new file mode 100644
index 000000000000..10629cc31d68
--- /dev/null
+++ b/dev-libs/nmeap/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nmeap</remote-id>
+	</upstream>
+	<longdescription>
+		Extensible NMEA-0183 (GPS) data parser in standard C.
+		A directly linkable library intended for applications
+		that want to embed GPS support, like app-misc/lcd4linux.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/nmeap/nmeap-0.3.ebuild b/dev-libs/nmeap/nmeap-0.3.ebuild
new file mode 100644
index 000000000000..50bc2004a9f4
--- /dev/null
+++ b/dev-libs/nmeap/nmeap-0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extensible NMEA-0183 (GPS) data parser in standard C"
+HOMEPAGE="http://nmeap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	# Repsect users CFLAGS for the static lib archive
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' -e 's/-g -O0 -Werror//' src/Makefile || die
+
+	# Don't build test programs, they are not needed
+	sed -i -e '/TST/d' Makefile || die
+
+	# Silent output of Doxygen and update it, since it is quite old
+	if use doc; then
+		sed -i -e 's/QUIET.*/QUIET = YES/' Doxyfile || die
+		doxygen -u Doxyfile 2>/dev/null || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+	)
+
+	emake "${myemakeopts[@]}"
+
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dolib.a lib/libnmeap.a
+
+	doheader inc/nmeap.h inc/nmeap_def.h
+
+	if use doc; then
+		local HTML_DOCS=( "doc/tutorial.html" "doc/html" )
+	fi
+
+	einstalldocs
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index ed491682b234..7000ca023a0b 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -7,7 +7,7 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.13.1.tar.gz 1136646 BLAKE2B 68a756f16f3bed7b75e26ce67b8216b06a61c71f669f29970ff6caec624d39a98496f22e643478b20d1bf2b3e753dd4a98aa5fc685929cbece365dda7302a6d0 SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
 DIST nspr-4.18.tar.gz 1139663 BLAKE2B 96c74e0b04f26ddb20e807912804c5be6f0fb19fef18da6e1827ef09a28142a1db747332ac3574c3759b34912d0ead26993c0208651d0e4d7800e23fd30ded39 SHA512 4ee9eb561f9c09f78681f8d262ffc3b3ec3395e181ce7b7c5d6c565885283180e5989b142d64799f9392ddf28bdc6a38d3ed6ca079fa107691fd5c758d4f7078
 DIST nspr-4.19.tar.gz 1139967 BLAKE2B a8358249647a3d0e073f00febc475199d6479e2a34bb8255268fde90f0d3064ccc4b03e012231700ed6d75cd44669b6ea8afa5e760bad1d73682cd9eac1f8432 SHA512 45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844
-EBUILD nspr-4.13.1.ebuild 3866 BLAKE2B 7504b91eca6e5dc35d7487c04b076b06273a0f5b5dd7d7120ab2465b91e3d18fc36eedb4ace539bef574cc3220cbd322682aec0941e99415177cd67a67b2a2a0 SHA512 03541753a83ab78d8230c11289cf9125621a6ed6bb1c3f15e0f862ab89e93ec986720bd1a25f0e9cd6dd6f73e8b804ec0f5ccc61a8ac7adb9bd1f6eafe99bfac
+EBUILD nspr-4.13.1.ebuild 3865 BLAKE2B eefd29695e1bf4666d2d3f99193d09566d7bec69cec353779ca612bcddc89d4f8d47607446e6286a6d80dcdbd01e4879546f209f32c2a1379bd04b757ae481b1 SHA512 594efb0fe957e619cb41c90c1d414dbb3d8c24e26cd82ef752e97dc220f2a9ae85048a1bdfac4712b931b265ef27f3108f8837580ed35e3efd401340403f36a4
 EBUILD nspr-4.18.ebuild 3860 BLAKE2B 279aef46f5bf56118ecec03f67b435d5e753520a52a2896ed4cfccc40bd8a39e14d316e8d4a17c0ed50099e1655fe945904eea1686f9d74b1976ad31b19d6fcf SHA512 02a36869d23567de14750cfe8348a68804218e94ec678719f631385aa7210469e91eb69514adec04cd7ec2905cf6f204726b52fa7d529c3b19d4931b1fd30ce1
 EBUILD nspr-4.19.ebuild 3860 BLAKE2B 279aef46f5bf56118ecec03f67b435d5e753520a52a2896ed4cfccc40bd8a39e14d316e8d4a17c0ed50099e1655fe945904eea1686f9d74b1976ad31b19d6fcf SHA512 02a36869d23567de14750cfe8348a68804218e94ec678719f631385aa7210469e91eb69514adec04cd7ec2905cf6f204726b52fa7d529c3b19d4931b1fd30ce1
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.13.1.ebuild b/dev-libs/nspr/nspr-4.13.1.ebuild
index 37480aac7750..6bc28a907334 100644
--- a/dev-libs/nspr/nspr-4.13.1.ebuild
+++ b/dev-libs/nspr/nspr-4.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=""
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 4ee6844b8f6b..91869c3e2cdd 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,7 +8,7 @@ DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333
 DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
-EBUILD nss-3.29.5.ebuild 9188 BLAKE2B 75e8a0508e7355b4ed624f5b003ebbe99d8b170055aa1f2de2564762a35ca2afe836bf9313a8ad35e26b793c786cf4b98c3e49bed77385c2b35547e4c45d03d9 SHA512 fc184b2babae5168d02cbd78bf81298d616c149a5870f320ac36c8e4973851b943de7a6641bbcfee1f1153bfafa6a4832c0dcd7d47ee2a6b13facf118ce9e0e3
+EBUILD nss-3.29.5.ebuild 9187 BLAKE2B f2c2a4d1470950405afeb2acdec4443818406ad60f85fd88dd399efaf30b62c7bb2e8d8002cd6c1fb1a7e3e3af6e85c953db10d0e2340d64dbe3dbcce1379219 SHA512 b0244c44bfdaf7f24fb36aaba4c9efea40d4e9439df81981b9f83f5f415aabcab17ed1726f0ab55729b82f8198b4b39c699eef4422259e95262f7a7f69f64802
 EBUILD nss-3.36.1.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 EBUILD nss-3.37.3.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.29.5.ebuild b/dev-libs/nss/nss-3.29.5.ebuild
index c758958bb937..3c5afbacf3bb 100644
--- a/dev-libs/nss/nss-3.29.5.ebuild
+++ b/dev-libs/nss/nss-3.29.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index b86fbced1412..3876d75fa228 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -3,5 +3,5 @@ DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
 EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
-EBUILD oniguruma-6.8.2.ebuild 978 BLAKE2B 63de756a2eff6deb1f2f9cdd4727d1f805b748a9a6cb7ae4650a1c898192a769aa4c47cfba3df9a3c69ff7918642e52bd0a6d4baa21790ff075de202d5c9d6aa SHA512 a8fce2c4e081e0f8cd2632fdbfd7a5be87f83b68275141787866dab7c336f4a202c50d89a26c7dc517f4cb688299b0f735ea6f0d0eb07506fe3ae0cba63b2d85
+EBUILD oniguruma-6.8.2.ebuild 977 BLAKE2B 2d931376c4f8e0f3edb23e1d695c4633ded150ebf0eba900aecd4dffb6ff5f2b80c0e77c98607f6a1c01857715c98277a3dfcb7d48cc2183d5b4e63afc197fa1 SHA512 adc4abb961b69d55088c10112fa4c18f9df8b04c1e9f29bcd45f145c32b6c6b9c779745cecc1681e6b06978a23e52acf3ef1e3a13eaffaafe1f62a09dc645276
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
index c8d8f54c0eeb..2b05c0720e32 100644
--- a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index d4bedf37a09b..abc1ad84a75a 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,6 @@
 AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd42e2893cf540484fa6b3bd914400c2fd39067e8cfc29d030691fd0e4e4fb83b229bc2c03085e5df2f0 SHA512 3bdc6d2f87b2209163ad08915afa900f9c14324d3e48619cffe462c3c651996fe0e0b485eb6331552fcb22297cfa7bda9b6440a8bad9419d6835a047f1b2a0e9
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
 DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
-EBUILD opencryptoki-3.4.1.ebuild 3168 BLAKE2B ddaa0ab6da0c8fe878715eeeb453dde6620068b76d25ad976419fd94a511a6230321d6fe5c80ec0254fed319f5bfa45799b4422e9594b8bddfc62096c61cb2e2 SHA512 eb08ca2434ba2deabf7c76318d0743b12c72fb7c7cc00b614fa26834d28ae4bf1ce9ddf6f1ca4ab2ab5324dac5201f3d985939e846f8e1298f110c25d92b26ad
+EBUILD opencryptoki-3.4.1.ebuild 3174 BLAKE2B 5ab81d00513d55ee8c188407bc9a30f9ec05f1d24f8eb3e982214ab394c87cf3b413bb76e59a578d4dce349453cb10e70997dd88d96dfe550f27eb9aad741448 SHA512 076a6d9c12ca0548491fc4d1a0b39ba153f40432374b3ea8e6c870d4fcb8bdfcd7af6d12dd6b05f0ca2976d78f19d6404980fd12a3058dd911854f2f6174fa59
 EBUILD opencryptoki-3.6.1.ebuild 3060 BLAKE2B c7bd97265e5143f5b9502b49c28bd762ad83f5ea1f37975ff9ac9a9bf7dc57f07a6102d26d10ec323c5acc07fe8c010379d2b2eacad81197f5360e2689a56617 SHA512 83afe598c8cd2180f365110991415da4ef3ba0a3a6ec769b17c1093d9e8592ca3c945f186525966c9564d8a49aae901aa2dbbab194ec3d64ed73db15879d2190
 MISC metadata.xml 448 BLAKE2B c471621f15b751b55dd75e9b62d961bcb52df94359ae901119be884dbec71e41ced8bc3ddf9af33b70a78aa0c0ef6927a92d44e9901124ad5811b6fc38aa9fc0 SHA512 a325026f45754e53ae94b7a8d9f5836ab4974a4535a5492727062ee449ecb9d542e04f103662111b9eb3956be7fcad32189f4470b3d8e8c110e0023ae93318d2
diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index f0786c997b52..c2724bc8d3ed 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
 # token sources are under CPL-1.0 already.
 LICENSE="CPL-0.5"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 784fa3175082..c1a6e7a4e4b4 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,7 +9,6 @@ AUX openssl-1.0.2o-CVE-2018-0732.patch 1194 BLAKE2B bd06c5b1289f7a3dca52bbfab7ae
 AUX openssl-1.0.2o-hobble-ecc.patch 11987 BLAKE2B 28c1217e500a9d6578dac3ee8aeb08f6e3b1d2c6749336ef05e4142828c7c4b176ec16707dcbbf97e1e2e91d51f85f2a02c076cfcc8bcef1aa9d3fd5ba50eb6a SHA512 817a5a1cbab171d9e6d3fce9c612985d2ce3f9f0b3781b3681ef42da1ac6389d8a8a11e6d696eb7f051d3bfc2d045f1999cc4076d1257b10e9fb65620aee3ee2
 AUX openssl-1.1.0h-CVE-2018-0732.patch 1192 BLAKE2B 4a13508674020519756b3d33530673527f31a66a731bb79a6081692901a7d0bf7e6e9345d7a9613407a485f4b7961de26e3c87c1cd76756449821ae4b890e472 SHA512 27d55677ff3d60cf7ae0b8f1a5fb8ab529fc9d3e7072eb4cfabd2b50aefcf9cb88291262eccf68efc44a432ba25424b25dec40dc03bb85b7c6c3003260cd5012
 AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
-AUX openssl-1.1.1_pre7-CVE-2018-0732.patch 1237 BLAKE2B b1cc71eb69cebc87aa1673c98534e8b478a836b504dc3695993908fd836c485e78adf159ca9093945cec5c0b689d63a8fefd770c9a35be05ffdc1b6dcba20e91 SHA512 f2c3314066043a795325913dfb57538e701a7cde673abb34eca3f46a62fb875b25d1028b8936de7c03940dd38497a6255accc0c9dc742b933dccb463958c31aa
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
@@ -22,11 +21,11 @@ DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd0613
 DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-DIST openssl-1.1.1-pre7.tar.gz 8308876 BLAKE2B 621cc6c541d81c2fa62e12eb75b62f1444af2bc1fcf001620515810700eacc3b36975a5b0c4764fed78c37ad1c9ad78b94f5115794b929626b085ccab15d9ab0 SHA512 38efa67b26e83a4dcb6da2d61d92b6be890535c61cec23d781d49efe66173fd9b9185b89ba50d591fed65f440417e16ba0738ffba58a684e48e8b82032ea36ff
+DIST openssl-1.1.1-pre8.tar.gz 8334954 BLAKE2B 97cd018908925abd5a4eb660b3488b23efb582dd49dd87504e5522b2e9c5c6500417ef4893590a60ce35cfa316de51bfbf3e448e9cb2a5858ecd8ae72722922d SHA512 33b20f8589e0ba67500993635e1ba7f7f7ce2b6fa1eb8d4d7c44711ff047045dde57ad7e0605377c2b030fc954a3fb9b1f1d68feac2080991ef2b1b72a761041
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
 EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
 EBUILD openssl-1.0.2o-r6.ebuild 9818 BLAKE2B 193ff450b056ceb4a496d79bd8afa1f2313918eb703de5e8c79375180ff385751f2bdd777a35d1e9d793ce3054703e785f73dc5941b0a05a4a18254d364a0593 SHA512 a15e7bf3d03c6c5fd8d9eda699d82a15ee693417844a328a0eff0ffc80593d783f589a253796dcd416496bb454938706157e85574eea7461e03c173ebef12040
 EBUILD openssl-1.1.0h-r2.ebuild 9198 BLAKE2B a65f3b3bc4104901ca271003f3363596279077273c0b2cbfd5eb54fb315db0974269673abedef3de103b2d85d436ab167cb973ae4d546ae2a4ebf4ae5f60599a SHA512 82ab0bab945bbb723c5329376c629e9dab88dc8f81d74e201f428bc5fc519d677ea21807c2d32d3517657a80db24e71170a4bed4ef4cfb25009a4d32ea9b15a3
-EBUILD openssl-1.1.1_pre7-r1.ebuild 7627 BLAKE2B 1b8929c2f8395d8296dd37f4b543eee3c49c378f6292587e7db7346d6f587d58a2d8279813978aec39fad867b872cdd8a5511233acf190c32fdf879af2b303bb SHA512 84e4a8608dfb52c6d10c74cbc80175632f35ed52b6befac88e9f27add5612933120f7d2f97c535c3a6d62370040d26614e6a0b9f2101c81637942d2146a866ba
+EBUILD openssl-1.1.1_pre8.ebuild 7652 BLAKE2B 8eff1ae544126b8a1ebda7f5d13ce8d18ae8a5ecd8b58caf8bea6733c8a6e879ab509a60e8d13871f27ea38a6a5e326d23b6a06c7d02499f04b5a1cc87bfd88e SHA512 14e1db47322d86f44c15d07036f2f7a56b0156b6298728a33b72a5a89dbb772d8ef7683900195eda17a29b64ea19d181729a04c912ff3c7fc05f7837b08ef201
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
deleted file mode 100644
index 6c336f2507a7..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe Mon Sep 17 00:00:00 2001
-From: Guido Vranken <guidovranken@gmail.com>
-Date: Mon, 11 Jun 2018 19:38:54 +0200
-Subject: [PATCH] Reject excessively large primes in DH key generation.
-
-CVE-2018-0732
-
-Signed-off-by: Guido Vranken <guidovranken@gmail.com>
-
-Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
-Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
-Reviewed-by: Rich Salz <rsalz@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/6457)
----
- crypto/dh/dh_key.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
-index 6901548ed69..752542b5563 100644
---- a/crypto/dh/dh_key.c
-+++ b/crypto/dh/dh_key.c
-@@ -78,10 +78,15 @@ static int generate_key(DH *dh)
-     int ok = 0;
-     int generate_new_key = 0;
-     unsigned l;
--    BN_CTX *ctx;
-+    BN_CTX *ctx = NULL;
-     BN_MONT_CTX *mont = NULL;
-     BIGNUM *pub_key = NULL, *priv_key = NULL;
- 
-+    if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
-+        DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
-+        return 0;
-+    }
-+
-     ctx = BN_CTX_new();
-     if (ctx == NULL)
-         goto err;
diff --git a/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
index d7246b0d043e..3acbe2ea21f2 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
@@ -14,7 +14,7 @@ LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -36,7 +36,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${P}-CVE-2018-0732.patch
 )
 
 src_prepare() {
@@ -146,6 +145,8 @@ multilib_src_configure() {
 		enable-idea \
 		enable-mdc2 \
 		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
 		$(use_ssl asm) \
 		$(use_ssl rfc3779) \
 		$(use_ssl sctp) \
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 58e8242f2eef..7d18c975bacc 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,5 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
+DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
 EBUILD quazip-0.7.3-r1.ebuild 1153 BLAKE2B 8eade14de50d7cb1d107047a4499a729c3485b63401dcda2ac2582d189e8623873475ca4e26ee38f7fc9cc2826ed610f12ba56e39da07fe73da42eb6013a725c SHA512 c136346ee3d3da176fad5458a82cea7d9c98c0e78084238a6d17c308daf3a155244f83d01e318c36829233518632167819b15424fc9a0f27fcb7d2654556296b
+EBUILD quazip-0.7.6.ebuild 1132 BLAKE2B 8a79c2b24759fcc6f456b544b4748b202b600c4491a77ba2d23798d3eb31de2d88a9300193c43b4091540dee0a73e78338494774905758e2d17271741fd9b38b SHA512 63028fceb0597f08988199ac2a475c138bda5892289bb6ca7af966539fb6aa4ea3095853088a14e2d6f64096821e6529eb4062fdf244189cdb289f68b13efdf5
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.6.ebuild b/dev-libs/quazip/quazip-0.7.6.ebuild
new file mode 100644
index 000000000000..e9f4d698d203
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.7.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic qmake-utils
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if ! use static-libs ; then
+		sed -e "/^install/ s/quazip_static//" -i CMakeLists.txt || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local -x CXXFLAGS="${CXXFLAGS}"
+	append-cxxflags -std=c++11 -fPIC
+
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DLIB_SUFFIX=${libdir/lib/}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
+	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
new file mode 100644
index 000000000000..4a19630cc175
--- /dev/null
+++ b/dev-libs/spsdeclib/Manifest
@@ -0,0 +1,4 @@
+AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
+DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
+EBUILD spsdeclib-5.1.ebuild 1029 BLAKE2B 65695616f1bc264cd585b93711d3a9f3b2e8433202176f46385f5d6a455302b872ef0fa93a5ef890098c6c1bea10e770efa66a13d90838900346cc06a749ca6e SHA512 f217e9898f7cfa87a0d72c70f0a7e597724df95fcd95363ac71200856ee75c55a7980bff1845bb3a724fe08a491173528465b7e33f0dca6ace202dda086ae1c2
+MISC metadata.xml 564 BLAKE2B 12f28c6acaf31c25b52acaf1bd5853216ffb6f0924c9f815e814c56b50aa657603ef0f3e0e89daf072e463feb34c135d59c7351174bdf3a4b347215937311ce1 SHA512 42781e4e7c15a066141221c92421c174dbc748de3ef94cd419d23c0c9ff85cadb90295543d126362ca8e346ba5171ec3a527a46f6018d0b16beda68c7b432b45
diff --git a/dev-libs/spsdeclib/files/add_symlink.patch b/dev-libs/spsdeclib/files/add_symlink.patch
new file mode 100644
index 000000000000..1de74ca923e1
--- /dev/null
+++ b/dev-libs/spsdeclib/files/add_symlink.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.in	2014-06-17 22:55:04.000000000 +0200
++++ b/Makefile.in	2018-01-07 04:07:07.865950231 +0100
+@@ -15,6 +15,8 @@
+ LIBS		= @LIB_LIBS@
+ 
+ LIBRARY		= @LIBRARY@
++SYMLINK1	= lib@PACKAGE@.so
++SYMLINK2	= lib@PACKAGE@.so.5
+ OBJECTS		= @EXTRA_OBJECTS@ ../Codec/CTRawCodec.o ../Codec/CTRawCodecDecompressor.o ../Codec/DiskEncoding.o ../Core/BaseFile.o ../Core/BitBuffer.o ../Core/CRC.o ../Core/DiskFile.o ../Core/MemoryFile.o CapsAPI.o CapsFDCEmulator.o CapsFile.o CapsFormatMFM.o CapsImage.o CapsImageStd.o CapsLoader.o DiskImage.o DiskImageFactory.o stdafx.o StreamCueImage.o StreamImage.o
+ 
+ 
+@@ -50,3 +52,4 @@
+ install:
+ 	install -d $(DESTDIR)$(libdir)
+ 	install $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
++	cd $(DESTDIR)$(libdir) && ln -sf $(SYMLINK2) ${SYMLINK1} && ln -sf $(LIBRARY) ${SYMLINK2}
diff --git a/dev-libs/spsdeclib/metadata.xml b/dev-libs/spsdeclib/metadata.xml
new file mode 100644
index 000000000000..29b8f4c73b66
--- /dev/null
+++ b/dev-libs/spsdeclib/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>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The SPS decoder library will load IPF and CT Raw files in the emulator of your choice.
+		Kryofluxes <pkg>app-misc/kryoflux-dtc</pkg> also will need this.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1.ebuild
new file mode 100644
index 000000000000..22f948e91481
--- /dev/null
+++ b/dev-libs/spsdeclib/spsdeclib-5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Kryoflux SPS Decoder Library"
+HOMEPAGE="https://www.kryoflux.com/"
+SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="Kryoflux-MAME"
+SLOT="0"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
+
+DOCS=( "${WORKDIR}/DONATIONS.txt" "${WORKDIR}/HISTORY.txt" "${WORKDIR}/RELEASE.txt" )
+
+PATCHES=( "${FILESDIR}"/add_symlink.patch )
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpacked ZIP-file contains two ZIP files, use the one for Linux
+	unpack "${WORKDIR}"/capsimg_source_linux_macosx.zip
+}
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS and CXXFLAGS
+	sed -i -e 's/-g//' configure.in || die
+	sed -i -e 's/CXXFLAGS="${CFLAGS}/CXXFLAGS="${CXXFLAGS}/' configure.in || die
+
+	mv configure.in configure.ac || die
+	eautoconf
+
+	# Fix permissions, as configure is not marked executable
+	chmod +x configure || die
+}
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index f89fb15f3eee..d263b46bfba9 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -2,4 +2,4 @@ DIST unittest++-1.6.1.tar.gz 52536 BLAKE2B 0a5e7cbe1131565631c0537a1a262b6053b50
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
 EBUILD unittest++-1.6.1.ebuild 784 BLAKE2B 180ae7fab2784dbbbaeeb05d7564e2eeaf4f2e17cebb1c4727ff575dffcc1c0e8c3e0d3e60caab5a7cc5d7f4b8a3c3171e4fe1f3593a9a4ed01b0e10c0e40d01 SHA512 625f414a32c4b0614ed7acae5772717efa108d1b6dc8341b55dc4e1ea88ab91c6591171cec81cf3d097f3ca887250c11d656f1fc914de55ac9534691e25be73e
 EBUILD unittest++-2.0.0.ebuild 830 BLAKE2B de37ff1bfc114e10da9e40501f4c08a76ca2173de18004fdbb9a062f1de0cfe8c388ec7d1ec52daf3db9d3154bec8137b69807d69631260918a71634e2884cda SHA512 349b77efe280e25d653e7dd90195281c1f7c46fb828f6479f5a416c669ad7e3cfe46c653e73210c32d2033862b900f179c88b9292c898f5c3e51591d21eb1245
-MISC metadata.xml 532 BLAKE2B e3c0bf4b5bd32990cb8764d382d85d5b32e2195fca42134c2574dc7a164b5bd03a3d8555105f9f32a7b517d7ea57e07de99a62f83df35d2c6a07241a8e75d115 SHA512 191234f1ec8ee9134fced773ceedde3f0e2c14b5e8b02e1ba4e72f99c1a8758680bbd412b724621e6a1ad1964e15b3bce12520e2816aa38bb8c1555ef47f8580
+MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/metadata.xml b/dev-libs/unittest++/metadata.xml
index c2fe10f554df..295c6be753c2 100644
--- a/dev-libs/unittest++/metadata.xml
+++ b/dev-libs/unittest++/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sautier.louis@gmail.com</email>
+		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">unittest-cpp/unittest-cpp</remote-id>
 		<bugs-to>https://github.com/unittest-cpp/unittest-cpp/issues</bugs-to>
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 78c7961fcb4f..1200fb54b7f1 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,3 +1,5 @@
 DIST xmlsec1-1.2.25.tar.gz 1839160 BLAKE2B af480affa84c47c5656889c8114f147e1d9a5ad0f9a494c8913fd180aa5e2cba4773451c4a5f41781026e7617cccf329057182fc3fc3f2bd4e6f007cbe8ac190 SHA512 ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
+DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 EBUILD xmlsec-1.2.25.ebuild 1480 BLAKE2B 9bd318bfcc77816da5daa4b1fb0ad6171be99fcf9d25e0b3efb25b961f8f80b7fe633dc359e686688c9a947d460ac4b54642573c4f2d14c2862a97748add2d88 SHA512 76395779c179b42bd9f86fed6efcf8c849c0e76297158f8cd5883fe034bdf94a7ff54c1ea88bd4bfa52d495be3960c0b36e1cac0b52fa6b817d7074551dfa1af
+EBUILD xmlsec-1.2.26.ebuild 1483 BLAKE2B 55593f4d4b5da90588f3c649f194211f593952501e63c14bcd4e69fae3944872c384ed582194f5bc1730c78baeb74e1d74655ddcef62d98227bf2823befdc9ce SHA512 157843ed0b4e18953b474266d4ad6fa887e16a8ecd0745aae846fc143f2cdbf7bcf27e7f4c84aa8c7ce42127b89a87566a1a92144051e9f192fdc93721965ca6
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
new file mode 100644
index 000000000000..70e0604bb856
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.0.20
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
+	gnutls? ( >=net-libs/gnutls-2.8.0 )
+	nss? (
+		>=dev-libs/nspr-4.4.1
+		>=dev-libs/nss-3.9
+	)
+	openssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}1-${PV}"
+
+src_prepare() {
+	default
+	# conditionally install extra documentation
+	if ! use doc ; then
+		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-pkgconfig \
+		--with-html-dir=/usr/share/doc/${PF}/html \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt gcrypt "") \
+		$(use_with gnutls gnutls "") \
+		$(use_with nss nspr "") \
+		$(use_with nss nss "") \
+		$(use_with openssl openssl "") \
+		$(use_enable openssl aes)
+}
+
+src_test() {
+	emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index e77ce31c0a19..d7aa56ba45bb 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,4 @@
 AUX zziplib-0.13.49-SDL-test.patch 392 BLAKE2B b09eb8e5fa14dd4936e1235ab29e8730182e25b5c2811851a99fbe95c9fcc6a7274bffd41d490bc9c7fece866ded73260d85c94ffbe43c9075a614e038a39d18 SHA512 b5a3e6e7fb4af7ab48a9aa26bdecbde6f3345ee3997c810fafa3d0e348ea0aee9247ae7acab7ccdc3fc1b9ab62daa7f29ac54862013206de8dd094361dd6facf
 DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
-EBUILD zziplib-0.13.62-r2.ebuild 2184 BLAKE2B 11de607fee71e540170ff9e4a776204113a573643776d14b08f314da695bac726da897a948edd01f2b1713d5fe29e79c14e2de20c424724eb7bf3e77a11e7e16 SHA512 dcb8c0707bc32bb7a27b08e45163b994c31444127258d3b211c25c1f6192639356f9953898c72c8850d88f99b8d77b418445f25a0d925f1b21a1d924ac332326
+EBUILD zziplib-0.13.62-r2.ebuild 2183 BLAKE2B 3d46cdd0afd006f807c8015b93214eec481d120d200a9f92e03176d9ea7d95988fbd10fc6dbdf655c8e73b8f809eeabd39703a9d9cb24261a14ad6f4022fbd53 SHA512 39fc10a12b8374a5b737fa0fbc0c229721ddf3f8a30d3a987633d5890e63a76b4b358a0803517e209365a804a67dcf7af37159c28f8e7f315c6ba1d1d1a0f838
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
index 83d49e733a5f..6b1da7bf50b6 100644
--- a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-23 07:00:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-23 07:00:28 +0100
commit	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree	5a4ac448a3b288b731c24d947e0ce52df3cab07b /dev-libs
parent	8187a741807f3e9a9e26304973cf18087dcf2560 (diff)