gentoo resync : 08.08.2018

35 files changed, 407 insertions, 99 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 09d7022ea7c9..9ee03ab2e711 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index eac6d2260967..bb37b22ebc7f 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,7 +7,7 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c1169
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2668 BLAKE2B 12e4ec730bd82c38086c7b6516353c3d884cc6578f9b73a9d671b409ac1ac1e2c575887252c762b2df2323c098e89c134030850a7919acaa4ada20809d303557 SHA512 3e59792f8235d1f659abfff9be27b69384b01c1bd6cfc6fe15bfbc4d5da0860a12bfe13dd3c506d132695ee739631a413e5f4d70ac481f3348e9c4f5d90d1f57
+EBUILD beignet-1.3.2-r1.ebuild 2694 BLAKE2B 97cb62df2e7dbc7647e5a81c1056350f53992715d3904b9b1c55cf78e853124ef9d77f4a1d6b5303039593a8693e668a6de354bd637f781b931b09a093bc42c9 SHA512 696d0b6df900197e4b6b765549f0441ce29afe4a89be86041d5f1ccf984428d84810570a9d2c2d00f501afb977b416ec00aadd9531b8d803aca8efaeb4ed0ea1
 EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db
 EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index c562b68c13b3..7975dc31d3ce 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
 		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
@@ -96,7 +96,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 3b1307f37d01..d433e4d6bacb 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 7750 BLAKE2B 19ec378a1212a5c20c768037e992d62dbf234bde838292f51f4dcfec36d32b0f505dbd5057deb304d40b211590ec67c3b56f19f264f3b296fe506254a4e920c2 SHA512 11a244bc643269e84d4ba59bb43b68622340c9be4c25427a6c5e17083c81f8c6a836322eca05478cde9d12908ead7c0ac94a17e6094865e0fa89771ade1b3cb1
-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
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7752 BLAKE2B 3b242e93223a6538e456a96f42baae31fc097cfcd198030d0a2f8da4971a30c6e457f35a78f9cf98ba32c523f5edd5184d201c49ed62b8cf6fa328f68caa8da5 SHA512 d111f3ddf99ec9bb1439e3f3894cda00f257f312778475d20ecdb80d469bba2b91c70c6b9b05df0e2c737768469351a770254976d7db9fa0f44c953e35cac3c1
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8403 BLAKE2B 6b23212c3187228fc5bba149368ff67313a4ef7e902d4bc2f9d894e645a31f0de2798f45c10a392f093d0221aabde050cadae29ca71b6fb78e36eab35463918a SHA512 796e8c3c834a5add924aecc6fd5b3ddc9204621198b6a20c39286aa719df58ea9ca14f551ef8da946aec1bbb1915fd8fc52072be841a77e7b714389a1eb2371e
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 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 714f49875667..a6aab9f3729b 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
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
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 40f3d8655566..582c8463da1e 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
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
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 1179bd79125b..023e07bfe40a 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
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 795da42bfeab..9ab3201ff42c 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
 DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
 EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
-EBUILD ell-0.6-r1.ebuild 754 BLAKE2B c088f1e6e25cf5db76d1a6b74af9d059c8c2e5e77b4450d564e0d8ec3f8bc0bd078ee8a08d8db998d8c7bd532c8c66984e33d16d28950da35d2242661353d678 SHA512 f8d8ad907eee487cb02276835e2ac9d46182eb40d2871bcd8f1a82ac23fa0c83dd6e3a4efed43953f763110aa89e4cc2361f654b06dc248d92f60011328b793e
-EBUILD ell-0.6.ebuild 706 BLAKE2B 2ad1313da1ba1ad119013b185f59629e59723eb12cc0796b0b93db7500e96a107bad83eb0bc278555aaa4a58002f824303f2a706116ed01c96767573d1de59f0 SHA512 658e48ce434ed709ceb1c3803cba9aab2002960810d10ecc98aad01629fe50f6a3c02f0a9d3853d3ded652a2a7edc423c13c901f601d19b040a26245548b69e6
+EBUILD ell-0.6-r1.ebuild 761 BLAKE2B adad8b4b8c0691fb5ee832041183f9fd6d48c4bde90e08c706ee41badc394892d77f85cb382d677ae31af34bff8a31966bea341eeda48d15e18144b4a585f702 SHA512 0a971cb5de632396621f3d4854ad33bc529348a8a7aef5625d89886e1984391d4bd5fba05c646b831b2b8734172fef773ee42236cc4ea302b5ac5630381e9f47
+EBUILD ell-0.6.ebuild 713 BLAKE2B 82bbcf1bdff172c0db3d90e1339c2e7666ea21936a4180b20ebaef6515e035f461da3b0afd8c2d43897ce64702dc924c159fdfc21e87c54cd7b1ba2df25d5f38 SHA512 d2ceb939d7f51d3191908b1df17dacec48c48a68df21f6a192818a7d2081e5122b00c0b03b73f612364071a7e901aa56cdad56ea00a7cb7ecde6191ac14b5668
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.6-r1.ebuild b/dev-libs/ell/ell-0.6-r1.ebuild
index 937ba6d0dece..c3776ce019cd 100644
--- a/dev-libs/ell/ell-0.6-r1.ebuild
+++ b/dev-libs/ell/ell-0.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/ell/ell-0.6.ebuild b/dev-libs/ell/ell-0.6.ebuild
index 6289d4e1b4e0..5c7f1002ae5b 100644
--- a/dev-libs/ell/ell-0.6.ebuild
+++ b/dev-libs/ell/ell-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index b6aa7269d60b..1a622522b426 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
-EBUILD libbytesize-1.2-r1.ebuild 1121 BLAKE2B adeb34d6a094c98baf2cd24976d9f6c43fd5017487204e3a71cadb5f4faf5d5ae6ae86e03d9cb39c96514f82ffe4ed7951907ea6e415412b5d014e2e2b9c2ee2 SHA512 2bf66f52f179def0671d5e82dbcbf060c729e1cb8927ca166df8095b93d1d741096fbecf0012f1e96ba11758e35fb0c63ea8a0eff18a65673f50beab1914b183
-EBUILD libbytesize-1.3-r1.ebuild 1172 BLAKE2B 1259bfd64dc643e2b0be00996498b8a4cee7d855b8440051aed230c4627e2d456b215286f14838fc0aa1198b633cb7e95ead31872f4e3577c30fd01555bd3a03 SHA512 a38faece39e1efff17024a78508537762bd7cbb650a96451c28897be614fcbfa741c0e6eb7d40bc209fb3bc0b1ccabff2f1d9654eb838eb97683eb3b7a77af14
+DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
+EBUILD libbytesize-1.2-r1.ebuild 1129 BLAKE2B 23a7f26d0e51ac35b0859656ac1d5db040e29169d6570fb6940bf4598015a1b5da1aa491bdfd26de9e8fe6d39664d50783300a75be1ece2ea02edd28e42eefe9 SHA512 6da341568735fe0a4bfe99b9fe65abcac16f5370af50625eeb5fa41361d67aac80599cb652b5444b0210ef0ca674283316c56b1790ceb588d0b679fed722d1e7
+EBUILD libbytesize-1.3-r1.ebuild 1180 BLAKE2B 74c7becb34b6e8e57e4f2d9eabb8ee593557f6b44be29999ca65d7f81183ad692074606147ad7c27e4dd000bfc961c25ee114c84bdb0a151d1669c11edf1da7e SHA512 eb1d7b1a37b988a41cf01cf922980cfff098d7f1185a259515d90a00b0b8025c91b395235b9bac3579b1b98b2552762f7ae3d9e2c184a4b2ebfa968fab03f165
+EBUILD libbytesize-1.4.ebuild 1231 BLAKE2B e89e69fe587e3612b0f87ba091d2081490071ecc6031aaf9679f7dc816b1710185e74ac3801a4c0c50fbfa8fbf31b196c346bd0002fb06121b0fba7ebe28149b SHA512 78a7d8c2ad3f650edb0c17703b61292819ab06bb028b2476fb13d46bb672b171b6a6a8a36f317534bc06a441569a4a734b85a8c98c3e4ae957a07f9981c1b9ba
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index c916bc16687a..322102f9666a 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3
+		--without-python3 #634840
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
index 8506a7a74ea1..3364440fc7b2 100644
--- a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3
+		--without-python3 #634840
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
new file mode 100644
index 000000000000..91c6409d7034
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	>=dev-libs/libpcre-8.32
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint
+		dev-python/polib
+	)
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-python3 #634840
+		$(use_with doc gtk-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	python_install() {
+		emake -C src/python install DESTDIR="${D}"
+		python_optimize
+	}
+	python_foreach_impl python_install
+
+	find "${ED}" -name "*.la*" -delete || die
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 7bf30e75dd38..8b299fd0b2d1 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,7 +5,7 @@ DIST libfilezilla-0.13.0.tar.bz2 398773 BLAKE2B e25f15bc4ec6a5aff119352535721f44
 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.3.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
+EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
 EBUILD libfilezilla-0.13.0.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
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
index 28b3e2505fd9..ebf7bc6c8964 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 2dfc4b6c3bf6..cdb0a42b7e53 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,6 @@
-DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b
-DIST libgit2-0.27.3.tar.gz 4771877 BLAKE2B a15aed24d0391cf8d5c74329f5064d703def5db1cbf132881279d501d1ba31002367e54171e8a341b75862d327eddb1abebdaeeaee6878a14ad1d8abbbc8402d SHA512 e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b
-EBUILD libgit2-0.26.5.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
-EBUILD libgit2-0.27.3.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
-EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
+DIST libgit2-0.26.6.tar.gz 4734435 BLAKE2B 0831d0a78ba74b6cd989821f0abb6774f8879f18906025ce02d7c0f7f8f3e7f03b30121f79e370b85201e110a6fc4aca2ae2e608b12f01cd527ab42bf597099d SHA512 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7
+DIST libgit2-0.27.4.tar.gz 4772254 BLAKE2B 9c0e7b436d8cb07a8f1407d22bcd4c7b161f3ceef9dc4e67f9daec784a1cfb9f8f2e493a78f5ef6b4893e54c1f1b567ae53ead52a992ee10eabe3229195417a1 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
+EBUILD libgit2-0.26.6.ebuild 1946 BLAKE2B 74710e5754c400a95e86754ff85a256dcc915cbbfa1102afcf9731ce427d9afc5f38bd559a13f0f6e47d0a6169445ecba65d3b154c6245bb760994897958e12a SHA512 721657b35fff014617ab5aad24b8977ab6117cfbab1e8eefc1d909e992356d9387b528116725501c5b80485626712145bddf5fd08fe29840ed95e619735990a0
+EBUILD libgit2-0.27.4.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.6.ebuild
index c94b6bca4718..fe1356367611 100644
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-inherit cmake-utils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -33,6 +34,7 @@ RDEPEND="
 	ssh? ( net-libs/libssh2 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
diff --git a/dev-libs/libgit2/libgit2-0.27.3.ebuild b/dev-libs/libgit2/libgit2-0.27.4.ebuild
index 456ded8f18df..d10065358a4f 100644
--- a/dev-libs/libgit2/libgit2-0.27.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-inherit cmake-utils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -33,6 +34,7 @@ RDEPEND="
 	ssh? ( net-libs/libssh2 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 456ded8f18df..d10065358a4f 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-inherit cmake-utils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -33,6 +34,7 @@ RDEPEND="
 	ssh? ( net-libs/libssh2 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 2dbec68a9f45..b3c1c202f00f 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,7 +1,7 @@
 AUX librelp-1.2.16-add-new-test-certificate.patch 18257 BLAKE2B 43721265838e3d691215bb638ec75f887a72b4251d8445dd00cb7222f048be818d14ae793b1d8cb4ef7ed9d380f63985c63b967cd1a56bc356390f900f158af1 SHA512 97caf803ca7b75f9a5c08356dbb04d90771c9dcc9015fad20dace04d09a157845dd0704a969fdd966262f1662fd34ea32c74aba2a065a36a900a327b36e00b6e
 AUX librelp-1.2.16-fix-valgrind-usage.patch 988 BLAKE2B 410abca2c3b323a8f896768c3c721e03063506dcee4529553d279aee1f37badfe881b536799ececb82b8390f49d6ba93f3cc3fa25ed8d7ed9c0478080ff050cb SHA512 bb43c8b0b046209bcb649f205537b55cef8393f5a59ecd91520eebc343aac5aa0606194a5fd8f43f1ad007e77c298fc3b02cba3c27ea474f2174dac6a723df2c
-DIST librelp-1.2.15.tar.gz 440273 BLAKE2B dba423e206bdbcbfb351ab691f777d4c78f25d9042ffe2cdac01bc4e7e07eb7c02301ab0d8942a73d688eaf28b43d9f77aa94cc88a258dee1b28dac94a13954e SHA512 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
 DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
-EBUILD librelp-1.2.15.ebuild 979 BLAKE2B 8383923df704355300689ee33a1f20d1e82db40b01d75d3ebc2f6c912510738f27bf5434a4c0f7ede684f1cb18c87a8f9bcf38a7754c79daecbba411d1a0d1f2 SHA512 00d1baaf48bb2e1643bfdeceb2af3c735c4e2d1e94e7ce763643d9a9ab730495a865ba02ca7a3e90d9e10bd521090f04affb11512e15db4381cc74ecbc2fc5f0
-EBUILD librelp-1.2.16.ebuild 1122 BLAKE2B 5d046126c8f581f645da00d6147dca6d701a2740d7a11e85f48bb91ff82744030ebee1f62c64fa5f941a316fcaa0eafe56856eb030fc2636aa5a7a1f167b91dd SHA512 eb71c439ad272616e72821fc286768fc9ed53900add918def5fcb388644864ad7dc66af7463141cb73aa8dd328f4aa5caaf301ee8d4aa224f8e8e75f7847f9bb
-MISC metadata.xml 358 BLAKE2B 2b9924cec5f5b08dfaa8df564577e388c620b48db4206c2c37774e7e110c1b3ca695f82eb39913c0f552a59ce30c6a03a2e348aef78ee01a7c37165fd3c097d8 SHA512 8b0638c9c4d4c385dc14d8b3e0300791d181bd08c9476dfe5d881281b8b6d4e7bbd8501c06159602d38db4b037b24ad45615b29377cf5a8989ae850fff8f362d
+DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e07f62d6a870bf93e435c4b2d100a3cc9e4ab711233e9c1f73aedd8771e116b7c7139d2ad6d1baa7c483b2867a1 SHA512 4f69d3e4bc3052c0488a01def49dab16b54fc4a092e06f8776415cb1eca2282702a37497e43baf98fc038853d373116d6b58515c9ad91fae91fb3eb84706890f
+EBUILD librelp-1.2.16.ebuild 1121 BLAKE2B d273b6b565f873de81b7e9f4ef5898b27b9e89a8b6f55f34af56d9a1ec4fd737906124449192ca1a34964f1f83392d8f31260bda8788f408fed0f21698d13a5a SHA512 1c97eca0f18370667f0d9efd30d42e8d1e047cf146c505731a6005da2492a10e1cb9dd5c26e210e76018c0763f6be2ea5996ec8d7b3c0277396b81f44f772df8
+EBUILD librelp-1.2.17.ebuild 1453 BLAKE2B 0340264d4d63c0b46fdc82716e3232355131121204108f247ade16c6ff5bc194ca0b9fa2e5d69b928c8793af537310d19fcc31e8b154226ff7bdde14bbde8f74 SHA512 0aaf5db558d22b5b79b36df0a32cc88c9b649a6d0457002e5553a414b8c058af68efe18570c0822f95708f69acec2fefcb131957e40bb775b55570c376ec29d0
+MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.2.15.ebuild b/dev-libs/librelp/librelp-1.2.15.ebuild
deleted file mode 100644
index 84d265125a20..000000000000
--- a/dev-libs/librelp/librelp-1.2.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.3.0"
-
-KEYWORDS="amd64 arm arm64 hppa sparc x86"
-IUSE="debug doc +ssl static-libs"
-
-RDEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-"
-
-DEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable ssl tls)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/librelp/librelp-1.2.16.ebuild b/dev-libs/librelp/librelp-1.2.16.ebuild
index 14405d27f2eb..1e8dff837fec 100644
--- a/dev-libs/librelp/librelp-1.2.16.ebuild
+++ b/dev-libs/librelp/librelp-1.2.16.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm arm64 hppa sparc x86"
 IUSE="debug doc +ssl static-libs"
 
 RDEPEND="
diff --git a/dev-libs/librelp/librelp-1.2.17.ebuild b/dev-libs/librelp/librelp-1.2.17.ebuild
new file mode 100644
index 000000000000..ccdcf011fa23
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.2.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="An easy to use library for the RELP protocol"
+HOMEPAGE="http://www.librelp.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ doc? ( FDL-1.3 )"
+
+# subslot = soname version
+SLOT="0/0.4.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
+	gnutls? ( ssl )
+	openssl? ( ssl )
+	libressl? ( openssl )"
+
+RDEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e 's/ -g"/"/g' \
+		configure.ac || die "sed failed"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-valgrind
+		$(use_enable debug)
+		$(use_enable gnutls tls)
+		$(use_enable openssl tls-openssl)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	local DOCS=( ChangeLog )
+	use doc && local HTML_DOCS=( doc/relp.html )
+	default
+
+	if ! use static-libs; then
+		find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index 4fca09fb7334..17b00e2ac3e0 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>whissi@gentoo.org</email>
-  <name>Thomas Deutschmann</name>
-</maintainer>
-<maintainer type="person">
-  <email>dev-zero@gentoo.org</email>
-  <name>Tiziano Müller</name>
-</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<use>
+		<flag name="gnutls">Use GnuTLS</flag>
+		<flag name="libressl">Use LibreSSL</flag>
+		<flag name="openssl">Use OpenSSL</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 7de194fd11dc..51bac84d0a2b 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -3,8 +3,10 @@ DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aeb
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
+DIST libressl-2.8.0.tar.gz 3377310 BLAKE2B 2a2027d86e99a09a349f3f123223a8544f49410ae53dbf4b97f898895758d00b1e8f73889f0b0ad8cec6f7ba5e85f033080d0e4af92b0fd10d048136337a0213 SHA512 3004cd78a9d52dece9f24272389778d6afca549de245852004ddd57b01a0c3a6fa1cee2d56980d067d23b3ead7f7a4aa6bcf4e0c57a56f5f7d9fd3f8d23f3ca2
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.6.5.ebuild 1456 BLAKE2B 2570ec4a9bb5ecd1e1edc1be5d3cb8df2a8aded439f013d96cd03dfeecb03b5407113430a4226512603d44b991d6408356ae72e3669fe3ebd483faa375fdc764 SHA512 5765995fc84dfe51631844789250241a81bbccf0c72cea7afbd91d0385f7fae28be8a8cef76cdded1760746caa78735de67b42030ce5cff727c8d745c91e936b
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
+EBUILD libressl-2.8.0.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.0.ebuild b/dev-libs/libressl/libressl-2.8.0.ebuild
new file mode 100644
index 000000000000..1c15a09a5faa
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# 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/45"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mini-xml/Manifest
index 71256d585036..9b4819f17eec 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1,3 +1,6 @@
+AUX respect-users-flags.patch 762 BLAKE2B ccce0e60b4f3edc18b5fb58215f6f0cd677a91db470a48e67a996f1ce6ba622f2cddb8e84e7ee756c3cab9da167b3fba6cc4e46be874d06887028bb778c07004 SHA512 31cae98c5802e2802df7e6a90275b28a14c1c0c453e456a40ddfb66ce418c34eae8a32eafb3579d4dc7622670f12381232e2ac1eedd1a0509198e691c18e0349
 DIST mxml-2.10.tar.gz 265398 BLAKE2B eb3edec5615d727dec9285e2b74f4c877e8332be8f8183483e85a91d92ca1f48e5fc6d06afa3650c133c9762998abfdc8e846a9961ce55251d0c5bbcba0a970f SHA512 c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
+DIST mxml-2.11.tar.gz 9164003 BLAKE2B d124b7d779e7ea9609a91b823fe7f6b45ab4049e79eb72729ca2ffec93a83479d5fed1ef21efc76881a11de58be71b1f3de79fc3e4f07c26f35d3f68e25c017b SHA512 046421f91eea16f0ca99fbf611891c367ea9c3c54d04080d08acf108d7749ad9bbf2f4b3ef234a5130f00f77618196e2c5a245f32230daf645c1f775e961d378
 EBUILD mini-xml-2.10.ebuild 1338 BLAKE2B 3c61f9345cbcbd53d045f391b81bbf177622728da6f340cdc2798d32354cd05fca221fdd4cadb9eef6c45222bad0f92bc3484d5660e5e61623b8dd25b86153b8 SHA512 eddb5ad74946de41caf859faa624e7d7f40c49ef1e2abd21ddd25503a29a940969783a65efafd0cfa48b47e428260953dafaec56ef3148e5d91f126f1baea8c5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD mini-xml-2.11.ebuild 1010 BLAKE2B f19a2817893162d7b9260eadd1ca418d41542b4d6696eb8c2e0f1d8803e299734c87b21df9c97a2430cf2aa135368ee269d99465708524cbe8478c7b5db3c320 SHA512 62cafdae355f84775e77f494fdf506e8f0205f6ead1d708d0332042327da14f5a4999f93d0d7cf86e3b4a57ac2c326689e33b70b343f54ce458d7d3556861d2f
+MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mini-xml/files/respect-users-flags.patch b/dev-libs/mini-xml/files/respect-users-flags.patch
new file mode 100644
index 000000000000..90e49cf2198e
--- /dev/null
+++ b/dev-libs/mini-xml/files/respect-users-flags.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac	2017-10-28 18:23:11.000000000 +0200
++++ b/configure.ac	2018-07-13 23:29:39.710622168 +0200
+@@ -255,7 +255,7 @@
+ 	CFLAGS="-Wall -D_GNU_SOURCE $CFLAGS"
+ 
+ 	if test "x$OPTIM" = x; then
+-		OPTIM="-Os -g"
++		OPTIM=""
+ 	fi
+ 
+ 	if test "x$use_ansi" = xyes; then
+--- a/Makefile.in	2017-10-28 18:23:11.000000000 +0200
++++ b/Makefile.in	2018-07-13 23:27:51.101622582 +0200
+@@ -67,7 +67,6 @@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.c .man .o
+ .c.o:
+ 	echo Compiling $<
+@@ -271,7 +270,7 @@
+ 
+ libmxml.so.1.6:	$(LIBOBJS)
+ 	echo Creating $@...
+-	$(DSO) $(DSOFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
++	$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
+ 	$(RM) libmxml.so libmxml.so.1
+ 	$(LN) libmxml.so.1.6 libmxml.so
+ 	$(LN) libmxml.so.1.6 libmxml.so.1
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index 7a38bb900964..a4af87ab4c46 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<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>
+		Mini-XML is a small XML parsing library that you can use to read XML data files or strings
+		in your application without requiring large non-standard libraries.
+		Mini-XML provides the following functionality:
+		- Reading of UTF-8 and UTF-16 and writing of UTF-8 encoded XML files and strings.
+		- Data is stored in a linked-list tree structure, preserving the XML data hierarchy.
+		- SAX (streamed) reading of XML files and strings to minimize memory usage.
+		- Supports arbitrary element names, attributes, and attribute values with no preset limits, just available memory.
+		- Supports integer, real, opaque ("cdata"), and text data types in "leaf" nodes.
+		- Functions for creating and managing trees of data.
+		- Find" and "walk" functions for easily locating and navigating trees of data.
+		Mini-XML doesn't do validation or other types of processing on the data based
+		upon schema files or other sources of definition information.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/michaelrsweet/mxml/issues</bugs-to>
+		<remote-id type="github">michaelrsweet/mxml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/mini-xml/mini-xml-2.11.ebuild b/dev-libs/mini-xml/mini-xml-2.11.ebuild
new file mode 100644
index 000000000000..6a29195944da
--- /dev/null
+++ b/dev-libs/mini-xml/mini-xml-2.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${P/mini-xml/mxml}"
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/"
+SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="Mini-XML"
+SLOT="0"
+IUSE="static-libs test threads"
+
+DEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/respect-users-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	local myeconfopts=(
+		$(use_enable threads)
+	)
+
+	econf "${myeconfopts[@]}"
+}
+
+src_compile() {
+	emake libmxml.so.1.6 doc/mxml.man mxmldoc
+}
+
+src_test() {
+	emake testmxml
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libmxml.a || die
+	fi
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index f6ba1f9c26d4..302367966a7a 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -8,4 +8,4 @@ DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f3
 EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
 EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
 EBUILD newt-0.52.20.ebuild 2039 BLAKE2B 1ed4352d9265012f2c2a449a804b3a722a2dd11d10d966eb673e6cba6367d7942e611e8d67d12a266436d2b4649f131541ba82ccd5a8ef499c664af2ab23c2eb SHA512 1674fd43412df57dee87d1fbe9dd9914e1dc3afb14e6725ebfc2afd8a5dabd7f7dc64a0a23f4d3289f3f5636d02a86fc7c43d3b98c84c9c9c6eb31e68d9d5ccf
-MISC metadata.xml 220 BLAKE2B 11380346d91090dbb55d040eccb10aa6370a3c71cdecb1930d6a0ca0873d2d3d5c9edd704011e478f635e97c7b7aa4e03e485475e9d2d3acdd87a6545e86735a SHA512 92d5a05e3acc3e5910f8f0948c3cb31126a5aec7042421c0aed7b4721bd1fc83b819814a1772fe7ad0ddea4e0e9f485bae74cfea2c116dbca13994b05854da91
+MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/metadata.xml b/dev-libs/newt/metadata.xml
index daba5dd84a30..95c74e676f59 100644
--- a/dev-libs/newt/metadata.xml
+++ b/dev-libs/newt/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>naota@gentoo.org</email>
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 929bd80077fe..74035d3eec9f 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,5 +1,7 @@
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
 DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
+DIST pkcs11-helper-1.25.tar.bz2 425599 BLAKE2B 6272b5ff2d3eb2ea366ec2b9a6772f93877455b3349a51d696e0450ebd6c6947ced9a2565b2d11a4407abb80348aafabc8e56eb95bce720e3d01bb339fc2f8f7 SHA512 2b425d010cd0a7d6a21b3189f65d2db93d904e1634fa4b23df9a1417521d72fda7bcd595951295bbcdec8151dc5a167fdd7c4310a16474e404f578e2d20db69d
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
 EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
+EBUILD pkcs11-helper-1.25.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
new file mode 100644
index 000000000000..02e44a3a603b
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	libressl? ( dev-libs/libressl )
+	gnutls? ( >=net-libs/gnutls-1.4.4 )
+	nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+	econf \
+		--disable-crypto-engine-polarssl \
+		--disable-crypto-engine-mbedtls \
+		$(use_enable doc) \
+		$(use_enable gnutls crypto-engine-gnutls) \
+		$(use_enable nss crypto-engine-nss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}