gentoo resync : 14.07.2018

33 files changed, 222 insertions, 330 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index dc26e7f80630..1ff949a55575 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 940be0a04248..a97800047de9 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,10 +1,10 @@
 AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
 DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
 DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
-DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
 DIST e2fsprogs-libs-1.44.2.tar.gz 715214 BLAKE2B 696702563e30f877f1ced23c116240b6f5314987858492908396a5190019df095165e3e2995bc00330a1a3c19052773c483928db93bb2f9f01dc73de69858edd SHA512 c133c779b7ad4f51977d5c5627810f3808b0e40559726e99eadaa7beaecf08d09c6da6041c376148e71f94c60c2be185c9ed0b1c3fbdeda5e113a32f10b1b6c3
+DIST e2fsprogs-libs-1.44.3.tar.gz 716297 BLAKE2B 1b0b3434aa05027d3722e14a5825219be91f017f539dd6c9842776a49d2903227fad81866c03582aa119670f4fd66103016d88d062c318b2cb6097219d166f1a SHA512 934d9a4c056f60029b93727bba2ac9def080ee2a6c308267676379fea77510d93f2cd41551e5ed3707cfee1fa8a9a1de8df0af1f5c00aeaa66074b1f07e8d23a
 EBUILD e2fsprogs-libs-1.43.6.ebuild 1851 BLAKE2B 0681dd618ced1e9bff041865c4a6363c11f68b98aa9b9b816333d77d11478228ef6587e318c1760da8723c2488b41ca0267ba205fdd2147146c8bb638a392dca SHA512 74bee96a90b10ee3b3e5bc8f68e1756e8d1b87eaa6a0a111b03d36b6eaed06eadb6232f69799f8cbaa47fb1a6d763f87e500663035ea0a673da7799e88e71274
 EBUILD e2fsprogs-libs-1.43.9.ebuild 1866 BLAKE2B c92a20a599c29fff87f918567fe30669aa752fdd10fc136df33a88eaf57ceeab593c20a1bae8d9d9a3ee37b3cead182bba56fe98b62296312d4a2ba68982eef0 SHA512 ae3af838f839ad0980b562d5e4b1611f871ce472c252b9db924db686843932bbf137a6458363cc025fb595a1f5dbfd886048b6cc888b5c9b587dba142408cc94
-EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.2.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
+EBUILD e2fsprogs-libs-1.44.3.ebuild 1871 BLAKE2B e6cd648fd65c989f3f3ea3ddfca981421214eea8e05faf37a7c36c90bab587ffe12371efd26db11b590415a2ea1fe5e663629c20c95614a5f80ab3ceeb6bf43a SHA512 58a2bbe5750472ce84e0dacd894db29d5aecefd7a153104e1676d49687e2abc05992b8588fc7f95ecd6d5da20dc8032e18f6c3ac6d5bb08548130c66ffcdf203
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild
index 68c23f47263a..fa94345c971a 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild
@@ -8,7 +8,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit toolchain-funcs eutils multilib-minimal
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2d32a47d25d5..fb2cbef2a9c3 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -46,5 +46,5 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff
 EBUILD glibc-2.26-r7.ebuild 25619 BLAKE2B 46b2940a19af94728e94544243f12f0ae6eb2c4d7c0b82b9406ef0d4bfe3bd948f60ad605e01a092f6837f29b6ada840f8c70d0fb5adff4ba649ec2b49c52ee0 SHA512 7b6c0c2f844d782267de387e74ea74410b10ceccb6253c3906a7ca93b0fa69e85aff51ae6657a5933c771ab87516db1547c93648963ea7489008776d74265e73
 EBUILD glibc-2.27-r4.ebuild 41434 BLAKE2B ad24af35925a429c5680824554f9b388fec11f574ec6be63a327aaca485a3d80c2656d29c25c6562634580ef1f22022fb748c794d8e1b7482cef404f4f7d1e4d SHA512 58b98614032c0a7c383a833dffdb93862b30c1e19dff8d0d62c4363c5f4d18ce7edc5b481ad5ee58d12511b682c962ed8db4e411a68d069dbf340f9a23f1a268
 EBUILD glibc-2.27-r5.ebuild 41596 BLAKE2B adbdb3342101e38e4889f63fffab3ac76ac1e0356017281a036d699f937939e3a5686a6ab83c52e313b43af3043f50f0e3abd953d36800bf564f4d71c0b8cdc8 SHA512 fe028a242b7efe5847b00d35be9883385fd42565277d3bd193c7cc6813f5b3f9ad509ed724669ead8d8db55c0a7d6174862c9c6287761c18586f0f4939e56979
-EBUILD glibc-9999.ebuild 41675 BLAKE2B 0a29bde72aa5a1005cb53327ffcd9b0f562014bfbacf43d33274becda680733bf169126ef83d1b6837b4909c5a07f7a78facc08fc20994e0b1e7c53c758bdd26 SHA512 923aa805b438b3c105338cfabed3a6a50ae1451d920b1bf920db21a07c39eeb0895bf48fc30b2d2f1dc270b1b4d295d5442bbd7defc3e206eceed336a8140b59
+EBUILD glibc-9999.ebuild 41740 BLAKE2B 16a6bd98fc191faedbafc30bdbe19d3cd39a065d0f10129fdeffc7799bc28751a7deabb5024d09ab250e5648fe77f7d48bf77eff66e81191edee59d4df86b719 SHA512 e066a346324f5c7984e0e1c4905072725e636c94326d1bbfdc5d0f2d19d7df488ada4155f438c95653ed7d78749de96becef0ceb8ac1d10442c8284f2399e3cd
 MISC metadata.xml 1149 BLAKE2B 653840c6693ac06ed5c45d826f0ac3b0007719883fdaadffb89ce7c87686562ad9e15ccdf5987bb78e616a07f989fdadc7db515b1e53c15af6685de042c2771c SHA512 9ba7c1143839e863347a834bf92d1dcef34ab08c22f962a02bc20068c3acbd58d3c2f6106895b194546c5d656d2720f89609c1e50651bcbdd1dabb3ceb8da997
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 8fe8178fbb4c..a0c2c4f3d45e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -684,12 +684,6 @@ sanity_prechecks() {
 
 	# When we actually have to compile something...
 	if ! just_headers ; then
-		local run_kv build_kv want_kv
-
-		run_kv=$(g_get_running_KV)
-		build_kv=$(g_int_to_KV $(get_kheader_version))
-		want_kv=${MIN_KERN_VER}
-
 		ebegin "Checking gcc for __thread support"
 		if ! eend $(want__thread ; echo $?) ; then
 			echo
@@ -698,21 +692,29 @@ sanity_prechecks() {
 			die "No __thread support in gcc!"
 		fi
 
-		if ! is_crosscompile && ! tc-is-cross-compiler ; then
-			# Building fails on an non-supporting kernel
-			ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-			if ! eend_KV ${run_kv} ${want_kv} ; then
-				echo
-				eerror "You need a kernel of at least ${want_kv}!"
-				die "Kernel version too low!"
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
 			fi
-		fi
 
-		ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-		if ! eend_KV ${build_kv} ${want_kv} ; then
-			echo
-			eerror "You need linux-headers of at least ${want_kv}!"
-			die "linux-headers version too low!"
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
 		fi
 	fi
 }
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 0c3a317b5405..9e42d8db563c 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,5 +1,3 @@
-DIST gwenhywfar-4.19.0.tar.gz 2362848 BLAKE2B cfdde7b26c9ab26d0ab8ce45ccb8da417bc118507e24d7c4315d0f0480deb92e60f331147cde2145b7b41e4764d18266ed221632b0110e3735a20ce6a6a674b2 SHA512 d05b230f7c00247301428046bf9ed643915d0939d804c78622892ae85c81dfe244832a8375820d489277251b407e424a5cf9b19224ad14f7fbfae83485e00da1
 DIST gwenhywfar-4.20.0.tar.gz 2379537 BLAKE2B 7e3439959f61c28d8845ee8355b21b71446f3108f5e344ee600eda58cdccb31cfe93a45cdc9ef8b682fbb3171d20658766918924b48150fea5f2abc1eaa76af1 SHA512 bc1d47c39654940198396f1bdb9f4a87ff4e0e6b07cb4525c10f7f8e6ce93445d5b9d85586a47c93c558e86eb826f7006eca29b93fad6371dfe72830bf9b88e1
-EBUILD gwenhywfar-4.19.0-r1.ebuild 2801 BLAKE2B 7d542d3f8e6f51c2ec9ed90abb4e890b07f21f3bbed1e3abc46450d7ecf460eed2c83fbfd7f77fd6906726ed8d000c783ddcf461ae113c3ae3ebd8b836480cf0 SHA512 cd53962b1f7422c7c25259dcb1a5e20289de1b7d67db45f3e940d2d62c8b1757ea41d68a49615f207d189542e09e91cc1bfb92414b742f35477764016bfff485
 EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
deleted file mode 100644
index 5509c4d393a1..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_beta/beta}"
-inherit qmake-utils
-
-DESCRIPTION="A multi-platform helper library for other libraries"
-HOMEPAGE="https://www.aquamaniac.de/aqbanking/"
-SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
-
-REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
-
-# TODO: not yet required by any revdep. Switch gtk when gnucash is ported.
-# gtk3? ( x11-libs/gtk+:3 )
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-libs/gnutls:=
-	virtual/libiconv
-	virtual/libintl
-	virtual/opengl
-	designer? ( dev-qt/designer:5 )
-	fox? ( x11-libs/fox:1.6 )
-	gtk? ( x11-libs/gtk+:2 )
-	qml? ( dev-qt/qtdeclarative:5 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	sensors? ( dev-qt/qtsensors:5 )
-	serialport? ( dev-qt/qtserialport:5 )
-	test? ( dev-qt/qttest:5 )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-# broken upstream, reported but got no reply
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	disableQtModule() {
-		local module
-		for module in ${@}; do
-			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
-		done
-	}
-
-	use designer || disableQtModule designer uitools
-	use qml || disableQtModule qml qmltest
-	use sensors || disableQtModule sensors
-	use serialport || disableQtModule serialport
-	use test || disableQtModule testlib
-	use webkit || disableQtModule webkit webkitwidgets
-
-	local guis=()
-	use fox && guis+=( fox16 )
-	use gtk && guis+=( gtk2 )
-	use qt5 && guis+=( qt5 )
-	# use gtk3 && guis+=( gtk3 )
-
-	local myeconfargs=(
-		--enable-ssl
-		$(use_enable debug)
-		$(use_enable doc full-doc)
-		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
-	)
-	use qt5 && myeconfargs+=(
-		--with-qt5-moc="$(qt5_get_bindir)/moc"
-		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
-	)
-
-	guis_config="--with-guis=${guis[@]}"
-	econf ${myeconfargs[@]} "${guis_config}"
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index c0d2f7a7c507..6bdf36fcd76b 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -10,14 +10,14 @@ DIST ldb-1.1.26.tar.gz 1262660 BLAKE2B 66dcc38eb97fe4357d06b301ed1de5cf868adc5f3
 DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b8201948eabd440d164d182492002c1d92047d652105c2fb6a3e8383d4b75f45e38cc52efc5d9a0e2811113676203a SHA512 d37bbe84358e05d17483e2e963b8477da5ea351b855b454142c94af35f7987bede0f19faeaff17779efe04e3bb37c510437fcc59be99a17c826620fc25fd659c
 DIST ldb-1.1.31.tar.gz 1337586 BLAKE2B 9454f91a621368cfc7cfdb709781653e947d63b275bb3b288049acb43ee3c02ae4f0be820ccf9e3bb32938d12598a91b7a6292b08c638ccfd59bd1be182f09c0 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824
 DIST ldb-1.2.3.tar.gz 1344513 BLAKE2B 941174d6e2c51319c8690a8d8a87bea443d4fa4d738bd13243b502fdc9d590ba075fcf4a9920c38bb6fc15564f0b116089cd62d99e7cfe33649dc751910265ad SHA512 500ab069cf6cec39907300e3905d334163b5094087831708acc22c4199b006ef52af3b66aade7558a48fab7cd69be3af7883bda3816a83c576d01b36ab270247
-DIST ldb-1.3.3.tar.gz 1370823 BLAKE2B 1e00dca5cc66fc8677334e79d4e36efebad516775116ac0f06884a08197f9589056acc5bc377d6317dfd67926cb6bccbdfe18e1d259875cda4dde86251779fd5 SHA512 ad272a1fd82d5138d9a056c1d81cfcd6167886719852b41447b9e6fb6acd926b137fd76e16f476d68bc0991943142ea1482666dc48155e9a1ef09f13b041c350
 DIST ldb-1.3.4.tar.gz 1373954 BLAKE2B fcd560089fdca9f983e017008173ff1bb04dc23d08b6eaf85f9568278856f5262d4df6a8defed22f8c052d57615787007cc80ebdbedb90462064eff7d3ec3488 SHA512 b02abbb3742711e8cce59099748ce223e0ef0fbfccbc1bc9fe161edae865ff7cc60b8a1c1c90892fa922261484a852ee2828da0f3e6fc6ecfe591c166f953e21
 DIST ldb-1.4.0.tar.gz 1415607 BLAKE2B 1c61264040e5eddee092c95e4cfaeb53b9747b92ea6b2e62ae6a6c74980c4325de5c2aec085bde942eed871541bb90da91e0ac10635d0ca1690200ef922019d1 SHA512 95b024b5aceac0d6360f3c98e70e1f649c53fa0e849b0f3dbb7c46cf47fac718fd13c73dd1531cefaec19d3e6b0f6751b372d1fc814dd58dd288a6cf1dc57a6c
+DIST ldb-1.4.1.tar.gz 1427314 BLAKE2B bdeea064719be9de1dff87a11bdbb8d051d85c056fdd34210ffaf2e9a5652af1e8aba95ff110b92a443a4353457cf9a5ec0d68cdc6fbba7bd955ad6df1413dbf SHA512 0e5b3ad4fa49893c86ca422e44d53c0af062e85e5085de18cdcaf2f05f0769cb2ecb65bad20cf93c5c2e115116ac2e1ec7f2d767678a3fffc9591d9db25e6f61
 EBUILD ldb-1.1.26.ebuild 2354 BLAKE2B d2842c0d9fab64092bdba589836f0e488ba3544bb4b74946c6aa881036dbcfba82ac94184ec04f3a12e752d065da61f3c1b2898b053dd260afec6cde14d2112d SHA512 195f61f5c6e120d159ec222105d2652b160a7a6c0aae1c6c97967a65cfca59acff8e895d121f375d3eefa7604e5b26fe84abc6136bf882ab6b100a838b44ee67
 EBUILD ldb-1.1.29-r1.ebuild 2557 BLAKE2B 6f23b14f5c826708addf796e96a6513cfac6c8b06609e3335cc3ac0fc551dd68ebef6f3f08b6bfc272af68c32ffc98af392292e891ece3ec16dd11dc87e1cd38 SHA512 165ab8aa5d0fb02620de597488e48048de2250a264c72adb31f044543b301a2584b5eddb1b75e7788d2501af67d74b7eda2e223f2732207ff0d381a185c26edb
 EBUILD ldb-1.1.31.ebuild 2691 BLAKE2B 240d2ccb3f152cbd134b3611d6db02185d6bddf7980b2a816d822fbb924817b798860edd08373d7eb452e451454591a7ce9db24a4475daa210b9e1ce014c14ae SHA512 368998dad5aa47bb8b971936aa5104d1ea5e7a594cd80af79f55e56cb49c2b28aa0322c15781f121bc4aef15d43e56690df324bb0900a7a15eac522b821d5872
 EBUILD ldb-1.2.3.ebuild 2619 BLAKE2B 447fe4e7cfb1e1e9350f215f93a818d0251861e3dfbd00a2f866dadfe260a76beb14e489b91eac279c52e800e93ac680131d27fde26d4ea22ce18ec15bf270d4 SHA512 b937f76a1b04d68a2117a8097890a7bfcfb4ef1fdef03c3a4e47908ded9cd0404cc7b26b26e6989fff9076d3e482f6d797ff9249c93ab616acce710d2b22b0d7
-EBUILD ldb-1.3.3.ebuild 2572 BLAKE2B 2b1702de50c15c7b9f05fd9f630c805010a24b7b469a3cc1f969b63809c475af0dbcaf820d6182e48153cae4afa83a817c046db0fc78f62060d7be4954731a15 SHA512 d830c5c6b6d312a111485f76f5ec296fcaf52be3fa3fac34cc270caa9e61ef420f06382e309f1e5b933f7a5343de8adcb681c55ee8cf45113c9e2e0a8af36390
 EBUILD ldb-1.3.4.ebuild 2572 BLAKE2B 2b1702de50c15c7b9f05fd9f630c805010a24b7b469a3cc1f969b63809c475af0dbcaf820d6182e48153cae4afa83a817c046db0fc78f62060d7be4954731a15 SHA512 d830c5c6b6d312a111485f76f5ec296fcaf52be3fa3fac34cc270caa9e61ef420f06382e309f1e5b933f7a5343de8adcb681c55ee8cf45113c9e2e0a8af36390
 EBUILD ldb-1.4.0-r1.ebuild 2666 BLAKE2B e9d6cc2dd551d3219a099214892aaeaa4f27187d5ab121844fce0270a9f9c24b062549beeab863f9170b6d1c8856d7d21e43d0fdf8626656ce53d112b6294172 SHA512 ff0bcb83eab974e543d294bf874cb517c7b002948a331afc1e4bcae36d175fc2cf46575bdf422402ff4a10f0f5518715f86583863afcd360a8ed9013a822fa1b
+EBUILD ldb-1.4.1.ebuild 2666 BLAKE2B 2a516abf165389e8816f96078ea5f2d0588b36560e79398abf466373ff8f8885a415708642246e8849bc4e11d054213dae2763eee37b5b331c53d099f8cdf614 SHA512 0ac6f804a59452e1fd9a7300ef661ebf181366c356bd8e1c60e2fa646df1878cbb0bbcd9a71b695170a3c62130712ecca86bebe7a994b211bd6877f46b392a16
 MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
diff --git a/sys-libs/ldb/ldb-1.3.3.ebuild b/sys-libs/ldb/ldb-1.4.1.ebuild
index 1b38c776939c..0928dd65642a 100644
--- a/sys-libs/ldb/ldb-1.3.3.ebuild
+++ b/sys-libs/ldb/ldb-1.4.1.ebuild
@@ -14,16 +14,17 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ldap +python"
+IUSE="doc +ldap +lmdb +python"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
 	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 "
 
@@ -41,7 +42,7 @@ WAF_BINARY="${S}/buildtools/bin/waf"
 MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 )
 
@@ -57,6 +58,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=(
 		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
 		--disable-rpath
 		--disable-rpath-install --bundled-libraries=NONE
 		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 432d771aa97f..e11be64289eb 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -10,5 +10,5 @@ DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5
 DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
 EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1
 EBUILD libcap-2.25-r1.ebuild 2025 BLAKE2B 182c4466d857d61166cbce57c6ea3d5885ccd4678b62cb15825210e7994bf6a3a251d745ffb8734308772959b7d60c0f99268ce820345939572fbbd835897d53 SHA512 ee0dd155f13c0f5dc568d9b18ab1ac2ed7de80a15e72f24c033dafb6098ea26cf4166d6c38652a3afae094fe8f6e759eaef2ddc01c32dbbbc016a859ea01509f
-EBUILD libcap-2.25.ebuild 2005 BLAKE2B 7232168d084f724ce15d1668bad525690933567411221f8911ad5397772657ffeeabe4f2b080836022893914afad85a1d2cf2028ff3b2343ad1c2846c1ffe74f SHA512 0190561034775841a2b630a4f51e3f1c11663745a18fe4951f63e2424decb73a2011e83fdb39e78eb26a0ad7460261dec8a5c66fdd65d3d2a19cb64888e2d97e
+EBUILD libcap-2.25.ebuild 2001 BLAKE2B c633e223229a17a39f2e75febc44b5133f2b2256f73e0f3df6eff9f213f54c858e7b461f65576317ac2e354ba10eb0c8087d962089b26b5b5bf418bf3046a20e SHA512 c18bd6e725bb8549ae31ba4547f51a2bb8ee06271eb587aed96b7369d3bba48577736b59ac522cd69c8b5f402632ccec0e2b9b29f7f9d0a8e35707fca0d37dd0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index 679ea2d23896..7d1cea10cba2 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="pam static-libs"
 
 # While the build system optionally uses gperf, we don't DEPEND on it because
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 6f9be84940e3..429f5f3ba113 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,5 +1,3 @@
-DIST libchipcard-5.0.2.tar.gz 736107 BLAKE2B 0dbf58081930388da99a621e781c69a3258782bbdd9109df2a0cabf5d404e209e84bdf2d46d86210ce86358a43966d9d54106847aa3415963e564a7904f8e475 SHA512 82c9100b31086900d3fc66f9b04eb7f365cf09b65959e06dfc7927f2e8328d70d64ad33b40615cc382321dfd50720e721198c0308668a27f1a2db9ce46a292c9
 DIST libchipcard-5.0.4.tar.gz 801499 BLAKE2B 7966002dbf5c9eb7a53490aa8df68765901d7ebb7c7a16d8b24bf087a9886883aeb8a5c4f4be21ca5740215ce4f1b8d0023409f7b0f843ce1ce894a2cc115f40 SHA512 3b5b049f8ed676994c00ca758248c842de1119a0cee9e55682971839dc72cca226910559763bf858ceb126d998284b0c9f37459e0c87831d52ac39b6c4317293
-EBUILD libchipcard-5.0.2.ebuild 1069 BLAKE2B eb4f9bdde27afa6848c6ce86fd489a4193c5a5d7c022686da6fe4908d2ef13ac03ab448661e9b7b85a225b48e7f24225ac0b9edd1c55d35fcc8395fc89d3a789 SHA512 5f19deb9a4d074cecb30040951191a63c54e863b01edcef811c3d25d1153f7ee43f59477380d0c0912cd6b33dc9fc9b72ef016ddf79ed8153eaebe970397ac01
 EBUILD libchipcard-5.0.4.ebuild 1084 BLAKE2B 72ae66970873a1b840557c9c933c4fd7f530471f43f73f66f8926c8f6728e02e3a7d2f7a6b95d1ced5323af260a61343ca8390924e65fcc4aa1742fe0c4b2bcf SHA512 7c04abecae8f198ec389a5954a7e565fc501938d1796b4005b0273a0b76ed7c9b57e40e5a94d46b53b126356c36af5adefbe5588e00b9c54bf4a4f8b695dcf29
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild b/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
deleted file mode 100644
index 8c2d65dcf83a..000000000000
--- a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Library for accessing chip cards via chip card readers (terminals)"
-HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
-SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file=01&dummy=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="doc examples"
-
-RDEPEND=">=sys-libs/gwenhywfar-4.2.1
-	>=sys-apps/pcsc-lite-1.6.2
-	sys-libs/zlib
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable doc full-doc) \
-		--with-docpath=/usr/share/doc/${PF}/apidoc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO \
-		doc/{CERTIFICATES,CONFIG,IPCCOMMANDS}
-
-	if use examples; then
-		docinto tutorials
-		dodoc tutorials/*.{c,h,xml} tutorials/README
-	fi
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 0cb14a5a01cf..7f977a831a82 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
 DIST libosinfo-1.1.0.tar.gz 904154 BLAKE2B b34d1aaf2d53ac43613cfbdfd05bc12de505d37a743d64e43af379351f640759ad0ec2f30af74bf82a97b3e12b4a02b097bbdd6e0d3e83f7befa2af5340724a2 SHA512 c4f9e67bb5538e31e7d2ed3d764547ba0a2263da5bbf4d1ef930a32d5953fab59abc672e5f86a1f7f5ac1ebd0c5195986193f699a6b0efbcb6769917c0ed7102
+DIST libosinfo-1.2.0.tar.gz 916787 BLAKE2B 652910ca1e70071d88adb771e458f0c19159a772eec1178c94ea5f65c5045bb00e4b1354b1ce4229d28821b6b1557424e419c1505b721883731a36b0761a1b5d SHA512 d98a107a08c5e2cddd746631b3ceac4278184ea5561ad2372d772b8ae253dc1363f217778d105387e5b5c5e86be9607668aa94929ad9b4ee48ab7abf50fb6a01
 EBUILD libosinfo-1.1.0.ebuild 1443 BLAKE2B 9ba19b6db773c95f760a7e34d98f3eff0e247b8f31bd1914973d0edfc838e0611ad630df2c9deadadb084041f472fd6c14a107bb7e45e9be5ff8f89997ed3b61 SHA512 7d12311500cec2646ca555203fa0c938fec1caae4cfe59069c1dfd7593fe7dbf222e2fe3b50c70f78f64725c4001f3be3cd8b2a21568763154598d87e84d760e
+EBUILD libosinfo-1.2.0.ebuild 1717 BLAKE2B 4da3a7a0f7ecf53265056c46ff914926e72701db6e31452faabd8a10a080e892d4f28f3872d7d1ff4cc9957c869e330a69d580eb65034f5a6a3c5de3289cd2be SHA512 141bb380806154be9cb72f7d8607e214bf23ed0608ee245b6015e83f49382f04c3c2d5a23af1fd1ec9fcde6278a4c7120c039140252030a45a7817ba11b10a5d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
new file mode 100644
index 000000000000..e68d12de66d0
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 udev vala
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="+introspection +vala test"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+# perl dep is for pod2man, and configure.ac checks for it too now
+# Tests can use net-misc/curl, but they are automatically skipped if curl is not found, and
+# if it is found, then those tests are skipped at runtime if LIBOSINFO_NETWORK_TESTS is unset.
+# Due to potential network-sandbox we aren't enabling them (and one of them fails at 1.2.0).
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-libs/gobject-introspection-common
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+	test? (
+		>=sys-apps/osinfo-db-20180612
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-usb-ids-path=/usr/share/misc/usb.ids \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--disable-static \
+		$(use_enable test tests) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		--disable-coverage
+}
diff --git a/sys-libs/libservicelog/Manifest b/sys-libs/libservicelog/Manifest
index e4ef23d86257..30790a6723ce 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1,5 +1,4 @@
 AUX libservicelog-1.0.1.patch 479 BLAKE2B 1bdebaed553372f76e4d42c8299d42ecd23d88eea7165c6d36d67b156c92a59e4ba8477448d6e00ed452f82e2b67061282bc5cf81104d83a065d92d80a623bb6 SHA512 9c19ae05608a2fb2116a569ef50cb0b4831c3f3c346068ca7f1d9fb572b2fcc4af3a57e91c5848ae8a1a60e73d6c31c5963daddcfe3115338377a4fcdd36a0ae
-AUX libservicelog-1.1.11.patch 286 BLAKE2B 2e9068156c9de35b3fe0178f48696413e22fc1f54b7bd72f83f2da64ee3979d88d31b948309a327b9972b823c6a56bb56bef21324327691a901d1d237fe0dca5 SHA512 0d0786e33db00a7b3009609f63a00f8409f89f25827ae7dcda74e2520dd96b9945ee2873d933ec74bcd5a4c7b6641bc3dfada192f092ca6a399046a8177ddf85
 DIST libservicelog-1.0.1.tar.gz 673264 BLAKE2B 4ea60f194513dd2aeeb0f8f6c991d85d0b00438beec58515866e93c85f28e148d3bb9b6dae69a8c156f9209b1ec26da3ca8fc72b18d10e2d6078bf3bd3e1a356 SHA512 a4b2eaad7d382440767f33aded804732acc2828466e83a4596cc66a98ccfd53d048e9af5984b71a45b937bebf3526062d96f5c10be27d44dbbc808b980c1d7db
 DIST libservicelog-1.1.15.tar.gz 392259 BLAKE2B 886bbf4aa6d41b35fb978f2155a1025069dbffa98dc31add58687260ec503ebdd8b2d6802b473634a65dd9c429a4a307159a918361be057226b7ae9dc14422da SHA512 70cdf8340a8b0df39bc5669976feab022917b5884256370281ed3356633100cc9c7e69c6cc1bd0784bfedc65d388d9ecc50f6dd37e6ed19f796bb7f55bb436f7
 DIST libservicelog-1.1.16.tar.gz 396055 BLAKE2B 2874acc4c6b405d5a16150de0d66f95e55d8ae375d2f8d3bda4daf4a9d7d34e7b2d52bc9c270880daf747664c740ee72d81d47978e73f2d7640efcb6b92a1e78 SHA512 7008a26c8b143b2e498b05cfb5da0c7b76b0ee56106e1d261e202b8ebc0c93abce719230b037fd6bcade078daa5c464428ea2adb466269f30951e909211ae307
diff --git a/sys-libs/libservicelog/files/libservicelog-1.1.11.patch b/sys-libs/libservicelog/files/libservicelog-1.1.11.patch
deleted file mode 100644
index 092ac15482ab..000000000000
--- a/sys-libs/libservicelog/files/libservicelog-1.1.11.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,5 +19,5 @@
- library_include_HEADERS = servicelog-1/servicelog.h
- 
- install-exec-hook:
--	install -D --mode=754 --group=service servicelog.db \
-+	install -D --mode=754 --group=wheel servicelog.db \
- 		${DESTDIR}/var/lib/servicelog/servicelog.db
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 26d8103e52e8..160d53c9f059 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -5,7 +5,9 @@ AUX libsmbios-fix-pie.patch 816 BLAKE2B 73d2e9611bd672332bed58adee52cbac6285d1e0
 DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
 DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
 DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
+DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
 EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
 EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
 EBUILD libsmbios-2.4.1.ebuild 1721 BLAKE2B 9283623af15e10736a53b0916159e80bc4539a838a0c352353a2e3d47797641a9dbfe0afa5750f3d550d571a219deaa4bba142193d1fd5d35b079efa33e5ce30 SHA512 92d3f1ff5b9ba0fb79321ba675689928a01f1fb97b8834f0360d4c34a7d305f5650f4947d64965c3936ea1fa307ad822bdb50710dbbfdaa10e550139cb725848
+EBUILD libsmbios-2.4.2.ebuild 1709 BLAKE2B 7ff457eea26d9910d155d7107e9db8afe46330af9d9543ccf5fb51d36c3fe437d3fcda72e6ce9131dcc07aac99d7550660b9fed337963cb5d77268a31bb6ac07 SHA512 5b2d13ff22e32fb18ba821e1f2e8e090fa695145be4e2c330d05fe562b6918145cb5084dde5e31811be21aaa771509a54a56189c8ce701022c8d2e7d78d613a6
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
new file mode 100644
index 000000000000..3293aedcc967
--- /dev/null
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -0,0 +1,77 @@
+# 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}} )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="Provide access to (SM)BIOS information"
+HOMEPAGE="http://linux.dell.com/files/libsmbios/"
+SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc graphviz nls python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libxml2
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	graphviz? ( media-gfx/graphviz )
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.9.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Don't build yum-plugin - we don't need it
+	sed '/yum-plugin/d' -i Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	#Remove -O3 for bug #290097
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable doc doxygen)
+		$(use_enable graphviz)
+		$(use_enable nls)
+		$(use_enable python)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	if use python ; then
+		python_scriptinto /usr/sbin
+		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+	fi
+
+	insinto /usr/include/
+	doins -r src/include/smbios_c
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 03703b729667..19bbf8e912b9 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -5,9 +5,10 @@ AUX libunwind-1.2-ia64-missing.patch 3863 BLAKE2B 384d2afd7d725f0730207b5b32ff4f
 AUX libunwind-1.2-ia64-ptrace-coredump.patch 1445 BLAKE2B 0b4b6b5d7b3cfc8be58c3973b096ceeb19faa84f175a23f2130588351e40f94abf5c53a4eb5813d8b9da7762f032671031d2d637bd2ec445f7e4f9ea9d276773 SHA512 0bab310ff16294d7617077ffa1261fe9c1a6aaeb4339c96918869c4dd9a2b1b73fbe2ebb5c895f1a420ff7922da85cbb44ccfcd69df6e2518c1f2ff64b7b2d76
 AUX libunwind-1.2-ia64-undwarf.patch 581 BLAKE2B feed4d06edded9ed27721d3f9530d154d284410f68f0f00c7f8013d1ba506f9860c55707c3b03340eca4954ff63bcde74fe0b4a9c6c1d474305e74884df2653c SHA512 a83dd2d2bea706fb0f57b854015c6f1db882d649e931e12bb1a5524c8176e326d7d4a448f986c9475d1bd4c6e22a0e9a1c813c7a5b47fcd61457806c1f32fe85
 AUX libunwind-1.2.1-fix_version_macros.patch 381 BLAKE2B 77b523a859a66297eb5677e0eedfc511b6e3cae7058b49da2da41b27d1d22d72b9a662f2b20338eaa5166bd5ae414531695f540098a1dfb674e668ed4c683079 SHA512 4178ed205046dbdf0cea6c7004b866f840e4e3b477a88c3a24f4178e4c642f9d0cfbe7c0f79c6408fad95d8f387f55c912022a78fae382d69e80cd4ff41d8bad
+AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d1506072cbf162831ba3193c0c3ed74f7091dea226c2f9cf06387574ae1d15cc1db1627137f0f80adc542fb5534cf8f6254c SHA512 fe76aef28096ccfdb5c290da631efe8f7cbef13fddb415227f97cfe974162d757a3439b542bee0fe225950200f3cec5e7eecf60c60b2584e2a922618b73e2a7b
 AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
 DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f84d3173dc3a2e9fd54486a18d99713df152d810db4eb3e36df4afa7df1b544e6c9271479e2fcbffe473a17c4372 SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
 EBUILD libunwind-1.1-r1.ebuild 2444 BLAKE2B ac2eb3bc33f80cfd82cb1600c1f9fff80d7ef7a824ecbd618c1d2e4416a5144b5beb47020e825a778d85ffb0e7f3de9b0909d07162b49ce7ec6e128247639b9d SHA512 d6c4099defbbe27c2a0c7df12299a21be655345b6480a61d3a67dea4dd3f732088b734f28eba4a5ee43ac7323ca6cef45fdba05e9c79d2d8e8b41ef5667299eb
-EBUILD libunwind-1.2.1-r1.ebuild 3124 BLAKE2B 9eb8470771ebf40b79fd2383d772cabdf3cc767243ec55ec1e1efd8c683076a92c91e3354fbda1768ba64ff61e172aef781a5e46c007de6703eb4b08d008853a SHA512 076bc60f0cfb890fe864c11da6118d6d2492fc674f9721e6062531c3e53fb0994c9a0a77d980e45a7b59e7b8e2e25ef7fb4a5f61d87f591da9648b315cf24ae1
+EBUILD libunwind-1.2.1-r1.ebuild 3178 BLAKE2B 1b1f0bb6fe7ba675455fcd33e72cc363aba56d20e0e5b77b338ad7d8ce933d6892e8c694776b30e5308972ce2058ccf6395f5c056731a52959aa9ff18ef902f2 SHA512 ba3e19612ce37a7e069605dd0e78696f39fbdcd7ec963721af9739b4fad00dab18bd6c65fddd5d91bbc25b1294a92caabcef60f53eff23467df76b8df385536a
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
new file mode 100644
index 000000000000..6b12d9712ff8
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/659732
+https://github.com/libunwind/libunwind/issues/58
+
+From a1437a3d27924e17d00021df3cc659bd998e8580 Mon Sep 17 00:00:00 2001
+From: Dave Watson <davejwatson@fb.com>
+Date: Thu, 28 Dec 2017 08:26:42 -0800
+Subject: [PATCH] Remove PROTECTED visibility
+
+This only works on bfd ld, not lld or gold.
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -43 +43 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+-#  define PROTECTED     __attribute__((visibility ("protected")))
++#  define PROTECTED
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index a4690fc050ec..8ab6cd4d1120 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
 	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
 	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
+	"${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
 )
 
 src_prepare() {
diff --git a/sys-libs/obstack-standalone/Manifest b/sys-libs/obstack-standalone/Manifest
index 56e631e2aa2c..6d74dfb0687b 100644
--- a/sys-libs/obstack-standalone/Manifest
+++ b/sys-libs/obstack-standalone/Manifest
@@ -1,3 +1,3 @@
 DIST obstack-standalone-1.1.tar.gz 11561 BLAKE2B c6eba8ed7e235dcdefcfa7244d6318c6ac4d4b6d12a8f4778753bbc762ec98439724e1e8bbba4b1a04fbbafe56a1634bbb1c604c4d5f30574da39c82d52ca1c1 SHA512 e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757
 EBUILD obstack-standalone-1.1.ebuild 765 BLAKE2B ced2f92e65ac03be6118ff6061f1a5b6c84b391015af8f47c3d00a60a2ec5162bb9b63bff9c84f007a1ef954afaf7051d85b6e8ed61bde62ef03cbe158ea10f3 SHA512 c2ce1847c1f8188646320c5d544ecf3f913ff4a3adb9ffb7210ad9a50e7db05cafd510c1175f1350fa173a6dcf51c416d6d5b68f944a4db7359e46516b601fc1
-MISC metadata.xml 444 BLAKE2B 108eb07f69efa77a9a3d03f018caca2f4b03205f0f4daae5e88e8c42fb6e0f79f9ea710fd6aba6a35e1073a61835953dc357cba28690e4e415706d51f863c2a7 SHA512 0d325102ff1f4f72cc29d1f9acdf176dbf9d4dd70e4880f96b865404512c42c9d99bfe689bf479e84549e6afbe1f9d9131e1164775c22818abde5028b29d9cab
+MISC metadata.xml 338 BLAKE2B 7bcad55fd6a890dfba57ca1939daf33f3c2ccaeb892534a737bedc18b2737111e448ff29d2e3e3df68c9ec33447bb5b636a7d89d000b782e16bcbbb3db76e89d SHA512 6f45a428f15b9409ed7870393cc691f816484c47852dc76dfe64a46e4261beaf3a88ecabf0e42679265fdaad5c5b7321ae19df762e213d0102dcead5d1ab0797
diff --git a/sys-libs/obstack-standalone/metadata.xml b/sys-libs/obstack-standalone/metadata.xml
index 2f10a3547c34..04242345d8eb 100644
--- a/sys-libs/obstack-standalone/metadata.xml
+++ b/sys-libs/obstack-standalone/metadata.xml
@@ -1,14 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lluixhi@gmail.com</email>
-		<name>Aric Belsito</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">pullmoll/musl-obstack</remote-id>
 	</upstream>
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index bd76e8e8fe1a..6da68b8f228a 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,11 +1,9 @@
-DIST talloc-2.1.10.tar.gz 441645 BLAKE2B fdc1f6b4ab6c95b461652ac5138e8f4e0db7161792b4cd7af8d80178b99404f844dd8352fb8820dcaedd0d96251025a8ebefc6bd1cff451e6bdf559617c964e3 SHA512 215e70056f37ade8f67c20ab2b79dcb40f071989ec908de81144f8a0160637bbdec9a94123dea73475ba42425415df4c1eb8c1986485a00e2e03323719a03ce3
-DIST talloc-2.1.11.tar.gz 443320 BLAKE2B 6234808d3a37dd1b9cd29121c20e003637da460d652769f9e85356b66aee285f3706377de4f507adfaaf91243a452a27bdab2377749d43937e140c3f8c69c417 SHA512 e0c7e44f21b0b6510e04e09ce325d50323a0c6466acb6f301676e82f8812c61ed7f6faadac62380aa6338d54679fdf7afba7fb9ac774d0def96efbcf49d00523
 DIST talloc-2.1.13.tar.gz 444608 BLAKE2B ac905d984e9ec438e8d7af473b37d7ccf8e4cf98d96b5a3b621f6c8203e7f5cd4d656602ac1fdfd22e0cab5853a8b54398c0c2ab4202517c4de73c5c90106d63 SHA512 003588fbcde340096b069ed4de0dc6c3e6a489b72abec83e9d3dedf40571a1bf07232d410cc86d8ca505ee49f7483a0043360e913de69106493346fae16a0e2b
+DIST talloc-2.1.14.tar.gz 444589 BLAKE2B 3e47126eb41dc08befd22d7d41443dc5502d0bed239fa0fd32d63fe5374b4422165a7b364a8ad4a9f6e2d73b2db1dd4bada6aec3271c7b264f148d32974adcff SHA512 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
 DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
-EBUILD talloc-2.1.10.ebuild 2443 BLAKE2B 39e7c6e9cf12095d28a79bd8bf1feb3496a654a717de88f0b452c779384cc11295ee7e4804fe998876200aae3c85eff1e8f799581ee0551ab5be28a4565ddcd7 SHA512 9b2505168c051eb44e4c9e628800859f729ea9bac24b0e4a6daa80cd5d5036e8ac0733c5ec47b070f59b9791d1e822e53ae6df8d3a91c99176b1cb01e670e1ff
-EBUILD talloc-2.1.11.ebuild 2443 BLAKE2B 723f4a38dc2f2b83abfeb2ec98751bf2fffb5e82083c69296a9c2a6d794172dcfb0b59e7de974746f8e0542e63db1bf3deb8d882743113222869326b9a64b026 SHA512 2a1d66cba8c387c9c5dda890b646fcc1bdf50eb84d199990ccc5a28efc0d3cbd63540809579a3036f1af43441b0655bd7ff94ae5b3e71008c7b3cee9536a093b
 EBUILD talloc-2.1.13.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
+EBUILD talloc-2.1.14.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
 EBUILD talloc-2.1.5.ebuild 2239 BLAKE2B e396e068f44c250ac72178473fd281541a903979c489d10ea66e997f5bee0bbdedc4d5b6e7c4bccdb799e7714190da85923702f27868a0f77dfff771b02c27f8 SHA512 ed9f0f10bd331f589b560c0563f1ca2b5e16fdf12121fca83a34cd2965b48f9d0f0374b12db9b655b5742839260d2fa794b70e6792402b4e0aac0e3ee0d72ed2
 EBUILD talloc-2.1.9.ebuild 2422 BLAKE2B d2cfc6930fffc5ea5cca67418be4a3a0c891cfa1025e2c331a4e410cecfa2d11c76f89b030eec58bc5b7bddf05c19f6efca790989ed6f2e08ec7aa6f54befea2 SHA512 8b48f388e6760c09fa5e9487d089f0198aa17f086d7a9877eb508aee7a7fb9c2c181a94af01f2993b3a623819aedbd3b19e920b5e68fb0863457339c8b4a3822
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.10.ebuild b/sys-libs/talloc/talloc-2.1.10.ebuild
deleted file mode 100644
index c1002e8e76e9..000000000000
--- a/sys-libs/talloc/talloc-2.1.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxslt
-	${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc.bundle || die
-		fi
-	fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.11.ebuild b/sys-libs/talloc/talloc-2.1.14.ebuild
index e0ced08be51f..65fd07167cb9 100644
--- a/sys-libs/talloc/talloc-2.1.11.ebuild
+++ b/sys-libs/talloc/talloc-2.1.14.ebuild
@@ -51,15 +51,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
 }
 
 multilib_src_compile() {
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index f7b2a2429294..251843abc929 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,9 +1,9 @@
 DIST tdb-1.3.13.tar.gz 498002 BLAKE2B bf29b535acf3838942820a7dc841f635c457999d1ab7456bc598d73c79404dea9ab397eec1725d739bdc9b4a46b6b0ad068ad36d0e7247afccb795d410b15b06 SHA512 d12382a2f75e56d62d151df3390b3ae41c7502d67582812ec6da30913b13feb7ee98572ab5ad5b5ed3bceb41666c3154855727cf5ce249ef583c033819c05f0f
-DIST tdb-1.3.14.tar.gz 500877 BLAKE2B f372c789184f1dbf0829c2e0b43c868a8a7c253b23a597b7695b07f92c1dfbd6978152e965702b0adab9e0a4b19be75ce120196e601314895a9f0be578f036d6 SHA512 776b736d5c61cb796e19731141a85606cbe90e09943d813e0b7bf45066656d4a92ba449d0116664f65b9d8e5729bde4526170bbb1b7b46fd7a2fac1508f3841b
 DIST tdb-1.3.15.tar.gz 502627 BLAKE2B 44352033c421875f02491551dd8b1aa4a821a5e0070d6a32fc4f7a61535c98114325718c673fe163ad692f797aa2e9c26ca27a69a04459ba8340bbd8caacdfc5 SHA512 553246d5e7a7c22ea1b00962ac635d608f6d2344201862e796cad3b1a20610da1f5652ec9dbcb0187867fbd25f36247fcc34e9b4b2c3488c15d7202c9fb13bbb
+DIST tdb-1.3.16.tar.gz 504330 BLAKE2B 686b6b3d026094a0219f2c5d76f7258cf2f96538f614fa9078ca00368ad64c4e93f2e184c98f3d6f480fec909d94105fdf527d96f3b4ea291d81bb63420d2a99 SHA512 7b17852986e48a32f3f8f303dd2a26503a69fcf7849f22f51483334c9abda9f189b521679e51b4ee5a80197a8f304a084dde0f56d92cfe953d3a4ede557526d2
 DIST tdb-1.3.8.tar.gz 494106 BLAKE2B 3ac4418b642472859c37c20477ffcc255be6e435b84f59ee634fb5b80caa38aadbcc761fd2daf7c797f9d9a120dcf6e597b31306f8c67d3e890570dd94e4263f SHA512 9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b
 EBUILD tdb-1.3.13.ebuild 1348 BLAKE2B 3f03448b4519cb93c38320837ba0a81accc4f283050e1f1d5e1850e68021e4794c9f71df9f86e711f9b10a595cb1a0b07c91f6118b2aa60a7d6aa4a661148235 SHA512 836fee522b79ea761c0d88a3c124a179b109bed671ce33b17a6d4c79939a7825d76ee58ef993cea94b8fe5b99fa5dc54d90718b60a68f2699618f9abf893cabd
-EBUILD tdb-1.3.14.ebuild 1356 BLAKE2B 79e7cca1a3772b2e9d2bfcf7b2dcc5b25163461d2b868556436c401083e72126a5f9d53b3d2491fe147e35dc1874d694ad9834e795ab3fa689da2ac8e87a3631 SHA512 2582cc6f3e60166651b8b04d4ad47bf2b86b54fd9d952e7372eb88a55138b85065c82a2ceccf85ab31bb779689a6f709484a757f3b6fa8124411dd1ba90b95ba
 EBUILD tdb-1.3.15.ebuild 1350 BLAKE2B 6453cdc1b94f1f3a00cd913f0db3d2327fee758fd78b9208318e2c7b836c591bf8d079a8cedb7db8aa4a5e117277b446727f6075ec4fe73968b3507932d6c5dd SHA512 4eec0eff750748e4d8e5b6f35559638d64c84b1f665070bf49cb509a1ecde1a303f0c7e6859a287e1ad5d0dc1fe1126d472915de94bdf50ce1532f5aa95520e1
+EBUILD tdb-1.3.16.ebuild 1350 BLAKE2B e4028a9107c0e5a0e3660c2bbb2dce94f62ab05ddda8c02d55312e9190c04aa10633d0842890f830fa1756aad6498c245b8c190da98cfbf93c9dff6af7e31cfc SHA512 080418b60b162ae3a23b1d37b2d667ffa6c1505f899137d75c709322a03a52597b735c354809c473712ecdfc46fbaa661e7a5770084b9a08c28e9f5fc4d7b282
 EBUILD tdb-1.3.8.ebuild 1345 BLAKE2B 6aeeffdab16f4fcddf93a105df693afd1c24d7932f268d96a2055618258084411c5d2f8606d1a4f3e89c2d2d2b1cabf7651bda6475f56d12b759b7c706174a15 SHA512 aefa2e183f6b1e4af2e3bb359dd4920793c5fd518b8a9bd74186a546577bd124f7ccff58b0600a8c3b4d622593ca213d29996766d2b6ff5ec5ae5f61bcbbb2a9
 MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb
diff --git a/sys-libs/tdb/tdb-1.3.14.ebuild b/sys-libs/tdb/tdb-1.3.16.ebuild
index 89160ea9081b..aca8bf7fb4f2 100644
--- a/sys-libs/tdb/tdb-1.3.14.ebuild
+++ b/sys-libs/tdb/tdb-1.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="threads"
 inherit waf-utils multilib-minimal python-single-r1
 
 DESCRIPTION="A simple database API"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index c40ba8f73ed7..9aac7f31dee7 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,10 +1,10 @@
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 DIST tevent-0.9.28.tar.gz 581522 BLAKE2B 95db3ed16b91673ee99fbf30d3c40dfceda080f428feb6b7bbebb0bfc4edc53a183affc8056d25fb05d11a37325b2854949ea5e2dcb170ad7c81e7a7bce62e11 SHA512 328d586a5891796a731e6f0d02e1a731d3541a977c16abca355359cd7f60bbdbb0baaad49c05eb42c3a44f97e57a775605974d22d46ca6c26f283c8ca1b5a909
 DIST tevent-0.9.31.tar.gz 587784 BLAKE2B 0e562600ae8ba4dae194b1a28a020f5618b1566f65cf2b2f158cd44e6cb30c422086bd2ebfd65a03bc4d4b13de4ca833ff04ab1368255eb2181c148de3487214 SHA512 048e37a7f5d3b8e948215fdb909c9b6e94b915c9d4978a8e18c73c9d27d5b1f179c10d19ec90325f8250e7c177c28231ad116a2975caaa43312c383e75517258
-DIST tevent-0.9.35.tar.gz 591546 BLAKE2B d0df81dc1998ae5806f3f8b613c5640af56d52c0e6fdea8f57c95cf4ef5d8bf349992582b97da94cbcc048bc3f758ecb03e836847467588e7dbfbb1aef87b906 SHA512 935719382469a0f39764a7ebdbc0ee977ccca2fc55ff1e896ddd95ba2d065d989f0c366cb98be95ce87475e628b0de38b7138261717a5c2cee870e98339ed5fd
 DIST tevent-0.9.36.tar.gz 592439 BLAKE2B b24dc37aaeb3bc08eb642c85cf34e4fbcf35fbc38421d3f5c3f03fe77ea8252e7a54a956a9c6750c78dcbb11a092e894bd24ea700acdd634edada1f930a67756 SHA512 bca9db9bcf142ba68b207180d19414dddb89a069a4f040383069c8af0df5bb184ca219293c4a1e7b0bc241b9a1ea3d414f8284278ad3a5f0383b9e432450167b
+DIST tevent-0.9.37.tar.gz 603859 BLAKE2B 2210416b09c3f83cf68a9f686d1d582891cd22b4547eb0e5237288dca6a0b94619769060c541e0cfc3ccce79246b1140875109934e009015b8e04a31a94d6792 SHA512 5d4833403e1c2f2749f00a389e4757261a4f22cd3a67c906001b36a8b622cc68a38e86d4eb475848a2121ebba054a7e7dac7f486d9f2906a401c3cc97fb447f4
 EBUILD tevent-0.9.28.ebuild 1308 BLAKE2B 28b6ae3555c61e3297fbdfd544c86e573f494060d7f0634b28a5de2e559115fe5792473d757c79c37ce1a0be59fff5db68dc1cc14348192ba0385a58856866c9 SHA512 9bdc7903d5a99d3e82455598e9ad915fb1a48b0de0fb1e93b8188460f1ec432d451b9c9f7536a9917867939b49e4fa78e3bfdc4269eaa0736f488094e314b6de
 EBUILD tevent-0.9.31-r1.ebuild 1387 BLAKE2B 6a557ea91f51912187a843d153bf54533c6275e062bc8dcc9a0089a5090b87cedf2c2eb42c0f54e20ec8665c5c0f48d288277762c44440e14a8fc0dd78637c60 SHA512 490a0fe32201715e0dfe71f308101b33cb0d5b82f314253934b685ff2123c9cd39960aa50d51d99f66f984d5b5bb96d1ed28224be0ae3023b6db78e30f9664c1
-EBUILD tevent-0.9.35.ebuild 1514 BLAKE2B 0ccb5903534c6feee6fe1acf70039e4355605c4ba4acbb8f7b345c0dc189f410c1685ba9d644e80891c3f250d063d56b3343b072ce7478ed0d51a02549b50685 SHA512 4b09900c94d3473dcc2a7d3344933a4cc8745d953a4ff8ac79d11f8d14fd42f18a9e72312f84c7bdc2daf8a2b9b328d35613ecf8f55f18a03c253712b5bff0c3
 EBUILD tevent-0.9.36.ebuild 1653 BLAKE2B dc4d3fc496b1b4341ca3f380a91b520ad815e7b9ebe9fdbf958360e9e2415f2df7bcf2f2af897906e6800260b84ecb08b5db130cdfef1de09f86d311e791c0fc SHA512 59e8010af06791fe989e187cdd8b846dfcaec63e9e702966afec2d8d641b4a7353aba8d615b54b7e508410d936574917d27cc2ed875bffb75f56805908cad2dc
+EBUILD tevent-0.9.37.ebuild 1594 BLAKE2B 0ee5ebaa1318bbf3bc68d2507c0b92a234c2fbd87709de5eb84724f6bee76d02b9ddd6c729dac6602e44b10437a5dc446706dfbdd08b07349f59e215e4d08cba SHA512 f0951f7dac1f6d4b2f2a2c9e5264998b7e073f6581a4e3ac52f6ce303fcad8144936a3cbc1632bb46c08d6d85cb96ff7eb88af7dc1a98ba2865a64e52b73461c
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.9.35.ebuild b/sys-libs/tevent/tevent-0.9.37.ebuild
index c2a8eb8ad787..535a4e4d864f 100644
--- a/sys-libs/tevent/tevent-0.9.35.ebuild
+++ b/sys-libs/tevent/tevent-0.9.37.ebuild
@@ -14,22 +14,25 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="python"
+IUSE="elibc_glibc python"
 
-RDEPEND=">=sys-libs/talloc-2.1.11[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/talloc-2.1.13[${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		|| (
+			net-libs/rpcsvc-proto
+			<sys-libs/glibc-2.26[rpc(+)]
+		)
+	)
 	${PYTHON_DEPS}
 "
 # build system does not work with python3
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#PATCHES=(
-#	"${FILESDIR}"/talloc-disable-python.patch
-#)
-
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 066b3c7348c3..2afdc891fd86 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -2,6 +2,6 @@ AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce1
 AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 EBUILD zlib-1.2.11-r1.ebuild 3029 BLAKE2B 7264674176992d231b0e70a7511de1e44f29f57b4facf4c6774854235c0fa0c1a29b11aa8ca7dde025c1990a88489a620d1d012a9634d82d9b75353fd19b5845 SHA512 be364c4b76bbbfe15de428a72bad82575078e1e4ebbfbaecafe7c409bcaece2e03d85415364abc5e4cd959ef602189dc21433196ed94c301f47306afddb67af2
-EBUILD zlib-1.2.11-r2.ebuild 3111 BLAKE2B d529a61167ae3cfb8d385b57295e8bc3790c79976765020995a8b3305ff0efe0b4cc30479feede0d63833f8c72dfa41dbcfa0f58d6acfb0f2720420da3b4ec6a SHA512 407e8e58ffa1e92638fe25733b9ce8eeff906990e60fc4c0dd2a6f8bcf794420dbac2f5a2e989fe9ea962d76d0d9c19fd36ad7e1e6e24f499636d000da36865d
+EBUILD zlib-1.2.11-r2.ebuild 3110 BLAKE2B 4e799dbb6fefb00312eb99fc98901de21f26b85436d49019bfd947c10dddc7f7901e2b8fcc70433bc3f47c59e0e5f68d8636b57cafcef77998beb38753729e20 SHA512 1c7c8098cfaa4c30da615d2863ae317f572d1f51fb9d3252c9d541215a01f45317b2b1617698b5bf3a7ca6ad090b38352ff3fde90dc0455c50dfa8d6fffbf524
 EBUILD zlib-1.2.11.ebuild 2963 BLAKE2B 73b5a86f22babd1b34c8f4a4941114094c948e52ea0e31b092878a5c566e931ecaada4344ba8f038fe7808f9949da32bd9bd5710025195343a650f36d2b0b912 SHA512 851835307c49a56e87c1b741b00a2c69d904978cccf0f236cf09c58169b7ee638e2694797a867825096f94eb77d96f400d6bdd01d78d767e3ec41e91ba3521e5
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index b943b5f359d3..2b4538bfb3ef 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"