gentoo resync : 13.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
commit: a1392efe64137262023d92492396ca9156d22396 (patch)
tree: de438b2711c7697c4597fb04f07e988586f34233 /dev-libs
parent: e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)
158 files changed, 1661 insertions, 3490 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c704af5a8192..08082ce009a6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/actor-framework/Manifest b/dev-libs/actor-framework/Manifest
index 040c8c23ec67..c30b86d4068b 100644
--- a/dev-libs/actor-framework/Manifest
+++ b/dev-libs/actor-framework/Manifest
@@ -1,17 +1,9 @@
-DIST CAF_0.13.2-benchmarks.tar.gz 46365 BLAKE2B f663bc5294ff2de9af2a2ed365961440f36ade8595e363042b40e390db75e84c217d4d3019a6f78e61eb18c71116a498233f194e02e43eb86bfc4b867a89b5d1 SHA512 8b0bc0ad21b454c70fbeef50bce3246a87b8f5ff0bd10ccd196aa2f6c155e252863b1c22e98c589519a5efc43601172dbcf1f9f2e961d49d2babd4f548b0b672
-DIST CAF_0.13.2-cash.tar.gz 7705 BLAKE2B 7c0d8142c52721cf9ca2dd8ad2762af7f812e2e4d754b44996881cd3acc9664843ca1d8dd6ef7bbbe616bcf660319f955c1d4308229d6b45d38a3a0e6ff36d49 SHA512 a264bdc9573b71675b7a8c30fa1a985d1b7e5c39b603b01b53660f52bfcf09c4bd80fe942ef917bc0ecbe305941bf6df5f0305b43d1cfc015992fdf7520e2911
-DIST CAF_0.13.2-nexus.tar.gz 2920 BLAKE2B 87d1df36df423d4c8f88394e6fe5297a5f9b10f825195cfb3c84815c9be7ecd882c921345d802dd40163f447a62f95a1ca9e8e47b5116ee828d9b78670b4fdc6 SHA512 4991ae663bfb5bbb71be9c17c23bef29903d2b797299d52cb68cd5f02681c826ce495ff2badc66442b7cdb0638bfe94209e5226ec5ee3031dc1a63573fe94ad6
-DIST CAF_0.13.2-opencl.tar.gz 15040 BLAKE2B fa92cae918a8a82776e52e7e98bf3616398a9588f70278755201c251e371fffe532c04df31258d00e081b6a88e499deea4e7c3c9f182ad69fb365871c97db64b SHA512 bc18469d2e63f504981cc803e9b08698c4eab100fbbe412caea674a619eece9c30f1ad9537eac833bd55b08ceb92cfd6a1f539ae8d908b46a682712b91d23eaf
-DIST CAF_0.13.2-riac.tar.gz 6481 BLAKE2B a0b6b2c496109bef23ce63893ecb2b91e973ec646b6bde7e87cb0188f12d4564c8a1199a46f10400a4cd54cb1b0c2fff7e3950bc64f1b200a91bb5e0c31b0479 SHA512 ceba0926fa8f28b3af74f6af1d464934674a67daf74abd8c23547b464a64247fbcd5a7cc58d1852c616c477d50ad7b3f9c827b16cd32d81dbd3b0fd4b4f3b2e4
-DIST CAF_0.13.2-sash_cash.tar.gz 36108 BLAKE2B 845be2db87736d673719fdb8305930e307532f45bf48cba5adfcac6412400837d3ac2feb914ce2234cd744dfd5dfcddf6620549035a8f3951ddd7576b9848088 SHA512 e78d694268ddb0979781a0fc1ac9e7d70d4bfa73579afa0008e0b58bc0d7f9d853aec25a4badf90d6d398f9538b46ecdc25a66dfed6d24b9813e3100eec07aff
 DIST CAF_0.14.5-benchmarks.tar.gz 46245 BLAKE2B 1e9477faa604bad9ac73ee7d8fe58bb793f0120a733eddef881fea0c0717f292059190e813358bb089219bc75ad3e581ea120dd84553ee4ef33809ebafb427ec SHA512 11edb5337be18b106c852fe95a7a0d50c9eaf2c21d9e64cee84a60d2e8443083447440a463a24d6cf376bcae421a0d5942b1b3fa6debb7f7102dc8648d1bb15f
 DIST CAF_0.14.5-cash.tar.gz 8182 BLAKE2B 59c1e66b05f509d3d126cd5026949105d9ffaae12013262749e7775ef41b01e725769ea2cd2bcf762827a9b8be1bc970cf1d39c8405ca6fd31a0be949c1f9621 SHA512 0e4fe9dd433a6dc353404eb1a10b898c8589db455f550bafefcea3b0f04659cab3e2b63e353b5dab709080aaa1319942fd56d9eaf3c2d0e244f6eed202f81deb
 DIST CAF_0.14.5-nexus.tar.gz 1510 BLAKE2B 43d09f1b1d4e6202d7c4e4c0b09402f8cfdd38920d9e6b99c0948602fa267fbdd6f285a76935ed7f58d9abae6ada93da6459a1daea5204a4763e9113ed543b27 SHA512 e71cfd629adf83a3fe5a0a33656d9cb499bb4de10cd73fdccf81c9235cc69b277de63dde035f9cd28c8dbc9a6311ce45af13e3d40d14b6c07c5ad9b714dccec1
 DIST CAF_0.14.5-opencl.tar.gz 22047 BLAKE2B 1ea9c4c76b5711a0f4122c1f6a8982a39319f3a8e9accdc1985a39fc01ea83894bc6f51ec0d4bd0f1dfd0ab55f3ebf06def23cd875ddf2fdc30844a8fc106811 SHA512 fb8ea40b16be7646ede25f054688945b21b90719526bdefc786f80581b3f1472945c643f4cc1641f1688252e73e0a0d388e4477c8055b685318d6bf1639cda00
 DIST CAF_0.14.5-riac.tar.gz 8452 BLAKE2B 31e06f80e90b877e085038439a5437d392095b10a0d9f5c643a53ca8c0b0f215fb308030df54bbfde05ab6b130d78c87325271f9418e1352906c25300e58c212 SHA512 b4a70548dd2a839dafadd091334a367d1ba7c8632c47f8df8f6c3ee730b4b4b75c8e00d7c335d719dd9f044e0d40436ea265b7717940ac81531b266b8cbcb5cf
 DIST CAF_0.14.5-sash_cash.tar.gz 36600 BLAKE2B 85e698f774948628779736a69631862e07a6a579c0d05b739fd2730b518701c6910c5744b5f685f45987bdfb76a868206fcefe1087b5b248ea6c2f5493005e6f SHA512 dc90af883553ac67ff8e7bfcc2213200892137a5f9bcbaab95561898bacddaa5687a39a23eef7fd08b9be54fed2816d4c7d6bb31848cfbbc337ac81312f68542
-DIST actor-framework-0.13.2.tar.gz 570416 BLAKE2B e149737c7259d04294fc2a2e15a12eea740de50328f637cbb8b27bbab4411228cfa89e83780c294284f36bf18dab604c95525e1c0afe57522d958349df951950 SHA512 fce8eaec477a1d1f141e631b3160eb4f39d6334023b325545035ab20546e4920cd9418378bf5bd6fadae995d793dfc618309556b541cdf125b377ba413658e6e
 DIST actor-framework-0.14.5.tar.gz 1239461 BLAKE2B 33fc2aee5decc138d3489df9168364efd73781d963b8b5d371bfdbbeb0b1b812489c982099692e2125f4a58f4c0e64c13fa4954b95ed738336ad614cd7bdf162 SHA512 6bf9cd9868b633cdd249f4e5d503bb9d489a68f5a86e9ba505b3b65984ecf5d931878620ace504a8baed34da7a396a68a7c425ba8c8afef15e0557ed9aa19be9
-EBUILD actor-framework-0.13.2.ebuild 3618 BLAKE2B 78afd86e6c9d4ab24d4936a09819328347ff8d0228ad44d6efc70deb8479e32b4775b2ca027370e1d6bcdd9909e73e95bf89576f6f453e1d9f7c051ea2733df9 SHA512 b8ceacecf1139ba562ffd804319a4e7252e9978b1ae412321175f2f4fb5c173213a085c954c1d7ff6385175a1d6e84fcc2f9ff9c0b76bc35b0a4b3117b34aba6
 EBUILD actor-framework-0.14.5.ebuild 3605 BLAKE2B b8aea37d42f8120c27d3232f3382dff58741dcf18d59c2df47b7fd31abd73e507e0dce65307c9c449649184ba1dbd633256135a544034720288df4f079571ca9 SHA512 3b4978bf1ab416e79ded80ccc679e988fbe54d40ad5b3f977de27e4c2d442077bcd0536f79982d20cdbc338cb79d5527a107aa6ed8fe976e94e75dc6f82e7e46
 MISC metadata.xml 1327 BLAKE2B 9019ed54e682bb647a7bd0168d17e36efcaac7966ad1bf1164bfdabdff51aec613e6a568b6eb957f7249e5cf117a6a80417e19936a11d6883c6fba6cb171d8f2 SHA512 a984b1557bbe7845f587ba500bdc3396fb878868ac8b04295c2a2aedeb139ea1d18ab926ee484aae79a09e6c995428afaee92ee79f396db3cda9ff6be3783f6e
diff --git a/dev-libs/actor-framework/actor-framework-0.13.2.ebuild b/dev-libs/actor-framework/actor-framework-0.13.2.ebuild
deleted file mode 100644
index 49242e511bc0..000000000000
--- a/dev-libs/actor-framework/actor-framework-0.13.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic cmake-multilib
-
-bench_ref="78c746269bb53ff0b2026e7b1a8fe11fabc69e64"
-cash_ref="847edfb18afa6b755a91a203872bcd66bbeb5868"
-sash_ref="9da5a40793d77e7f6d3afb504cf02c0acb59d35c"
-opencl_ref="91ebbda2986f3f32a873d02ca5eb550f26c6b70d"
-riac_ref="855e725739b7688290f66f592f858149c92375c5"
-nexus_ref="90d42335ff3a2fe67ac4ae41a844f0b245bb123c"
-
-DESCRIPTION="The C++ Actor Framework (CAF)"
-HOMEPAGE="https://actor-framework.org/"
-SRC_URI="https://github.com/actor-framework/actor-framework/archive/${PV}.tar.gz -> ${P}.tar.gz
-	benchmarks? ( https://github.com/actor-framework/benchmarks/archive/${bench_ref}.tar.gz -> CAF_${PV}-benchmarks.tar.gz )
-	cash? ( https://github.com/actor-framework/cash/archive/${cash_ref}.tar.gz -> CAF_${PV}-cash.tar.gz
-		https://github.com/Neverlord/sash/archive/${sash_ref}.tar.gz -> CAF_${PV}-sash_cash.tar.gz )
-	nexus? ( https://github.com/actor-framework/nexus/archive/${nexus_ref}.tar.gz -> CAF_${PV}-nexus.tar.gz )
-	opencl? ( https://github.com/actor-framework/opencl/archive/${opencl_ref}.tar.gz -> CAF_${PV}-opencl.tar.gz )
-	riac? ( https://github.com/actor-framework/riac/archive/${riac_ref}.tar.gz -> CAF_${PV}-riac.tar.gz )"
-LICENSE="|| ( Boost-1.0 BSD )"
-SLOT="0/13.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost benchmarks cash debug doc examples +mem_management nexus opencl riac static test"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-tex/hevea
-	)"
-RDEPEND="boost? ( dev-libs/boost[${MULTILIB_USEDEP}] )
-	net-misc/curl[${MULTILIB_USEDEP}]
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )"
-REQUIRED_USE="cash? ( riac )"
-
-src_unpack() {
-	unpack ${A}
-	for i in cash nexus; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	for i in opencl riac; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/libcaf_${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	if use cash; then
-		mv sash*/* "${S}/cash/sash/" || die "died copying sources for sash"
-	fi
-	if use benchmarks; then
-		mv "${WORKDIR}/benchmarks-"* "${WORKDIR}/benchmarks" || die "died moving benchmarks"
-	fi
-}
-
-src_prepare() {
-	find "${S}" -name CMakeLists.txt \
-		-exec sed -i 's#\(install(.* DESTINATION \)lib#\1${LIBRARY_OUTPUT_PATH}#g' \{\} + \
-		|| die
-	rm examples/CMakeLists.txt || die
-	append-cxxflags "-std=c++11 -pthread -Wextra -Wall -pedantic"
-	append-cflags "-std=c11 -pthread -Wextra -Wall -pedantic"
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCAF_NO_EXAMPLES=ON
-		-DCAF_NO_BENCHMARKS=ON
-		-DCAF_USE_ASIO=$(usex boost)
-		-DCAF_NO_CASH=$(usex cash OFF ON)
-		-DCAF_LOG_LEVEL=$(usex debug 3 0)
-		-DCAF_ENABLE_RUNTIME_CHECKS=$(usex debug)
-		-DCAF_ENABLE_ADDRESS_SANITIZER=$(usex debug)
-		-DCAF_NO_MEM_MANAGEMENT=$(usex mem_management OFF ON)
-		-DCAF_NO_NEXUS=$(usex nexus OFF ON)
-		-DCAF_NO_OPENCL=$(usex opencl OFF ON)
-		-DCAF_NO_RIAC=$(usex riac OFF ON)
-		-DCAF_BUILD_STATIC=$(usex static)
-		-DCAF_NO_UNIT_TESTS=$(usex test OFF ON )
-		-DLIBRARY_OUTPUT_PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake doc
-		emake -C "${S}/manual/build-pdf"
-		emake -C "${S}/manual/build-html"
-	fi
-}
-
-multilib_src_install() {
-	DOCS=( README.md )
-	use examples && DOCS+=( "${S}/examples" )
-	use benchmarks && DOCS+=( "${WORKDIR}/benchmarks/" )
-	if use doc; then
-		HTML_DOCS=( "${S}/html/"* )
-		for i in pdf html; do
-			DOCS+=( "${S}"/manual/build-${i}/manual.${i} )
-		done
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 4a72a2423b81..187813c118d0 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -10,5 +10,5 @@ EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d74111904
 EBUILD boehm-gc-7.6.10.ebuild 1382 BLAKE2B 3de675fa3d346ca7ea2c94ab32e1b7f09fc28a5632365e159e6081785c95e3fe302c1a54d2be3b4ada0ed4ce81080c331cbd52b40afb3b422bb4690a9cc35628 SHA512 1ded4ce2941cd04c7f06991803c6402435d43f587bb5c7e98ee6da0642115284d2b859636e0f6d65d12225bf84e21ad905046bd2c8a89bd9e6e70d01ec89c124
 EBUILD boehm-gc-7.6.4.ebuild 1371 BLAKE2B 6639a3da75dcd877ca4d0396619bc5256040b3e3fb9f2b38dec22bb72bb4f51687cc5722cac8b564632459fda7e69f44417f15ddc22e0c03eb14a5ed0a0bbc0c SHA512 940f6d91db5904b846f4e10108c472d9402ebe383ba76ba74b025336f1eca867c7361bfa8127588ad612494cc1c79b74b52b8972bd8fa78e2109f17d17ef0f0a
 EBUILD boehm-gc-8.0.2.ebuild 1380 BLAKE2B 74f6b8a142175c187959d6041b930fce4e96461677312de1cdb418d6983093da979eaed7c0fef6d9d3e9dba8952168348706b866a064e18cb000e892783552aa SHA512 8e56b92e1d1654ae1f7b74dfaf6feb975adf6e07ad8a07bdf3b61d7ed55b24312e7dfeab6e18edfdb34a511e90885942138ad48c934cc02fffb3bc0403cf19e7
-EBUILD boehm-gc-8.0.4.ebuild 1387 BLAKE2B 176bda007a0a91f0248d01230b0aff15ccb8304b7d4a988f249d78caba03585ade0086a97c97e6f6b1f43f6d28fa1c073f1b90174616111704eba12cd711de4c SHA512 303611df723241e67fd03e73aca5c863fad719b3a961274138c842c35aafc06cb6b1b75e4c0cd3315d448d27b8ddf5463bd58d572aa3baefd5a77dd150c64b01
+EBUILD boehm-gc-8.0.4.ebuild 1380 BLAKE2B 905fe659236563f69abbe522c352980f8d2e02ac5c0ad3e4857975c3330df7cac65707fc27fa71c34b8669b80c991dd03b97dcfaf5b663754beea3f245f1746a SHA512 f761f4774e40cd2627708700bc105500a2ab5814000028153ad1e3c7ad7482c76caa614c7466caf0d5d2590c8bcdf23964a3146499d4180428f734f8300159af
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index 9c7b747a2e59..c5d611379c00 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 2d958dc05284..bd9c47dfdc35 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,4 +7,4 @@ DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 EBUILD boost-1.65.0.ebuild 12435 BLAKE2B 6d676b8dad7340828f95a16aece6296c006cae693a1ee7bf2e8dbcb82da443f8aa0c460eaf2ab1f5f0a5c26ec50073db463919c3a3cff2015065d371b1bdc375 SHA512 f04be75c396b21449cde08f40a79e40a733fba706a7170fa233d0c6a4e568bb55d9a539ec9eaa65316de41e24c0b5e739f3ca08fd6a8760e1999caf6c2b0a688
 EBUILD boost-1.70.0.ebuild 10162 BLAKE2B 67b85064587e5f5efdd73492914dd650c53fbd00d4fcaaa02982308db30f77f7adca171b22f0be37d478a56861a61ac74d30f1582e8d5e053c770a19c331d893 SHA512 85c2302eb83645f0e9033efae07acf8b2c66ba1bdaccc8597509a8ba6e001913ac1e235257bf248fab2590761db881f1a2fca8ca093b0331d52cdc6be48eab63
-MISC metadata.xml 1343 BLAKE2B ef8b2150e8e0b69fdb1c6878c8ca7da10bf74a896514139b6e00053803d9e4271e7144661e975d0b497ba298e8f9ae74104ce7ccc4ef0e824a6db8695b0fde14 SHA512 4fd2419b80d6f55d5cd41eb6d464d6a04b036e032a5f5361d91f2911190129af017b6b15203ac282c88c3f256cfb0d171d73b51d1a0f3a570e4a23076f5bc2b0
+MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 9d4579b80fb2..997c258c600f 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:boost:boost</remote-id>
 		<remote-id type="sourceforge">boost</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index 278dd5317b14..2b2c8ba73561 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -1,7 +1,5 @@
 AUX 3.2.10-fix-pkgconfig.patch 419 BLAKE2B 345f161cc6365dfc34e9740e83d44378fee197849dc2a79e96a40e205ab979970ce530a4e701efd5c3fd9e02e0de96987648b6244bc7b2b09514554b8c747789 SHA512 f2b688795317f11f67070b94227ef75afed02353cba5d0d98918a6107fc3a1ec107ab1b33ec29b32047098ca0d2acfda087016eef7de16be58af72ea7dd53977
 AUX cgicc-3.2.16-fix-doc-building.patch 812 BLAKE2B fe7a218331dca0618ce473d60968241ef19d5cce0008bb20018f0effdaa63a5f5c607b0f78df3eefbfb49cd2ed37e2f77d8a65bb781fccaa6014311986618f2d SHA512 c31d72d32dc0df5ec5b5d2286865e969d4ec432b3551c533d2b23c1acae8c4a821ea7891980f2af22da16c71f0561a19a38070a4394f43b4cfc4ec9ec5ed51e1
 DIST cgicc-3.2.16.tar.gz 1409037 BLAKE2B 414f0f9e1cfe8cac0bc55ed34bdd6d745595e2fd55329923fa47d269bb7abb3f1d2761ff9810c96930657c563f5f8aa5285c58943fca072273af3088205629ed SHA512 3334777204f3de57e80f759503db08076fe8e7a12cf779bb50345e7d06c6be4cc612b473bd74eded5debd79684b49c5bb79bcfff1b631a815c7fe9d14960d537
-DIST cgicc-3.2.9.tar.gz 2087796 BLAKE2B ed8049397edb1a232c4636e27bd6e37153df853e08b9a4c9cc34a0f7f196cd1fddb32f968a6bd63bf669e482781f1706ae61c3b5c1e07bc0b5a71a24616f4ba6 SHA512 bd02750a0ad81a64c017e8ccf6cee0c6801506bdc00ea4b0a5e4ea28e35e453122e3e25b3578cb1cb7b22011d5147b99ed79bf7c4702d4c7ab404096aabca623
 EBUILD cgicc-3.2.16.ebuild 937 BLAKE2B 1770a5d37e03b1fa9ea56ba19393ab75fa3855ec6dec254df8a3efc079ec122db7da54757684d18dec53f022a5299d7bbdc6fb8075a14becd3ce80423817acfb SHA512 71f02a35b62b36e57064776817b4407f5ab32d404f8760e92a93c4131fce786536cdbd0807636df5c8fff23f11589b9b36d7fd1b21596b176291c37bc6d0047c
-EBUILD cgicc-3.2.9.ebuild 898 BLAKE2B 7b1d06160131dbe1640af50e8ececacba051be1af684ffb63bdfbf3230f9facdf854de054f18a9f9d390d293bb7f1ba2be2690a168150ad184b212f1a596c35d SHA512 429e72a2428969da7d93ef99f6be25148cc25f980305bb929957ff8775a2dc1308f31d972e48dd653fe74bba83a09b23749e663a2d83a427f3c58ef42c97f77f
 MISC metadata.xml 796 BLAKE2B 8b502996ad54d8dabf3c8279440115f39fb64bb70c1e72bd5ddb90b224f0103c0e011dc0f5985b5fd279a3bd24a05e98d6ea2f408d13cf7881b90bf71efb230f SHA512 5cf675335892f7f230841d62bb77fb947207869083f340c735d3a5b78d39b43b9f0cb911e206f854c2291481420e72fea1abcde2853566b2e6fea858b2695fbc
diff --git a/dev-libs/cgicc/cgicc-3.2.9.ebuild b/dev-libs/cgicc/cgicc-3.2.9.ebuild
deleted file mode 100644
index 393b55599081..000000000000
--- a/dev-libs/cgicc/cgicc-3.2.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A C++ class library for writing CGI applications"
-HOMEPAGE="https://www.gnu.org/software/cgicc/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 doc? ( FDL-1.2 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	if ! use doc; then
-		sed -i \
-			-e 's/^\(SUBDIRS = .*\) doc \(.*\)/\1 \2/' \
-			Makefile.in || die
-	fi
-
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-dependency-tracking \
-		--disable-demos
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README* THANKS
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/contrib
-		doins contrib/*.{cpp,h} contrib/README
-
-		insinto /usr/share/doc/${PF}/demo
-		doins -r demo/*.{cpp,h} demo/images demo/README
-	fi
-}
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index b4a3a6d72389..56c705dacb1c 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -2,4 +2,4 @@ DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
 EBUILD confuse-3.2.2.ebuild 1176 BLAKE2B ccf43f41a046556423e2cf72739fe108d6c647218a7e54b7045c575e4412001b9f9a61446d9be9f259eaddef12392b8592477fff58b3930897811513fd927523 SHA512 c435f6b693d892840adaf9d9e33c4a0306666c864cc4215397380495660e553c2787525be1e7f313b09049261a701f94f18c92c4c74adc862b73696f42823e0b
-MISC metadata.xml 330 BLAKE2B 91be3657843f0a430fe8002a9496e3831c4f6d3d9ac0a04a549835403f01c216ecc95802e023695158ed60a0f194baac91cb75c0f856978aad97e31d2ef5eb12 SHA512 240e353d9f2dc60b40eab3def6e661a9a40e22bf9cdb3e3d0bdc351cc26f45a8104dd5ab487d0248087b6be702640bafc8851c6dddaa315a6260fb61858d790c
+MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml
index d7752ca1cd39..3b320c11f642 100644
--- a/dev-libs/confuse/metadata.xml
+++ b/dev-libs/confuse/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libconfuse_project:libconfuse</remote-id>
 		<remote-id type="github">martinh/libconfuse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index af335b3209e3..f92fbeae7c74 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,19 +1,5 @@
-AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 714 BLAKE2B 7943685af8707162db33ba2970fb8336f9f25af844357216b9e5e01ea92010f71485c85979ffe30dac5734b0f4cd104e58502821856194cdf9f33530b6acae92 SHA512 39dcd0d96cd7c5baaf09b5cd36279e45618498cc545696665a54a5fdccfddd351ef178e888c138e945669814ff2bb72e57161f1d77ef78dd0dbba1d730ee8619
-AUX cyrus-sasl-2.1.25-as_needed.patch 1083 BLAKE2B d6a2c9e2bf6d41ea4a30f2043b6cbaff5a26acf6f8da8f681afcb9c9b4dbab2b52dbd6a37c219b337acf35ea2c67a0afe6ebdcbdc3d8f9ad489c4317656cd4a7 SHA512 8fdc7039fda79e95ec310cd63d72871d7b5b35b5a1b6cf30b9693f6a02e265d924e375ddc65158f38de129b5da058ecd26038f988153ff0aacf2665d66f40abb
-AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 BLAKE2B 33817cdaeb79b03ecd6f75eb98b4946f4c7ca9a7f0ccc194200409d045d158642fecfc7dded004b25735d85e8fd55b378625ffc2bd97f045490414b9eb6b55fc SHA512 d1e39d856addf6b53a278669df6e87f0fddd9a1ceadc0fadf2bdac239fcec8540c797118be642a58e65e2ec667d3c2a4b604f68f659433e64dbcd5bfe35b9a82
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 BLAKE2B 2d932e05863da6b108eec405e792003d6d8df4bde07bd044537729232a9b23e7261cbb33b82df7c5685ee96aae3e0aed62317f89e970fbedffea65bf9d89ccdc SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f
-AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 BLAKE2B ed64d970d3321d4f4e8dcfc0ea28638cbfbbe9dc29f585462c81cde945759d3ef9dde275b1472377176973fa8ba15d0beddfa4c32f30762e5e71b618e2a7bbe6 SHA512 033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5
-AUX cyrus-sasl-2.1.25-fix_heimdal.patch 465 BLAKE2B 63a7eac7a5a36010d73be0d522a83036125025f8996e555ca31291826fb8d9455b4eabce816a0db5056033c6ab36df74a01d572acfbf9443b3cc30e5c382bdec SHA512 fcf498e70069205d07a5bd4de781d2005d762faca620a39094c9e3885bc1208b7bac499bb959ab91cf09a927476ce80ea995ba701dfa35f6c7404382a9549492
-AUX cyrus-sasl-2.1.25-missing_header.patch 224 BLAKE2B 5b42d952bf72e8886fd0e6f470cf0e23aca49942d31698aac9e271884b95fa4ab3f49d539a3dfe34d08c734c7f5a13c5063d5169c1ae73c6c788692d7ab4316f SHA512 6da051b45a47db2852d9ff0fdb1bfeb28b7f4d1fa450a9e15d96a67c4b9d3f376cb8dc1c544b5e9e6e1354a85965001e87306a821b7e48437db702a7a16d574e
-AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 BLAKE2B d65e15151232a0c8812b4ba48d796c1948965525f092dff1c0f70bc19bbfe2318355a54d8e1ae6d6ebd955adccd19f5487e4f0c4c519be7cf7f047d230740f1f SHA512 1e79230a3891f1492c7d6f5969f6a4890aaae2f488e9f3942cafeda574bf8810c4fb3e004836f769244db02bae663fa3ac1eeca19658e6fd3c94f2a891ed2653
-AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 BLAKE2B 27a9ca344098a361bdf2aa5089c87e48d8e7717f7c97b965d8e8eda8b00629fbce9d9aebabb4c02f59ffdf50bcdb667dc3fb7bbadd140eac8e3363321a033fb6 SHA512 2da553298b482ca3115294de7264428925911f8d1b6a15ae1af38ee7e0a3191a0f4ad90bcbaeef599c994842a86eea5157b663cb6944f035d9a377dba91dbbf0
-AUX cyrus-sasl-2.1.25-service_keytabs.patch 796 BLAKE2B f41ec0639e0c592dbeb78ac41f85f517742056dacf151a502ac0c4978045d56b3f7e09753ba40c7e2bd05c316409ec46850e5e3683f6c19330c0cab2c207de67 SHA512 1635c20938d7dcfc53f5bf2d48881846e9167d27883eaa8eff8715ce6cebba7307aa0e44d9264f42a8c8d6a1485885b0661a7821703127d8d0f147e44e4a4267
-AUX cyrus-sasl-2.1.26-CVE-2013-4122.patch 3838 BLAKE2B 5a124ef7e4af8749881339a30e66286b83462e10113b51168fd3d67ca77dac34506293fd949688731ea51e8b857157cef6ef071a6828aabf2d16a82f7c0d725e SHA512 3df09f16dc2f4efc601339743eb6e66087977fae4e174aa82c4abb7f85a77aa9eb98629837079236446ef3b494fb48931c9dc8850362a49615749e162b4699c8
-AUX cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch 284 BLAKE2B 77ce4733f92515a98a8f74c68c7e7479d9f0f84302d91d9c3b0e92230f644d59a74588113447320c389c7e48768415f26dbb62fa1a48f3b283b739657f141350 SHA512 f3b789b7dea3f6a51fca6fd1877c81b5f5a3be342fa5c90ddae98a822e0c2a71e8fa582c6cb60c696363aa5cb99db8609cd6b3a91c5d402a0ad1e6124c726f5f
-AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2467 BLAKE2B 83acc34ebe969d2b7cd0868d7811c182181c2588e5973b88c09469e599ae6fbd854762438ce672a4e23d4d0c1000b3da8158b6f1ea2a9428915c472c35aeea94 SHA512 38095e3f6a832893fb1c342f6e19f684a6ee7621fc44b93649b3f301dbc08e2936aba52533ffa97cfd33f320941e19de824e495af26ba628d574548749ef1ade
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
-AUX cyrus-sasl-2.1.26-openssl-1.1.patch 10798 BLAKE2B 4b304d0767b0467ef8df20ca51d6f64339e7b0eb7204dd630e364fa760c532f54d655365d7c96887e7276d40e42377a546e847827a93487318716dd2438a321e SHA512 8fa8370853d0e1f03b701453f79edf783015b354f221467cb64770d88cd0c7bb56b813a16a3777811082b3a2492699264c0447d254b32d033d2c6eaced19486e
-AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 BLAKE2B 4b817b78cfb81181bc2c57402e2e621ccf1cea346c1460d46e76a605cdbd426aefc0fcae5c18c193dcde1562e8fe16a177ead00b3bc3084c03dd0e2466866ac3 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995
 AUX cyrus-sasl-2.1.27-as_needed.patch 1141 BLAKE2B 7d289e96ef1f4593dd48db270dd698a7cf6f21aae3c58043b0f8af30c2d935b24d2a4902f39c9fcfc3261833d1b09032511919f15fc94f62527e46ea25cb2fcc SHA512 9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94
 AUX cyrus-sasl-2.1.27-autotools_fixes.patch 749 BLAKE2B b7f832a5e937053deaf1696f8dbf777ebf789df8165fe90f6d1be7efc47e4114a8a467c74f4acf06245e7ffab22f62436159cd610ebe5c5b0cef61f1cb01fb71 SHA512 0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64
 AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c7b4ef8415df55bf9c5ce821902331792056e6df63e366fd3adebfdf09f0292aae889d0db632521f37ec5ebf74005b71a474ccc6fe250 SHA512 4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904
@@ -28,12 +14,6 @@ AUX saslauthd-2.1.26.conf 687 BLAKE2B da252bac77b65ba2ac680e51573ac4f9f82221af68
 AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563a7e5e504987a6e3089070cf01dd5af73a05c1b43b8b7787f55972a13c4afb05997e6fa3783dccf00696e91 SHA512 14fcfc0f69dacd25ac9b298cf44b0b44146d418424ef16e66edf8893353e418ef53beebb7199bd516b828c40954e4875ab5659f50a09af12ef2a371b944b45b1
 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
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7743 BLAKE2B 26b36b8f68ae6af768e41dba4b7946c814411c70fab471dc9c93dc1487d39079306a1e3eb768920720dc7369883804a0b2a92b8a3c1ed6c997879001ea198eb6 SHA512 2b3f5221dfd76f463642ba9fee1d983c383bd9e490dda8cf41ab63e1f63723866faba25bb2042bc35ab954fb4021d9e2450c99da778185c92aa1527dd53eb9e7
-EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b57203513d7f3c8a82c410085c487f39a54706741700025164188dcef9a8b4622c7491ea995e8c33f374b893044a4a608dca3e1c3 SHA512 741e51ddbe4393927fd637ef84d953126c5fc2c5a877077113e36973239cfd3b0879d20c69dafc74a8b108ba363bc8e87db8bfd533da818ede78f20010efdc5e
-EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
-EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
 EBUILD cyrus-sasl-2.1.27-r2.ebuild 8139 BLAKE2B 1221f7bd37df906bf75b6dd46dd57e443ae429315b85dbd644acb12e02437b6a2d725e1a1a10b19bc140e7acd0faad5ec9750c6b5553bf8f3aaa3f578d0b89c1 SHA512 64fb3438115b5c2539d788bb4067c6f279720b0342cd87c830e8045bb20142dfec7ab8633757c100fbd8fb029f6733126f1e7a9556e9f0d927129ee0fa231fd1
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
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
deleted file mode 100644
index ab28a3dd43bd..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf=()
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf+=( --without-des )
-	fi
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myconf+=( --enable-sql )
-	else
-		myconf+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myconf+=( --with-dblib=none )
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(multilib_native_use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
-		$(multilib_native_use_with mysql mysql /usr) \
-		$(multilib_native_use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java ; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-			# hackish, don't wanna dig through makefile
-			rm -Rf "${D}/usr/$(get_libdir)/java"
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild
deleted file mode 100644
index fab53dab97ee..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
-	"${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
-	"${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.25-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-missing_header.patch"
-	"${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
-	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
-	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
-	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
-	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with java javahome ${JAVA_HOME})
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-
-	docinto html
-	dodoc doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
deleted file mode 100644
index fd823635a6a8..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
-	"${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
-	"${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.25-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-missing_header.patch"
-	"${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
-	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
-	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
-	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
-	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with java javahome ${JAVA_HOME})
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-
-	docinto html
-	dodoc doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
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
deleted file mode 100644
index 023e07bfe40a..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf=()
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf+=( --without-des )
-	fi
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myconf+=( --enable-sql )
-	else
-		myconf+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myconf+=( --with-dblib=none )
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(multilib_native_use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
-		$(multilib_native_use_with mysql mysql /usr) \
-		$(multilib_native_use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java ; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-			# hackish, don't wanna dig through makefile
-			rm -Rf "${D}/usr/$(get_libdir)/java"
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
deleted file mode 100644
index 1b0e7ee417d4..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
-
-CDEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-DEPEND="${CDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
-	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.ac || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		--with-sphinx-build=no
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	doman man/*
-
-	keepdir /etc/sasl2
-
-	# Reset docinto to default value (#674296)
-	docinto
-	dodoc AUTHORS ChangeLog doc/legacy/TODO
-	newdoc pwcheck/README README.pwcheck
-
-	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-	edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes
-
-	docinto html
-	dodoc doc/html/*.html
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
deleted file mode 100644
index beea8eb28d19..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gentoo bug #389349
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -217,7 +217,11 @@
-                  [AC_WARN([Cybersafe define not found])])
- 
-   elif test "$ac_cv_header_gssapi_h" = "yes"; then
--    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+                 [#include <gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif],
-                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                                [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
-   elif test "$ac_cv_header_gssapi_gssapi_h"; then
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
deleted file mode 100644
index 67b48b4a4993..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
deleted file mode 100644
index 5837921d4f7f..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,8 @@ dnl
- AC_INIT(lib/saslint.h)
- AC_PREREQ([2.54])
- 
-+AC_CONFIG_MACRO_DIR([cmulocal] [config])
-+
- dnl use ./config.cache as the default cache file.
- dnl we require a cache file to successfully configure our build.
- if test $cache_file = "/dev/null"; then
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7
- #
- ################################################################
- 
-+ACLOCAL_AMFLAGS = -I cmulocal -I config
-+
- if SASLAUTHD
- SAD = saslauthd
- else
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -1,7 +1,8 @@
- AC_INIT(mechanisms.h)
- AC_PREREQ([2.54])
- 
--AC_CONFIG_AUX_DIR(config)
-+AC_CONFIG_MACRO_DIR([../cmulocal] [../config])
-+AC_CONFIG_AUX_DIR([config])
- AC_CANONICAL_HOST
- 
- dnl Should we enable SASLAUTHd at all?
-@@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS)
- 
- dnl Checks for which function macros exist
- AC_MSG_CHECKING(whether $CC implements __func__)
--AC_CACHE_VAL(have_func,
-+AC_CACHE_VAL(_cv_have_func,
- [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);],
--have_func=yes,
--have_func=no)])
--AC_MSG_RESULT($have_func)
--if test "$have_func" = yes; then
-+_cv_have_func=yes,
-+_cv_have_func=no)])
-+AC_MSG_RESULT($_cv_have_func)
-+if test "$_cv_have_func" = yes; then
-        AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__])
- else
-        AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
--       AC_CACHE_VAL(have_pretty_function,
-+       AC_CACHE_VAL(_cv_have_pretty_function,
-        [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);],
--       have_pretty_function=yes,
--       have_pretty_function=no)])
--       AC_MSG_RESULT($have_pretty_function)
--       if test "$have_pretty_function" = yes; then
-+       _cv_have_pretty_function=yes,
-+       _cv_have_pretty_function=no)])
-+       AC_MSG_RESULT($_cv_have_pretty_function)
-+       if test "$_cv_have_pretty_function" = yes; then
-                AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__])
-        else
-                AC_MSG_CHECKING(whether $CC implements __FUNCTION__)
--               AC_CACHE_VAL(have_function,
-+               AC_CACHE_VAL(_cv_have_function,
-                [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);],
--               have_function=yes,
--               have_function=no)])
--               AC_MSG_RESULT($have_function)
--               if test "$have_function" = yes; then
-+               _cv_have_function=yes,
-+               _cv_have_function=no)])
-+               AC_MSG_RESULT($_cv_have_function)
-+               if test "$_cv_have_function" = yes; then
-                        AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__])
-                fi
-        fi
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -1,4 +1,6 @@
- AUTOMAKE_OPTIONS = 1.7
-+ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
-+
- sbin_PROGRAMS	= saslauthd testsaslauthd
- EXTRA_PROGRAMS  = saslcache
- 
---- a/config/kerberos_v4.m4
-+++ b/config/kerberos_v4.m4
-@@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
-     dnl if we were ambitious, we would look more aggressively for the
-     dnl krb4 install
-     if test -d ${krb4}; then
--       AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
-+       AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
-          for krbhloc in include/kerberosIV include/kerberos include
-          do
-            if test -f ${krb4}/${krbhloc}/krb.h ; then
--             cyrus_krbinclude=${krb4}/${krbhloc}
-+             cyrus_cv_krbinclude=${krb4}/${krbhloc}
-              break
-            fi
-          done
-          ])
- 
--       if test -n "${cyrus_krbinclude}"; then
--         CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-+       if test -n "${cyrus_cv_krbinclude}"; then
-+         CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
-        fi
-        LDFLAGS="$LDFLAGS -L$krb4/lib"
-     fi
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
deleted file mode 100644
index 2e5b1750d00d..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: This patch makes sure the non-PIC version of libsasldb.a, which
-is created out of non-PIC objects, is not going to overwrite the PIC version,
-which is created out of PIC objects. The PIC version is placed in .libs, and
-the non-PIC version in the current directory.  This ensures that both non-PIC
-and PIC versions are available in the correct locations.
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -78,7 +78,7 @@ endif
- 
- libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
- 	@echo adding static plugins and dependencies
--	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
-+	$(AR) cru $@ $(SASL_STATIC_OBJS)
- 	@for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
- 	if test ! -f $$i; then continue; fi; . $$i; \
- 	for j in $$dependency_libs foo; do \
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -63,6 +63,6 @@ libsasldb_a_SOURCES =
- EXTRA_libsasldb_a_SOURCES =
- 
- libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
--	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
-+	$(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
- 
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
deleted file mode 100644
index 92be26003488..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix compiling against heimdal
-
---- a/sample/server.c
-+++ b/sample/server.c
-@@ -85,8 +85,10 @@
- 
- #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
- #include <gssapi/gssapi.h>
-+#ifndef KRB5_HEIMDAL
- #include <gssapi/gssapi_ext.h>
- #endif
-+#endif
- 
- #include "common.h"
- 
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -50,6 +50,9 @@
- #else
- #include <gssapi/gssapi.h>
- #endif
-+#ifdef KRB5_HEIMDAL
-+#include <gssapi/gssapi_krb5.h>
-+#endif
- 
- #ifdef WIN32
- #  include <winsock2.h>
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
deleted file mode 100644
index a413e00bf428..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pwcheck/pwcheck_getspnam.c
-+++ b/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
deleted file mode 100644
index da1a49f1dd66..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: Enable libtool use.
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -25,6 +25,7 @@ AC_PROG_AWK
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
deleted file mode 100644
index 8eff5a8bdd12..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: Fix linking with libsasldb.a when saslauthd is built with sasldb
-support.
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
deleted file mode 100644
index 43b6162a66f0..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Bug #445932
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -268,7 +268,11 @@
- 
-   cmu_save_LIBS="$LIBS"
-   LIBS="$LIBS $GSSAPIBASE_LIBS"
--  AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
-+  AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity], [],
-+    [AC_CHECK_FUNCS([krb5_gss_register_acceptor_identity],
-+      [AC_CHECK_HEADERS([gssapi/gssapi_krb5.h],
-+         [AC_DEFINE([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [1])]
-+  )])])
-   AC_CHECK_FUNCS(gss_decapsulate_token)
-   AC_CHECK_FUNCS(gss_encapsulate_token)
-   AC_CHECK_FUNCS(gss_oid_equal)
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -50,7 +50,7 @@
- #else
- #include <gssapi/gssapi.h>
- #endif
--#ifdef KRB5_HEIMDAL
-+#if defined (KRB5_HEIMDAL) || defined (HAVE_GSSAPI_GSSAPI_KRB5_H)
- #include <gssapi/gssapi_krb5.h>
- #endif
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch
deleted file mode 100644
index 09c9ce86c9ac..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Thu, 11 Jul 2013 09:08:07 +0000
-Subject: Handle NULL returns from glibc 2.17+ crypt()
-
-Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
-(w/ NULL return) if the salt violates specifications. Additionally,
-on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
-passed to crypt() fail with EPERM (w/ NULL return).
-
-When using glibc's crypt(), check return value to avoid a possible
-NULL pointer dereference.
-
-Patch by mancha1@hush.com.
----
-diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
-index 4b34222..400289c 100644
---- a/pwcheck/pwcheck_getpwnam.c
-+++ b/pwcheck/pwcheck_getpwnam.c
-@@ -32,6 +32,7 @@ char *userid;
- char *password;
- {
-     char* r;
-+    char* crpt_passwd;
-     struct passwd *pwd;
- 
-     pwd = getpwnam(userid);
-@@ -41,7 +42,7 @@ char *password;
-     else if (pwd->pw_passwd[0] == '*') {
- 	r = "Account disabled";
-     }
--    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
-+    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
- 	r = "Incorrect password";
-     }
-     else {
-diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
-index 2b11286..6d607bb 100644
---- a/pwcheck/pwcheck_getspnam.c
-+++ b/pwcheck/pwcheck_getspnam.c
-@@ -32,13 +32,15 @@ char *userid;
- char *password;
- {
-     struct spwd *pwd;
-+    char *crpt_passwd;
- 
-     pwd = getspnam(userid);
-     if (!pwd) {
- 	return "Userid not found";
-     }
-     
--    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
-+    crpt_passwd = crypt(password, pwd->sp_pwdp);
-+    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
- 	return "Incorrect password";
-     }
-     else {
-diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
-index fc8029d..d4ebe54 100644
---- a/saslauthd/auth_getpwent.c
-+++ b/saslauthd/auth_getpwent.c
-@@ -77,6 +77,7 @@ auth_getpwent (
- {
-     /* VARIABLES */
-     struct passwd *pw;			/* pointer to passwd file entry */
-+    char *crpt_passwd;			/* encrypted password */
-     int errnum;
-     /* END VARIABLES */
-   
-@@ -105,7 +106,8 @@ auth_getpwent (
- 	}
-     }
- 
--    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
-+    crpt_passwd = crypt(password, pw->pw_passwd);
-+    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
- 	if (flags & VERBOSE) {
- 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
- 	}
-diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
-index 677131b..1988afd 100644
---- a/saslauthd/auth_shadow.c
-+++ b/saslauthd/auth_shadow.c
-@@ -210,8 +210,8 @@ auth_shadow (
- 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
-     }
- 
--    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
--    if (strcmp(sp->sp_pwdp, cpw)) {
-+    cpw = crypt(password, sp->sp_pwdp);
-+    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
- 	if (flags & VERBOSE) {
- 	    /*
- 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
-@@ -221,10 +221,8 @@ auth_shadow (
- 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
- 		   sp->sp_pwdp, cpw);
- 	}
--	free(cpw);
- 	RETURN("NO Incorrect password");
-     }
--    free(cpw);
- 
-     /*
-      * The following fields will be set to -1 if:
-@@ -286,7 +284,7 @@ auth_shadow (
- 	RETURN("NO Invalid username");
-     }
-   
--    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
-+    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
- 	if (flags & VERBOSE) {
- 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
- 		   password, upw->upw_passwd);
---
-cgit v0.9.0.2
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
deleted file mode 100644
index af382181e046..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl2.orig/plugins/ldapdb.c
-+++ cyrus-sasl2/plugins/ldapdb.c
-@@ -406,6 +406,7 @@ ldapdb_canon_server(void *glob_context,
- 	if ( len > out_max )
- 	    len = out_max;
- 	memcpy(out, bvals[0]->bv_val, len);
-+    out[len] = '\0';
- 	*out_ulen = len;
- 	ber_bvecfree(bvals);
-     }
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
deleted file mode 100644
index 6fc9de80287e..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Bug #510320
---- a/saslauthd/auth_rimap.c
-+++ b/saslauthd/auth_rimap.c
-@@ -371,7 +371,7 @@
-     if ( rc>0 ) {
-         /* check if there is more to read */
-         fd_set         perm;
--        int            fds, ret;
-+        int            fds, ret, loopc;
-         struct timeval timeout;
- 
-         FD_ZERO(&perm);
-@@ -380,6 +380,7 @@
- 
-         timeout.tv_sec  = 1;
-         timeout.tv_usec = 0;
-+        loopc = 0;
-         while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
-            if ( FD_ISSET(s, &perm) ) {
-               ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -387,6 +388,14 @@
-                  rc = ret;
-                  break;
-               } else {
-+                 if (ret == 0) {
-+                   loopc += 1;
-+                 } else {
-+                   loopc = 0;
-+                 }
-+                 if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+                   break;
-+                 }
-                  rc += ret;
-               }
-            }
-@@ -484,7 +493,7 @@
-     if ( rc>0 ) {
-         /* check if there is more to read */
-         fd_set         perm;
--        int            fds, ret;
-+        int            fds, ret, loopc;
-         struct timeval timeout;
- 
-         FD_ZERO(&perm);
-@@ -493,6 +502,7 @@
- 
-         timeout.tv_sec  = 1;
-         timeout.tv_usec = 0;
-+        loopc = 0;
-         while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
-            if ( FD_ISSET(s, &perm) ) {
-               ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -500,6 +510,14 @@
-                  rc = ret;
-                  break;
-               } else {
-+                 if (ret == 0) {
-+                   loopc += 1;
-+                 } else {
-+                   loopc = 0;
-+                 }
-+                 if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+                   break;
-+                 }
-                  rc += ret;
-               }
-            }
---- a/lib/checkpw.c
-+++ b/lib/checkpw.c
-@@ -587,16 +587,14 @@
- 	    /* Timeout. */
- 	    errno = ETIMEDOUT;
- 	    return -1;
--	case +1:
--	    if (FD_ISSET(fd, &rfds)) {
--		/* Success, file descriptor is readable. */
--		return 0;
--	    }
--	    return -1;
- 	case -1:
- 	    if (errno == EINTR || errno == EAGAIN)
- 		continue;
- 	default:
-+            if (FD_ISSET(fd, &rfds)) {
-+                /* Success, file descriptor is readable. */
-+                return 0;
-+            }
- 	    /* Error catch-all. */
- 	    return -1;
- 	}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
deleted file mode 100644
index 3b0ffac24f0c..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-diff --git a/plugins/ntlm.c b/plugins/ntlm.c
-index 79ea47c..554a00d 100644
---- a/plugins/ntlm.c
-+++ b/plugins/ntlm.c
-@@ -417,6 +417,29 @@ static unsigned char *P24(unsigned char *P24, unsigned char *P21,
-     return P24;
- }
- 
-+static HMAC_CTX *_plug_HMAC_CTX_new(const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_new()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    return HMAC_CTX_new();
-+#else
-+    return utils->malloc(sizeof(EVP_MD_CTX));
-+#endif
-+}
-+
-+static void _plug_HMAC_CTX_free(HMAC_CTX *ctx, const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_free()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    HMAC_CTX_free(ctx);
-+#else
-+    HMAC_cleanup(ctx);
-+    utils->free(ctx);
-+#endif
-+}
-+
- static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 			 const char *authid, const char *target,
- 			 const unsigned char *challenge,
-@@ -424,7 +447,7 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 			 const sasl_utils_t *utils,
- 			 char **buf, unsigned *buflen, int *result)
- {
--    HMAC_CTX ctx;
-+    HMAC_CTX *ctx = NULL;
-     unsigned char hash[EVP_MAX_MD_SIZE];
-     char *upper;
-     unsigned int len;
-@@ -435,6 +458,10 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 	SETERROR(utils, "cannot allocate NTLMv2 hash");
- 	*result = SASL_NOMEM;
-     }
-+    else if ((ctx = _plug_HMAC_CTX_new(utils)) == NULL) {
-+        SETERROR(utils, "cannot allocate HMAC CTX");
-+        *result = SASL_NOMEM;
-+    }
-     else {
- 	/* NTLMv2hash = HMAC-MD5(NTLMhash, unicode(ucase(authid + domain))) */
- 	P16_nt(hash, passwd, utils, buf, buflen, result);
-@@ -449,17 +476,18 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 	HMAC(EVP_md5(), hash, MD4_DIGEST_LENGTH, *buf, 2 * len, hash, &len);
- 
- 	/* V2 = HMAC-MD5(NTLMv2hash, challenge + blob) + blob */
--	HMAC_Init(&ctx, hash, len, EVP_md5());
--	HMAC_Update(&ctx, challenge, NTLM_NONCE_LENGTH);
--	HMAC_Update(&ctx, blob, bloblen);
--	HMAC_Final(&ctx, V2, &len);
--	HMAC_cleanup(&ctx);
-+	HMAC_Init_ex(ctx, hash, len, EVP_md5(), NULL);
-+	HMAC_Update(ctx, challenge, NTLM_NONCE_LENGTH);
-+	HMAC_Update(ctx, blob, bloblen);
-+	HMAC_Final(ctx, V2, &len);
- 
- 	/* the blob is concatenated outside of this function */
- 
- 	*result = SASL_OK;
-     }
- 
-+    if (ctx) _plug_HMAC_CTX_free(ctx, utils);
-+
-     return V2;
- }
- 
-diff --git a/plugins/otp.c b/plugins/otp.c
-index dd73065..d1e9bf4 100644
---- a/plugins/otp.c
-+++ b/plugins/otp.c
-@@ -96,6 +96,28 @@ static algorithm_option_t algorithm_options[] = {
-     {NULL,	0,	NULL}
- };
- 
-+static EVP_MD_CTX *_plug_EVP_MD_CTX_new(const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_new()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    return EVP_MD_CTX_new();
-+#else
-+    return utils->malloc(sizeof(EVP_MD_CTX));
-+#endif
-+}
-+
-+static void _plug_EVP_MD_CTX_free(EVP_MD_CTX *ctx, const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_free()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    EVP_MD_CTX_free(ctx);
-+#else
-+    utils->free(ctx);
-+#endif
-+}
-+
- /* Convert the binary data into ASCII hex */
- void bin2hex(unsigned char *bin, int binlen, char *hex)
- {
-@@ -116,17 +138,16 @@ void bin2hex(unsigned char *bin, int binlen, char *hex)
-  * swabbing bytes if necessary.
-  */
- static void otp_hash(const EVP_MD *md, char *in, size_t inlen,
--		     unsigned char *out, int swab)
-+		     unsigned char *out, int swab, EVP_MD_CTX *mdctx)
- {
--    EVP_MD_CTX mdctx;
-     char hash[EVP_MAX_MD_SIZE];
-     unsigned int i;
-     int j;
-     unsigned hashlen;
-     
--    EVP_DigestInit(&mdctx, md);
--    EVP_DigestUpdate(&mdctx, in, inlen);
--    EVP_DigestFinal(&mdctx, hash, &hashlen);
-+    EVP_DigestInit(mdctx, md);
-+    EVP_DigestUpdate(mdctx, in, inlen);
-+    EVP_DigestFinal(mdctx, hash, &hashlen);
-     
-     /* Fold the result into 64 bits */
-     for (i = OTP_HASH_SIZE; i < hashlen; i++) {
-@@ -149,7 +170,9 @@ static int generate_otp(const sasl_utils_t *utils,
- 			char *secret, char *otp)
- {
-     const EVP_MD *md;
--    char *key;
-+    EVP_MD_CTX *mdctx = NULL;
-+    char *key = NULL;
-+    int r = SASL_OK;
-     
-     if (!(md = EVP_get_digestbyname(alg->evp_name))) {
- 	utils->seterror(utils->conn, 0,
-@@ -157,23 +180,32 @@ static int generate_otp(const sasl_utils_t *utils,
- 	return SASL_FAIL;
-     }
-     
-+    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
-+	SETERROR(utils, "cannot allocate MD CTX");
-+	r = SASL_NOMEM;
-+        goto done;
-+    }
-+    
-     if ((key = utils->malloc(strlen(seed) + strlen(secret) + 1)) == NULL) {
- 	SETERROR(utils, "cannot allocate OTP key");
--	return SASL_NOMEM;
-+	r = SASL_NOMEM;
-+        goto done;
-     }
-     
-     /* initial step */
-     strcpy(key, seed);
-     strcat(key, secret);
--    otp_hash(md, key, strlen(key), otp, alg->swab);
-+    otp_hash(md, key, strlen(key), otp, alg->swab, mdctx);
-     
-     /* computation step */
-     while (seq-- > 0)
--	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab);
-+	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab, mdctx);
-     
--    utils->free(key);
-+  done:
-+    if (key) utils->free(key);
-+    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
-     
--    return SASL_OK;
-+    return r;
- }
- 
- static int parse_challenge(const sasl_utils_t *utils,
-@@ -693,7 +725,8 @@ static int strptrcasecmp(const void *arg1, const void *arg2)
- 
- /* Convert the 6 words into binary data */
- static int word2bin(const sasl_utils_t *utils,
--		    char *words, unsigned char *bin, const EVP_MD *md)
-+		    char *words, unsigned char *bin, const EVP_MD *md,
-+                     EVP_MD_CTX *mdctx)
- {
-     int i, j;
-     char *c, *word, buf[OTP_RESPONSE_MAX+1];
-@@ -752,13 +785,12 @@ static int word2bin(const sasl_utils_t *utils,
- 	
- 	/* alternate dictionary */
- 	if (alt_dict) {
--	    EVP_MD_CTX mdctx;
- 	    char hash[EVP_MAX_MD_SIZE];
- 	    int hashlen;
- 	    
--	    EVP_DigestInit(&mdctx, md);
--	    EVP_DigestUpdate(&mdctx, word, strlen(word));
--	    EVP_DigestFinal(&mdctx, hash, &hashlen);
-+	    EVP_DigestInit(mdctx, md);
-+	    EVP_DigestUpdate(mdctx, word, strlen(word));
-+	    EVP_DigestFinal(mdctx, hash, &hashlen);
- 	    
- 	    /* use lowest 11 bits */
- 	    x = ((hash[hashlen-2] & 0x7) << 8) | hash[hashlen-1];
-@@ -802,6 +834,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 			   char *response)
- {
-     const EVP_MD *md;
-+    EVP_MD_CTX *mdctx = NULL;
-     char *c;
-     int do_init = 0;
-     unsigned char cur_otp[OTP_HASH_SIZE], prev_otp[OTP_HASH_SIZE];
-@@ -815,6 +848,11 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	return SASL_FAIL;
-     }
-     
-+    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
-+	SETERROR(utils, "cannot allocate MD CTX");
-+	return SASL_NOMEM;
-+    }
-+    
-     /* eat leading whitespace */
-     c = response;
-     while (isspace((int) *c)) c++;
-@@ -824,7 +862,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	    r = hex2bin(c+strlen(OTP_HEX_TYPE), cur_otp, OTP_HASH_SIZE);
- 	}
- 	else if (!strncasecmp(c, OTP_WORD_TYPE, strlen(OTP_WORD_TYPE))) {
--	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md);
-+	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md, mdctx);
- 	}
- 	else if (!strncasecmp(c, OTP_INIT_HEX_TYPE,
- 			      strlen(OTP_INIT_HEX_TYPE))) {
-@@ -834,7 +872,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
- 			      strlen(OTP_INIT_WORD_TYPE))) {
- 	    do_init = 1;
--	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md);
-+	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md, mdctx);
- 	}
- 	else {
- 	    SETERROR(utils, "unknown OTP extended response type");
-@@ -843,14 +881,14 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
-     }
-     else {
- 	/* standard response, try word first, and then hex */
--	r = word2bin(utils, c, cur_otp, md);
-+	r = word2bin(utils, c, cur_otp, md, mdctx);
- 	if (r != SASL_OK)
- 	    r = hex2bin(c, cur_otp, OTP_HASH_SIZE);
-     }
-     
-     if (r == SASL_OK) {
- 	/* do one more hash (previous otp) and compare to stored otp */
--	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab);
-+	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab, mdctx);
- 	
- 	if (!memcmp(prev_otp, text->otp, OTP_HASH_SIZE)) {
- 	    /* update the secret with this seq/otp */
-@@ -879,23 +917,28 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 		*new_resp++ = '\0';
- 	}
- 	
--	if (!(new_chal && new_resp))
--	    return SASL_BADAUTH;
-+	if (!(new_chal && new_resp)) {
-+	    r = SASL_BADAUTH;
-+            goto done;
-+        }
- 	
- 	if ((r = parse_challenge(utils, new_chal, &alg, &seq, seed, 1))
- 	    != SASL_OK) {
--	    return r;
-+            goto done;
- 	}
- 	
--	if (seq < 1 || !strcasecmp(seed, text->seed))
--	    return SASL_BADAUTH;
-+	if (seq < 1 || !strcasecmp(seed, text->seed)) {
-+	    r = SASL_BADAUTH;
-+            goto done;
-+        }
- 	
- 	/* find the MDA */
- 	if (!(md = EVP_get_digestbyname(alg->evp_name))) {
- 	    utils->seterror(utils->conn, 0,
- 			    "OTP algorithm %s is not available",
- 			    alg->evp_name);
--	    return SASL_BADAUTH;
-+	    r = SASL_BADAUTH;
-+            goto done;
- 	}
- 	
- 	if (!strncasecmp(c, OTP_INIT_HEX_TYPE, strlen(OTP_INIT_HEX_TYPE))) {
-@@ -903,7 +946,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	}
- 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
- 			      strlen(OTP_INIT_WORD_TYPE))) {
--	    r = word2bin(utils, new_resp, new_otp, md);
-+	    r = word2bin(utils, new_resp, new_otp, md, mdctx);
- 	}
- 	
- 	if (r == SASL_OK) {
-@@ -914,7 +957,10 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	    memcpy(text->otp, new_otp, OTP_HASH_SIZE);
- 	}
-     }
--    
-+
-+  done:
-+    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
-+
-     return r;
- }
- 
-@@ -1443,8 +1489,10 @@ int otp_server_plug_init(const sasl_utils_t *utils,
-     *pluglist = otp_server_plugins;
-     *plugcount = 1;  
-     
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     /* Add all digests */
-     OpenSSL_add_all_digests();
-+#endif
-     
-     return SASL_OK;
- }
-@@ -1844,8 +1892,10 @@ int otp_client_plug_init(sasl_utils_t *utils,
-     *pluglist = otp_client_plugins;
-     *plugcount = 1;
-     
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     /* Add all digests */
-     OpenSSL_add_all_digests();
-+#endif
-     
-     return SASL_OK;
- }
---- a/saslauthd/lak.c
-+++ b/saslauthd/lak.c
-@@ -729,7 +729,7 @@ int lak_init(
- 		return rc;
- 	}
- 
--#ifdef HAVE_OPENSSL
-+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
- 	OpenSSL_add_all_digests();
- #endif
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
deleted file mode 100644
index d8b4b6efc3f8..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- cyrus-sasl2.orig/saslauthd/auth_rimap.c
-+++ cyrus-sasl2/saslauthd/auth_rimap.c
-@@ -90,6 +90,7 @@ static struct addrinfo *ai = NULL;	/* re
- 					   service we connect to.	 */
- #define TAG "saslauthd"			/* IMAP command tag */
- #define LOGIN_CMD (TAG " LOGIN ")	/* IMAP login command (with tag) */
-+#define LOGOUT_CMD (TAG " LOGOUT ")	/* IMAP logout command (with tag)*/
- #define NETWORK_IO_TIMEOUT 30		/* network I/O timeout (seconds) */
- #define RESP_LEN 1000			/* size of read response buffer  */
- 
-@@ -307,10 +308,12 @@ auth_rimap (
-     int	s=-1;				/* socket to remote auth host   */
-     struct addrinfo *r;			/* remote socket address info   */
-     struct iovec iov[5];		/* for sending LOGIN command    */
-+    struct iovec iov2[2];               /* for sending LOGOUT command   */
-     char *qlogin;			/* pointer to "quoted" login    */
-     char *qpass;			/* pointer to "quoted" password */
-     char *c;				/* scratch pointer              */
-     int rc;				/* return code scratch area     */
-+    int rcl;				/* return code scratch area     */
-     char rbuf[RESP_LEN];		/* response read buffer         */
-     char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
-     int saved_errno;
-@@ -505,6 +508,24 @@ auth_rimap (
-            }
-         }
-     }
-+
-+    /* close remote imap */
-+    iov2[0].iov_base = LOGOUT_CMD;
-+    iov2[0].iov_len  = sizeof(LOGOUT_CMD) - 1;
-+    iov2[1].iov_base = "\r\n";
-+    iov2[1].iov_len  = sizeof("\r\n") - 1;
-+
-+    if (flags & VERBOSE) {
-+        syslog(LOG_DEBUG, "auth_rimap: sending %s%s %s",
-+               LOGOUT_CMD, qlogin, qpass);
-+    }
-+    alarm(NETWORK_IO_TIMEOUT);
-+    rcl = retry_writev(s, iov2, 2);
-+    alarm(0);
-+    if (rcl == -1) {
-+        syslog(LOG_WARNING, "auth_rimap: writev logout: %m");
-+    }
-+
-     (void) close(s);			/* we're done with the remote */
-     if (rc == -1) {
- 	syslog(LOG_WARNING, "auth_rimap: read (response): %m");
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index fcf8d45e22b9..29f7fd16ca03 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,5 +5,5 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
 EBUILD elfutils-0.176-r1.ebuild 1943 BLAKE2B e919191bb34934b44f7a38a008ad2eb09879fdc6b7b7656505505c97dfb4e82051f6f6ee388fa8a224d4b8374d0f4705a23db9fc30dada09411693a71f9ad719 SHA512 b04f95f56bbdc77d8b610272cda54393757bb76c70fa23f4d72dd09e59ccf1636d189f92a6e1b349a4c69e278d960853f30266208e009cb5a07b1273dcd3e242
-EBUILD elfutils-0.177.ebuild 1962 BLAKE2B 1679323257c950ea3b2464f2e65853f3b2abf1517997ed61c2a2604658971c11463383e8a905ef958f8c5a2db59c318e1ca82a2b10b6955342f1d5a597fee090 SHA512 a36297dc7350ae97453ce1db675d1d4f0c4ea7cb5ba903e74c8bb4a89a8eb8fbcd7f42925aafbc6629f6091ed85c2ab306d2b28a11db8235b804c6d3f8889150
-MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
+EBUILD elfutils-0.177.ebuild 1971 BLAKE2B de7d187c85c9984af4ad6b71f33d23268912298f0273f4ee370d6ad257ca136882301386380185b3b8ec0c5fa53a0324ab5593c23ece3489fbc3625652eaef2a SHA512 fec602e67e6b6517ec7c71877eee13e9c422ca77055fb51c890a300cd555c72363dc376429cd0aceb8c981eb31529955c3156070e8c93f5337f68104944a54ff
+MISC metadata.xml 630 BLAKE2B a868e2c1506f03ed2a36575a7395f4cff5688ef1ffd629d0db737a33305dc58a368aca03179f5a7e428b478c317789a4600b9cf4e2a90a3a34a2f402781b966e SHA512 81099941ba6bca61567b62e353c488b3705408cca1d8c097beb1e0f0baacc4d45dd1708932d8f255efb8691d6b94844d267054251cacc0860a369701203d9b82
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 373a5ff08cd7..0bb7a5297f04 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -18,8 +18,8 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
 
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 14c09d810f33..7d0275bbf23a 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="threads">Build the libraries with thread safe support</flag>
 		<flag name="utils">Install command-line utilities (all the eu-* programs)</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
new file mode 100644
index 000000000000..46c83c5fc1f9
--- /dev/null
+++ b/dev-libs/foma/Manifest
@@ -0,0 +1,4 @@
+AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
+DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
+EBUILD foma-0.9.18.ebuild 1007 BLAKE2B a96cc6045f75bdb615375ee48821b446dc141781f887b6a4a0b26a8d7966bd7fab8c0807fc2a81e53579774d4088df6a70b210103f1c70ac356d3d848b2a7f2b SHA512 4391f9d1d2782458af8998d532ace81f54cf3e731b8755bfb6a704e5cd4584237eaed1e813ce9766b326e60779dd922ef2d699196d20747d5b4320324a866236
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
new file mode 100644
index 000000000000..0ed1b811fc67
--- /dev/null
+++ b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
@@ -0,0 +1,35 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2015-06-13 06:24:02.000000000 +0300
++++ b/Makefile	2019-09-08 09:24:22.127655912 +0300
+@@ -1,21 +1,16 @@
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = $(prefix)
+ libdir = $(exec_prefix)/lib
+ bindir = $(exec_prefix)/bin
+ includedir = $(prefix)/include
+ 
+ VERSION = 0.9.18
+-CC = gcc
+-RANLIB = ranlib
+ YACC = bison -v
+ LEX = flex -8
+ LEXCLEX = flex -8 --prefix=lexc
+ LEXIFACE = flex -8 --prefix=interface
+ LEXCMATRIX = flex -8 --prefix=cmatrix
+ RM = /bin/rm -f
+-LDFLAGS = -lreadline -lz -ltermcap
+-FLOOKUPLDFLAGS = libfoma.a -lz
+-CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
+ FOMAOBJS = foma.o stack.o iface.o lex.interface.o
+ LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.o
+ 
+@@ -82,7 +77,7 @@
+ 	if test -f $(libdir)/$(SHAREDLIB); then rm  $(libdir)/$(SHAREDLIB); fi
+ 	if test -f $(libdir)/$(SHAREDLIBM); then rm  $(libdir)/$(SHAREDLIBM); fi
+ 	cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir);	\
+-	ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true)		\
++	ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+ 	>/dev/null 2>&1; \
+ 
+ $(OBJS): foma.h
diff --git a/dev-libs/foma/foma-0.9.18.ebuild b/dev-libs/foma/foma-0.9.18.ebuild
new file mode 100644
index 000000000000..778896159254
--- /dev/null
+++ b/dev-libs/foma/foma-0.9.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of utilities for constructing finite-state automata and transducers"
+HOMEPAGE="https://github.com/mhulden/foma"
+SRC_URI="https://bitbucket.org/mhulden/foma/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/readline:*
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/foma-0.9.18-clean-makefile.patch" )
+
+src_prepare() {
+	default
+
+	# Install to correct libdir
+	sed "s|/lib|/$(get_libdir)|" -i Makefile || die
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	export RANLIB="$(tc-getRANLIB)"
+
+	export CFLAGS="${CFLAGS} -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC"
+	export FLOOKUPLDFLAGS="${LDFLAGS} libfoma.a -lz"
+	export LDFLAGS="${LDFLAGS} -lreadline -lz -lncurses"
+
+	default
+}
+
+src_install() {
+	emake prefix="${D}"/usr install
+	einstalldocs
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/foma/metadata.xml b/dev-libs/foma/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-libs/foma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index f1462e1302a0..34fb8a38d270 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,3 @@
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
 EBUILD fribidi-1.0.5.ebuild 971 BLAKE2B 23b208bb3e27108ec33623166f546878c44b3b2261c3b3519270eecb2dd474343eda57b351ed12a6bf3db96c5b8b52219bed65cd1ac0454c1d8ca1969743566b SHA512 e77a470f58afa0b647087c90109d009cacffebbe0bdec475a449973eec0f94f3249bfd384c8e69d31df09edec523569afe8021a6610fea642f96f1cdd0fcbb50
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/metadata.xml b/dev-libs/fribidi/metadata.xml
index 996e7cacd217..8cfcbe768dc4 100644
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fribidi:gnu_fribidi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 83ec980609fa..0ec1a709b26f 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,8 @@
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
+DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51
 EBUILD girara-0.3.1.ebuild 1055 BLAKE2B 31476edfd1e68fc846b2eb339d098d82dbb2fb04d8751b57568661b357d1016b44abafe5a8fe6871120d4807dfd6415da5187b4a00ba98801d6c01eb1912b835 SHA512 1c5f4296473db9674a97be80f7bbd8ec697230853196d175ddf542fc96e2ba215c28f60a1475798c5bcb92eff220cc888eaf458b33d05190a03cac8035f390bc
 EBUILD girara-0.3.2.ebuild 1049 BLAKE2B 042c375f57bf86f8c8af4b57b7e167ca41367238690dbb55aad6b5144e8ba4ab2dbe9d9b83b987e8763b49a8e0a98ec1bfcedc71ad45b94dd348f9b5777bdb4e SHA512 cc415478c8b086aa8a6ebb0296ec5c1b3d276b64dd5251f173002ec414ff3ad34f4f19dab9cb6c7f145a50090c119f79060cdb7400be0a92710677748313eb9c
-EBUILD girara-9999.ebuild 1058 BLAKE2B 3d2cec206425a1d8e392b5012d3328f7667fa2070c1b485377411de87ea5bc3a23463f0df76363178a435dc5958d6de93000cf21b68b43121052d90e3fce93f4 SHA512 b1e88ec6fb934ffc3e3c5d85e0e514aaf18d7fb20b591ef5ec08972bf64a34d3e8959c1c2c74936510f950cf2d30fa0f1566e56dad522c784d257f4ce3b6000e
+EBUILD girara-0.3.3.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
+EBUILD girara-9999.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.3.ebuild b/dev-libs/girara/girara-0.3.3.ebuild
new file mode 100644
index 000000000000..6aba9061dfb2
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/json-c
+	 >=x11-libs/gtk+-3.20:3
+	 >=x11-libs/pango-1.14
+	 libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+	 doc? ( app-doc/doxygen )
+	 test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+		)
+		meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index a650dd0c40b7..6aba9061dfb2 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -40,9 +40,9 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Denable-json=true
-		-Denable-docs=$(usex doc true false)
-		-Denable-notify=$(usex libnotify true false)
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
 		)
 		meson_src_configure
 }
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 2acaf57453c2..e6b88fe4e3f3 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.58.3-r1.ebuild 10907 BLAKE2B c600133aa1db3ec6d7171d83c59fdb6da341d2c074847770b88828c34e0616819882ff3604d79291e621b18724b8ae2e57fd5cf1fd9250ac31622d2de2157887 SHA512 011fdbe52c49f32682f5735ba4332e25e87b5ed8efe3da9c5fd543c282ea7932deb11d05cb93b6ab92460f0d545e0c7cb3798c4c3f736b58e9b5ca3ee388e1eb
-EBUILD glib-2.60.6.ebuild 10142 BLAKE2B 1c6567841cbdbdd0bb3d114d33be08b4c5a202c49ddaba8ee5d686682f9c1265535e4547e4ee6f2bafe938c301f0aba24f90cf175e89696e7f29bbaf6daabcdf SHA512 ff1cd340ceefd9bbcb579d87d346e7ad16afa7e30e2c96fbb6639f15fe4f58954da4000a5fe40cd2fc8a80a001ca7cbec426d15014dc66e16fe24092b99ccf7e
+EBUILD glib-2.60.6.ebuild 10141 BLAKE2B 8772b393f4399521373cb02d167de1c3d0d665d91a8ad78081dbdff3e5abc10d3ab077be9aa9bca47c2ffc24fc641f9b851b3398ab70dcc5aabd7efa0cce9808 SHA512 1908ab867dcf7843747b6d6a1ace9dd508ca837c4a7c8771b73e1b48b3e42066feb0228cd1e25bf47641a33ebfcd9113f544f89f747adc8a7f2ae9ff69fa9cf2
 EBUILD glib-2.60.7.ebuild 10148 BLAKE2B 2ebd61ea78d44be8fda45dc9a13690af237bcd8a4002720a5743bbc171e128aea6fae71d6c19eddbaa565a3f5436d85290d38c1cc5ef346b28ed0f027110ee63 SHA512 978271f013dc19b9acb3e62ea47016ec67505c1950f3f8db538fc6d55a238bf1a632735a34af64a33949ea9492bcbc46029efc3fe427494a7edd1a8ea02ba204
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 7ea978200ad9..989de333118a 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 68c4e3f67f19..8df135d5b80d 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -6,6 +6,6 @@ DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdea
 DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604 SHA512 9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
 EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
-EBUILD gmp-6.1.2-r1.ebuild 2962 BLAKE2B 0321eeae64c04c74aaed54da12803759351f39fbfde7b53b146c31d760f6b9fd79d18a3f7d256a56e6b21a18042b68923bd9ccdd7a68cef3729cbe01aac469c3 SHA512 90090db4b581cb8630e0512c744643157c58fcedb5f6072d7f5a094748f9d724d36bdf1ad8f39118a083473458d26b042461931a10f2f9e0acc1b56c06868b3d
+EBUILD gmp-6.1.2-r1.ebuild 2955 BLAKE2B 2a239bd97fb0f05f0de5c94622c33d101657bd5ef1cb2527ac541616a925d5232a91dc9bb97f8577924b890cb369192203bf98415f95b4c917517f7456376ea5 SHA512 92e7b1f973a4cd587143458cd7c9421ba18a628b0713657e371cbf2f40e028fed6b29ecf34ba90767d18b31df9dc5579e78c619d35b6ac16ff5b1a8192fbb101
 EBUILD gmp-6.1.2.ebuild 3034 BLAKE2B 5de624947cbaa0b8edcc8e79312ae08f5fee41a1fbd31534cd13df246f9ec833142bc5e47501bc0d3da913763481328c83f84942bcb5380ba7ba87d30c5bb382 SHA512 874fb4368d5685dadafc758bd657bd60677207f0d9316ea5ef978acb26a7158e14fd6df5599aeb05dcff0094ca4b66201a09930639737f35eb11947853fd1d96
-MISC metadata.xml 361 BLAKE2B bde6f7cbb7a65e5ac80991eff4a8498b28242b5555ba0ea57718eb47df9f9e5cc681f5ebc047ca1a7bf87fa701e945050dd0a84aac02dabd9bfe5cd8d18393ca SHA512 f78bce3229fea097143ee33259707e6fa9da3adc03b4f10f8881be0f8e772df87a590c0d5a9e37e81a98d955bad63182d4bd5c18467e8f03557de412c18fd86f
+MISC metadata.xml 437 BLAKE2B 74945994e080552031f2fbcf051b5fb638712205d40433225fa010f70376a96903da3945dfafd4594da53624628d1abb9929a854cde7a60fa2e88fd01f0ba025 SHA512 c1d6b6a603472a84703310b3dcc72eefc66858ca397519cc42d06750b57d6f9683c9ac908cd3fc3aa16406957ed23a6ddf12a3cba6b20e97c21758b4ed3425ea
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index 090c6d82458f..9682b2ed2d35 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 5fa58802c03b..84e19205350d 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 926cdbe0eab8..1594d23fefe5 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
 EBUILD gobject-introspection-common-1.58.3.ebuild 1021 BLAKE2B 42f44b301be74849799c2f3b4382090aa2aa419bf50af10c7143c01251ebb9eab93997bef45e25680a3fd0d599e9bd4979bce5d6f50272199a923da6b3c7a2f1 SHA512 07e3ee6f0ec78190f024045a04b9ae3b83c34c4e495ebd99a9ddd1ad8233ca5989aa54158ed5c77bbff1d98bec21698bb46ac007c75ccd71dbfe23b50b3a4a02
-EBUILD gobject-introspection-common-1.60.2.ebuild 1024 BLAKE2B f0374b9d3c75cdc9fdc2f495fbc4d6835f2d90a52d01f54eeea7b09a4760eed6680753f96f4921c6bed78ee06fbabbc7bf1d4c71b6f1bbea0086e8ff612bd579 SHA512 781b22523d1bfbee0edeaddba568cbf51260dff4cabf94329018cca5539ce66d6f2c208e30f1c8428e297bbbd2a2a5f3b335f3446378ac34154a2daaec789c44
+EBUILD gobject-introspection-common-1.60.2.ebuild 1023 BLAKE2B 9e9708d55cc98d99469b86ca9646554f7bdbc0f8806bb4f1e0204d718dbcbd6bbc059de5720354f13c4d4fcd0bf8f84ec254b1b4f38e41326022da2069edc584 SHA512 8cde81b8926f0b625f762a349b01793ec5383f333f45606a6ad4bbd5a1b20c9889a7fb63ce3d20c8d223017dde728005abe2dc68698f4b11204566a91f62cbd5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index de62f83e3ef0..a0b22e1b18ff 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 51027f33c294..98de3d3fb7a6 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
 EBUILD gobject-introspection-1.58.3.ebuild 2201 BLAKE2B 53844bc18ba8ebe1e7f5e4e290c323bb02378793b43590bf9326c2af5fee6ad72d1083a37a2e16f654cc4c6a01e0dfa496954328ac1b9bca07aaea24791210ad SHA512 ede4515431a1d256694d18801416eb22ffe4bc6feb7cebc714178044acd396f2044c61976a3703add9066c99d08a2cad16e02b2c38cdd83725509584d4558bd0
-EBUILD gobject-introspection-1.60.2.ebuild 2118 BLAKE2B f1ffc01c08f1386c7d8a61d6b86d05ba0108e2c5f7dac3d1f519eb48ca86cf3672ea160c5aa3d2d6f3cb5df1934e179398fea8ca89ecb3b3c701cdf44f6651f8 SHA512 c513a4ecb0cf78cafa477680dcb3f1df773c0175e9b68fb84f6188a5de2523c9551a192e0fe7905581a0d951464ec21bd2c107408b1ed686d9eccdecaed71a2a
+EBUILD gobject-introspection-1.60.2.ebuild 2117 BLAKE2B 7e7ca6e4e201616a22e563fa353918fc7575354d2de5d52e36b909538dce5bb9a3ee59653be39857593490d85aaccda0e5c4f3fe691c9cba3f71e95b3b95f683 SHA512 c94f0ab2e261b369a7fac5b67a5725bf8cb8f4210203da5f259860420bda7484579803f1ed53ff3fa1a48698bc9f7763d671319891d18a777dc96036758bfc60
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 5161c5e448da..6cbcd37f2d0a 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index bc800c550845..b7f45c592fd8 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -21,5 +21,5 @@ EBUILD isl-0.17.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ec
 EBUILD isl-0.18.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.19.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
 EBUILD isl-0.20.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
-EBUILD isl-0.21.ebuild 1272 BLAKE2B 9cc2f1ced33b3a53c25b78ef2b0bd483d00333b0ad271ed6ec8bfa4878aa3eca1b67b7b7e0c3dffd3546c9e631fd925d449a89474aa6c9217c717f93f321bca4 SHA512 8c80585be8c0efbd232bd53d054a17e3561fb6e81e22c73008293924e0c36f571c5ea7b9b0c17a90fb61528b63298eef081fd956e72882bce0de15a60c2ad996
+EBUILD isl-0.21.ebuild 1265 BLAKE2B f7d466ec90d4c133d29f2c9251e9d1d6eb842c3d35f6cca97bbf2403588a568aaeccaf858ce5ec130b504e679f2ba67661906c4264b08e66fab41d30c1272124 SHA512 98a0b368f47c6fbca98660e2dc496518380dcaf8af7c216a673147a5e1287b5b055651ad8cd2fa162958e4541fe24db181667d8254afee11a3eab93b01214bfb
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index 89604d8e331d..24942d622e84 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/legousbtower/Manifest b/dev-libs/legousbtower/Manifest
index e07a7693eff6..367b1fa86fe5 100644
--- a/dev-libs/legousbtower/Manifest
+++ b/dev-libs/legousbtower/Manifest
@@ -1,4 +1,4 @@
 AUX 20-lego.rules 83 BLAKE2B ac95969960bb86f3b5e18d7c9c00b49e4ecb2fb850f1481ca290de12e76eb3b14d0b4ddf225f569c8a8005bbf5a557590a63d9c7fc1881e2e6884a30e75d91c9 SHA512 1e708d5c5d1169075c6ba626cfb362e473e4d026c8ced32f888eb6874637bf7d655917b08f15738cb53eb4be78f8c243c795293862d109683e895507f30dfc61
 DIST legousbtower-0.5.4.tar.gz 22782 BLAKE2B a77f1e2fbadc7b7ecc93ce1726d4dbc47048cdf9edb7627cc08a4fb571657b0e601f7cd9b7a8026892a596ffaf8c3c9d26e4074c7aef57a78964087e905e38de SHA512 169cf31d4585bf3b7bd9aded76d202bb14e285f644f8aa10a6f4bf6d99e6f28efc33c65922388cdfa17a1bfc0dbc777edc1fb45484155543a42117eaba6fb7e7
-EBUILD legousbtower-0.5.4-r1.ebuild 734 BLAKE2B 67d528bfea0082bc1f2f83062f1db75d12e891fa1a3a6d818951acf0534147d6f448dab3a94e18f46088ea833e673e71452302cea1a14f40427c50c1336ea94a SHA512 43b4d1e9cbc7b7989d1a93d8f4cf5ed25b08d00304dbc2d86f0f9cd8d4cb99898f78da3063418a05f96bd887ed43edf3bad57700b6746a52d42077fa5de7d633
+EBUILD legousbtower-0.5.4-r1.ebuild 905 BLAKE2B b6a1855fccfe7e85933094d15d38308c81f103c9a7bc2f46c2388cac67264eb4274a14b4752b0875ef0246f35079bedcde65f0a841a3ef29b462e396c91ccfbe SHA512 4e52ee06c59bd1ca64ce145521fed6bcb4d9709e394f19ba3e4f4a8964e034e8618697e6aa22bf98bbfce407df078d1c4a317f7c68f49ad63320ded3cdd51bc4
 MISC metadata.xml 244 BLAKE2B 9eceb013695379bbfd076331cd25d5c86c334913652e1f634b1b9dea98d36fa9e9a70e40606f45dffc0c437b96c3213cc446f6d460839d9b87440bb1e984b7c6 SHA512 dd104cf292c56e0c1faced64aec00bd8668ee8925116d795a47b3e1fd88f5a743ec64111e4095b9afbaa2823c20bcb5100bf1ffb5d17e5a19389112249a835a6
diff --git a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
index 51fdecaf027b..f24ec9097bb4 100644
--- a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
+++ b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,9 +10,12 @@ SRC_URI="mirror://sourceforge/legousb/${P}.tar.gz"
 HOMEPAGE="http://legousb.sourceforge.net/"
 
 SLOT="0"
-LICENSE="MPL-1.0"
+# The specified license is wrong as the file uses code from proprietary
+# SDK.  http://legousb.sourceforge.net/legousbtower/index.shtml
+LICENSE="all-rights-reserved"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
+RESTRICT="bindist mirror"
 
 src_configure() { :; }
 src_compile() { :; }
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index c8235eb64e17..d3b60dce4550 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,7 +1,7 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
-EBUILD libatomic_ops-7.6.10.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
+EBUILD libatomic_ops-7.6.10.ebuild 805 BLAKE2B e2bec8c11d5d7115da41570c7c957e9624d45790b7bc055eaeb4a5129693363c0a92879f44dedb7cbe30c9dceae916c62ed7ea736ed54b5f65b5fd8248e2b334 SHA512 2893b22fb92880f345ccd8a6053f36da2ac4a958dce78aadb50cc7f4162bf0a52de8800d5a10f6aa40c2da44798242254a944c0002a1a25d5d2b30a5928d0371
 EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
 EBUILD libatomic_ops-7.6.8.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index 331540a7867e..7a052eac7faa 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c6cd27824e72..c9258531a3d4 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -3,4 +3,4 @@ DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.10.0.ebuild 1248 BLAKE2B 966ec0504283ad8e6a50e956c75f6125820e5c6c4b4e199dd24b0a84889ba9c52131d09464daf651b45dd0e48b82ffd1f5ef78aed9889e645f7e95a39105906e SHA512 ad524116200a19498374b424f0f34c86ee7e82b176d56b1ed0e5e6b91e98c3ce5f5d3c0d00bde1150df8315fb25f39040d37bd0413899b0aa2b29672b25bd636
 EBUILD libbsd-0.9.1.ebuild 1283 BLAKE2B 7ab75ea2173790f66c0910a9bf913a34b51be3d41fc3c4bcc5186053b8cfb9f3259e4bee24af6096b100ff5f6c8742e86676722be24aae1ea0503f0a07819c01 SHA512 2fe38faadbc7f8a14bd26f10cbd312f82343743b6b822a6e2dc3ec3e552abc1a988fb0addcd6a9e81ceca3184a2ac188872f4bf890a2e3d8fa20269f8f4af3b3
-MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
+MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
index 0f6db5621bcb..1ff7e0b3b454 100644
--- a/dev-libs/libbsd/metadata.xml
+++ b/dev-libs/libbsd/metadata.xml
@@ -5,4 +5,7 @@
     <email>freedesktop-bugs@gentoo.org</email>
     <name>Gentoo Freedesktop Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:libbsd:libbsd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index a56f1fb28e9e..839107ae4422 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -1,12 +1,8 @@
-AUX libcdio-paranoia-0.90-mkdir_p.patch 635 BLAKE2B ed82c6ad81e3fc9540f9dade8e7b006b37cb98240c867e8673ed9ff6f928ed7e6ac5c7bf1356cf10a1437972a68fdf7d7770825dbfbc1e8b58615137a6168bbe SHA512 e4f96b631c7dcec607878af5b4c26307b9b002ad7a2866f31030f9c5f596607d0ec2df760941220d3ec209919b2cd9f911afe80240d7a0ab67b163e34759418f
 AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a
-DIST libcdio-paranoia-10.2+0.90+1.tar.gz 634050 BLAKE2B 10a7f8b2a45e5605afa6961132f0bf949ba51222a6c23b7a933032e3e430e60104eae8f7d49fc6ec18894fe0e826e9387f67f186af0ba277a9e7341484aa8ac3 SHA512 c3d00b57f22deb19be929ba87f41bbd83fc51ca66e8ccc1da7acb4131d85449fdd38161cc3ec0f1714fc0571e219d72029b5a72f853c139aa479695df783aad6
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
-EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d5329130fc7bdee625ae7306ad8a61b357ac80446ccac85841f1431ab873d0ff7ad5bf443ce6fa56fb66803261dc469e5b61a32ab6acc SHA512 7aa1a3fb8258978074a86f04ec5bb78253505152a13aea868182b46daa2f7ff4ce97adc130e53a0a7f7a2fa2ab7a9959d3fbd71824eb11f42dfc7ff797af266c
-EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
-EBUILD libcdio-paranoia-0.94_p2-r1.ebuild 2009 BLAKE2B cff2adbdac88fcf8cee94c35cb1c3f9cefea244a5d51f210ab6c3b19932f7096745a810b83be6a06f5bbe8265f316d36c97e28feb67138c93e1c0ec41b6af482 SHA512 89fb173584c80a3a5aff705e7909f271419b429c3c2f825b87a3b74000b52bc2a12df4444d2fce3a77ff137ed6cc54df0b609e7a4246d1b7c9eb8194b848fdf0
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1982 BLAKE2B fb1b4690d302164cbe4f2f9e6d86fb5349b94916acea665c21a2e917257f4c44cfe702a62e60f3b4931ec7b331d2b7541e11801cd599c6708eb76121b124ca95 SHA512 4760f18a0ee97186eac7be774249f3151d1a96779a0f570368fe426696a5888dddabebd25b8711ed3b8b2cdbcc33267b293052ec0d95767797f0649da46b5c8e
-EBUILD libcdio-paranoia-2.0.0.ebuild 1742 BLAKE2B 4c322cf8e34d896b9d2be87cf4d1acafe519dd800c78b875f8269103df9362f425308bda7573bf269aba7f787cf3760beb7ad63f403f454b13c4b8adf2d4af62 SHA512 f5baff391cff3d32c4199cab608a7546f12203814f966890fdf99735e29dbc4260f1657db7400264933a8a6adde25f428548119f0bd59b97b03a08f6eac86863
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1881 BLAKE2B 3972d7584139843181874247aaaa6822f68399eec7eac9a838c4cfc5d758252f51e448efad8973cf55fbfebf1436c5b2b60aa8745e7589504a8651031921999d SHA512 6ddc7284a0cb7583237cab0cdfa406c62d36484d4daa68542b6736e6895a01fc356162afe9991a7ceae148c23673ab0e0a9fbc23f52ba02aa5e99f2c618b8f5f
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2112 BLAKE2B ed01b795dd9bdce94ba6fdd1005be383b72948b0edfa21a6b89fb93c3f76ad87550e7ba7933950e00a9c2c2daa840c24a5f9e39bcc55ce9f8abc840166035d4e SHA512 275b23a95e1328e24d87ac4bfcc66547b0bcc5d0348b64f3bed9d7af916d2092ee63d7239549fbab1f0e428c01948c0eb1f3de0140e78457fced65f562fdec25
+EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1872 BLAKE2B 8238f4f7fbd1558c01f268eeb177d4b15a2a3e956315f48e1a5f4c18f89ba0c5cf7a46ad242f928da5df41f3c1f7f223b24ab1651c1d01c0b96d4aab3f1b5052 SHA512 f98deabc1b5b20b2e08da0f7e482568bcc320424fcbcf190be91a53bcb6e47b673c699b476fc347918506eb083a9bdae5e4241d444563988b64620032ce86a47
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch
deleted file mode 100644
index 98681d0a08fc..000000000000
--- a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.gentoo.org/455374
-http://github.com/rocky/libcdio-paranoia/issues/1
-https://savannah.gnu.org/bugs/index.php?38273
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,6 +74,8 @@
- dnl Checks for programs.
- AC_AIX
- 
-+AC_PROG_MKDIR_P
-+
- if test "x$GCC" != "xyes" 
- then
-   AC_MSG_WARN([
---- a/doc/ja/Makefile.am
-+++ b/doc/ja/Makefile.am
-@@ -25,7 +25,7 @@
- 
- install-man1: $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(mandir)$(mansubdir)"
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(mandir)$(mansubdir)"
- 	@list='$(man1_MANS)'; \
- 	l2='$(man_MANS)'; for i in $$l2; do \
- 	  case "$$i" in \
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
deleted file mode 100644
index ed391732a871..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.90-r1[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-mkdir_p.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index d10701c912ca..7a6329bc3416 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,6 +52,7 @@ multilib_src_configure() {
 		$(use_enable cxx)
 		--disable-cpp-progs
 		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
 	)
 	# Darwin linker doesn't get this
 	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
@@ -59,6 +60,11 @@ multilib_src_configure() {
 		econf "${myeconfargs[@]}"
 }
 
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	eselect cdparanoia update ifunset
 }
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
deleted file mode 100644
index 85b83bfa513c..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		# upstream accidentally default-disabled it
-		# reenable it to preserve ABI compat with previous versions
-		# https://bugs.gentoo.org/616054
-		# https://savannah.gnu.org/bugs/index.php?50978
-		--enable-ld-version-script
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
index 8ff3a41accbc..6bebe13929d4 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -57,6 +57,7 @@ multilib_src_configure() {
 		# https://bugs.gentoo.org/616054
 		# https://savannah.gnu.org/bugs/index.php?50978
 		--enable-ld-version-script
+		$(use_enable static-libs static)
 	)
 	# Darwin linker doesn't get this
 	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
@@ -64,6 +65,11 @@ multilib_src_configure() {
 		econf "${myeconfargs[@]}"
 }
 
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	eselect cdparanoia update ifunset
 }
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
index a4c7136bb411..792b56cbaeb6 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -49,6 +49,7 @@ multilib_src_configure() {
 		$(use_enable cxx)
 		--disable-cpp-progs
 		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
 	)
 	# Darwin linker doesn't get this
 	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
@@ -56,6 +57,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	eselect cdparanoia update ifunset
 }
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index b1e2ec4cf61c..61c1f569e3fd 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -4,4 +4,4 @@ DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
 EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
 EBUILD libcroco-0.6.13.ebuild 1345 BLAKE2B 02f486419276fe16673640a4b602245a7c0562dfbba2d34e2857caf78236e56a608eef2968895452ce2972e047a8b075788d7d4233cf316d53b2c67e4bede9cf SHA512 c8c61d4b840d904b68d472d3bf7cd4843559ca88637cad44c0bc4185ece192fed5b5705f6f6d45e165b71540f0516a9e69a1cafa9103bcc38089b951138a96a1
-MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
+MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/metadata.xml b/dev-libs/libcroco/metadata.xml
index d296a917b37c..f2d6a4b24c26 100644
--- a/dev-libs/libcroco/metadata.xml
+++ b/dev-libs/libcroco/metadata.xml
@@ -13,4 +13,7 @@ A parser module with : A SAC like api and A CSSOM like api.
 A CSS2 selection engine
 An XML/CSS layout/rendering engine
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:libcroco</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index d2dfdfe7e516..d0303ea91070 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -3,4 +3,4 @@ DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
 EBUILD libdaemon-0.14-r3.ebuild 1391 BLAKE2B 47f8159b2a4aa36b67eb2caf540d4635c2f1ab983032a8b7bd6c18e06316a1ce7bb6d6a119f18e6a5a67c0fdb59645590fb346ff4aa1722c83627f15b49c0c14 SHA512 60fea99760cc407023466ba3da6fd2b51e549c710fa59d6d1ce5960a4f4072a13f464581381fcdc800764021b65f4c4bc17f7acb2beace5d01374115a30a148a
-MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
+MISC metadata.xml 310 BLAKE2B 687f9b62c9f0ba35acf51e9cd7233c2b9c45a072125bea9955b06bdc3bf935f651c379e7a6bb7775335818bb0b331e7774829791bd0c6b598b7d7e12db4cfe78 SHA512 0eaa3a9c6030fbe639a5c0c9dd93e30ea2a5a7d2931a44f3b5491dea49f21313b899b47a5163e878baf37523d2251570116036184ea268bdf63b16bd9a8ec6ac
diff --git a/dev-libs/libdaemon/metadata.xml b/dev-libs/libdaemon/metadata.xml
index 03f633b16af3..f13cc8c4e7c3 100644
--- a/dev-libs/libdaemon/metadata.xml
+++ b/dev-libs/libdaemon/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>eva@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libdaemon_project:libdaemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index dc6b4e49c82e..91f76d0a1a17 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -2,4 +2,4 @@ DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
 EBUILD libestr-0.1.10.ebuild 694 BLAKE2B 828faf8e0caca0ee43ebd9906f610d7b2e1bcf02bbb35ca4dbca2c0faffeee953cdc585846dc6f91115a833efd88bfed9885fb0c5ae51e71e0e0b7b01fcd4508 SHA512 8c84b1c09ce8a881527b24b7cac68b5d0508721996ca0b6455f8bdd1d8d207c90c198346df576738c14973db5de4fcb707ad67c8ebaffa82d49e76854a20a8f3
 EBUILD libestr-0.1.11.ebuild 700 BLAKE2B 706aeb3fd6e57b334f42dc2ff1440630c8a26a5ae4c94d0dbfb336f9a651a73fc215c27900898ed9e2b72fc32ff4916809800abd9341aa2b5d35ccc17846d48c SHA512 861acea04e6aa61abbf375f1d4de0478dd1ff919d71353adcffe154de495ec9c3efecdf42d920a964627ded4bd1a9905ac2a5a1fa5645b8a3d59f8103f96a5a4
-MISC metadata.xml 504 BLAKE2B 9be3182332c3b6e62b74573534d7c1099b5bfab19cad517322c1a03df1909afbfc973cc10fa525b6383ba385d9669c86a2bf309a841bfa70cf35faef40b2493c SHA512 7eefcd09976509a7fcefd342543158a06524eaaaa6e2bcd81b1373cbfd43eed1457b5f240be6f38242dc3236d392a5c3691c0f0889d6a71c302b86c8abe5e8f3
+MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 363a45aabdf8..ac4e1be046fa 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
 		<remote-id type="github">rsyslog/libestr</remote-id>
+		<remote-id type="cpe">cpe:/a:adiscon:libestr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index fca065469379..abad9d22045d 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -4,9 +4,6 @@ AUX libf2c-20110801-64bit-long.patch 1749 BLAKE2B 3df6f21610863361588417697d77a7
 AUX libf2c-20110801-format-security.patch 345 BLAKE2B 723f79e2fa5015c49bd763473ba62b81d7cccae1c3a68dd4da81f560b06ff23e2884fdf7e276079dd99f3241822b6d23ac830062b3ea88177945aacee34e4682 SHA512 758d7d4c1154193b3a5adf3983009cc258844dc1681edda3ba6a761580353f082ee682fc625275976a34ce5e0d4893c304063105986deec066c82afdb3c6cf5e
 AUX libf2c-20110801-main.patch 1708 BLAKE2B becf5fd72a0d9bad9a6fef4d6013b2e1dbedd2b2d1cb9764a3a04772648f24f2875d6257595c95c09b17159baf47c217d4fbdc3cd4d6dfa37980adb306552e3e SHA512 f2c8574f45580d2bf99e5506266668c615f19a985ffa27eefe38d373f083da61dbe486d5c27e034bd38029b46a4a77285e175a7285b1acb37e7a1ecfea6a2bbc
 AUX libf2c-20130927-fix-buildsystem.patch 1632 BLAKE2B 381a2e03ee75f0553325c4b5bbc1191d7262d0fec6d315791684a761f1be6e0749782a679fce805b1d4eb466d0f219d78bec6ef03968addaa47c3a0d1c212c59 SHA512 40191835f7b5d6a9865c68e0fb8a7168715b2f79cad069192427cc657b9664ac9f242c7b746aa821b81c33ae2c08c6d936f838b2f5228acde35d8aeb7c102b93
-DIST libf2c-20110801.zip 128845 BLAKE2B f948693c0aace5725f3a4ab3406396a9f16fbb3c08681fe200ba2ba0b48dadb3c051a510cf9b4714d9fbfebc43e52ba13d6fdbff3590c19a164acc710ebe2958 SHA512 7a7b7b02ca2b11456aa0deba5094aebc1e9f7070d1742ad76450ec79de7eed967fbd7446524b66c52295ed911471d2dc396d171569b5d37079bdca8220fd2fb6
 DIST libf2c-20130927.zip 129082 BLAKE2B 09f818bde8888b569858784c39e93a6a11b3103039f44c3f6a1246b29efb5f8ae6e45f787ed0c2216bea383a79b9554aff30e1fbb00668bbc872b4bc30d87ba8 SHA512 1a12093dec3c250f4775eebd06f1a9144fdb956ea3162202fb67569fdd956ac5591bc563a0726ca65ea10d465efaac1c1d8024d63bc4a4b5c88bf46242607c8a
-EBUILD libf2c-20110801-r4.ebuild 1256 BLAKE2B 1e22881db8cf4e49fd711c556b169156689dcd5b24bbd7fe6ead5c25d206a022aa9b947abc54af6dcd3d1af18f5867b927b677a7123b70e6be3abdb649a9a16d SHA512 d367309ff9a645e412a5ad2af05bacc2a82df6392e36af6176b950f640337b8b68219e339afe41b147824160e47ef1fcbc85c6a906d13801e4d0a7f202528b69
-EBUILD libf2c-20130927-r1.ebuild 1220 BLAKE2B 5e93fce0762ccd432d9adb51d609a8acdd74e4664e809310fe164f089a64c80ff71601dc2150610f18c0a00791bc62715646155a3b1e333bcfe70ef6e64a17f7 SHA512 9802d19550d4cae2c5b45c8e37489bf92aa3c95936e70b24ba93136281ee65ee798841c5e4eddb7580f87084a6f07227166a0483eb9241571f10d75a728d9a0b
-EBUILD libf2c-20130927.ebuild 1290 BLAKE2B a3468ddd537fa482c38e3d633d47f609c09bbed62f92e4b3a021054ce4957f8a0b6113e27028a1c1ba860349e928833df5a1a0efe75160062a354e40f55c7d84 SHA512 a8e33d4a42adc4559828a2c6c8c2746dff6c76d609bd4a0c63c3be8c8b094c3d44afaa89dcb9395f37ac2c2923c473651def6ebcbbdd8e788bcba05ea4836a49
+EBUILD libf2c-20130927-r1.ebuild 1216 BLAKE2B 394a6539a1036aa5370ef547b1f68908028798c4b59a789fdeea95a54082da61d68ffbbaed48f0efb389759f1aa5cccebf26340788ce7275b72a49fe026f8bc4 SHA512 439acfd3e214057cfbb4828513c55fbd6369f1a402152e39811a0758a6d04108c554e42de1c05a2e04a41d170e6335a5cf561e86fd43b67576c3fd60ebb6d89b
 MISC metadata.xml 363 BLAKE2B 854c5e9e83fb984b31f4def65cb25720bacbff0522fe93e3488211611e15896e562ab86a101ea0f661ffa6de9bb15331dce1e39ca614b1987ed35184029a0d18 SHA512 3c5efbb36dba02cfa31cb0b95c78194bfecfcc128b60eb5c11983da6ac26fb0d75bc02e004443fc6365d3cf53b6d9bffc3a0342c185e61ffdc404cb8b4a3f95e
diff --git a/dev-libs/libf2c/libf2c-20110801-r4.ebuild b/dev-libs/libf2c/libf2c-20110801-r4.ebuild
deleted file mode 100644
index 50e2c97344ee..000000000000
--- a/dev-libs/libf2c/libf2c-20110801-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Library that converts FORTRAN to C source"
-HOMEPAGE="http://www.netlib.org/f2c/"
-SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/${P}-main.patch\
-		"${FILESDIR}"/${P}-64bit-long.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
-}
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		libf2c.so \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CC="$(tc-getCC)"
-
-	# Clean up files so we can recompile without PIC for the static lib
-	if use static-libs; then
-		rm *.o || die "clean failed"
-		emake \
-			-f makefile.u \
-			all \
-			CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)"
-	fi
-}
-
-src_install () {
-	dolib libf2c.so.2
-	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
-	use static-libs && dolib.a libf2c.a
-	doheader f2c.h
-	dodoc README Notice
-}
diff --git a/dev-libs/libf2c/libf2c-20130927-r1.ebuild b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
index 52fc3a771992..c91d0619c4fa 100644
--- a/dev-libs/libf2c/libf2c-20130927-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/f2c/${PN}.zip -> ${P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/libf2c/libf2c-20130927.ebuild b/dev-libs/libf2c/libf2c-20130927.ebuild
deleted file mode 100644
index a9e73c1620a9..000000000000
--- a/dev-libs/libf2c/libf2c-20130927.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Library that converts FORTRAN to C source"
-HOMEPAGE="http://www.netlib.org/f2c/"
-SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/${PN}-20110801-main.patch\
-		"${FILESDIR}"/${PN}-20110801-64bit-long.patch \
-		"${FILESDIR}"/${PN}-20110801-format-security.patch
-	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
-}
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		libf2c.so \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CC="$(tc-getCC)"
-
-	# Clean up files so we can recompile without PIC for the static lib
-	if use static-libs; then
-		rm *.o || die "clean failed"
-		emake \
-			-f makefile.u \
-			all \
-			CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)"
-	fi
-}
-
-src_install () {
-	dolib libf2c.so.2
-	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
-	use static-libs && dolib.a libf2c.a
-	doheader f2c.h
-	dodoc README Notice
-}
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index f346bdbbf105..98ef43497502 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,3 +1,3 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 EBUILD libfastjson-0.99.8.ebuild 797 BLAKE2B f6609cd4a28e186ed652cd005df3c851a991fd25d5167bffbd4fbb150376ab2afc12b26b3ab37d0de22de0b1beb27f0bab41d1b0de5a6e0a7b83ea6243a3e00d SHA512 1a2cd8e6388436981a589944e2054597fb1c3c799cb74923b5e5b607e523eda8b6ee9d6277cd44277f1060fded8bfde685d8505e2417277b2fedad8fe9822580
-MISC metadata.xml 475 BLAKE2B 946401e3ea48549fde46fe9433a69aadce62be5d9f9f7b5caff83106e1b494405f5765515537d590fb6119f7a262b24f9cece25a751b34efbbc1cb08b9591b2d SHA512 e347c97a42efce88d50f71438072af0cc1c758990873985a6292606b6e2af8797a63c35ab549ace15c50dd0120d465d0f0b38b24ecf08160fdda45738082bf82
+MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
diff --git a/dev-libs/libfastjson/metadata.xml b/dev-libs/libfastjson/metadata.xml
index 11529b22803b..a90b6aa3f782 100644
--- a/dev-libs/libfastjson/metadata.xml
+++ b/dev-libs/libfastjson/metadata.xml
@@ -11,5 +11,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libfastjson/issues</bugs-to>
 		<remote-id type="github">rsyslog/libfastjson</remote-id>
+		<remote-id type="cpe">cpe:/a:rsyslog:libfastjson</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index fc85acf25ea8..befa2d6875ff 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -13,4 +13,4 @@ EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
 EBUILD libffi-3.3_rc0.ebuild 2110 BLAKE2B e5641dec038a77e1df1e332bc66fcc3d29b8976037321c2cf55775579c5428a0b5f94e3cd6b56d1565f4f78c8b588a68163098d3790dc28208e6a50ce27816fe SHA512 0a380d8d78429531b649ad5b1b6f9240c7af1019db080f6fe45f8e5df8742420303f79c4433dfda5ff9443534dd28e11cb0627c1db4c960cb24f1c9d1bebc2b9
-MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
+MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index d8fae30b11e1..6e9a28c5ac88 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -36,4 +36,7 @@
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 40d0e17b6002..575e036a12a2 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -7,4 +7,4 @@ EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
 EBUILD libgcrypt-1.8.5.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
-MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
+MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 9b7e9f273f57..f983c8bdca42 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -9,6 +9,9 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
+	</upstream>
 <use>
 <flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 </use>
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 95b3cd9653f4..ced1b7dde534 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
-EBUILD libgee-0.20.2.ebuild 683 BLAKE2B 92acdad228938f5eaf1c56355d220e594f51b9fb57f470f4158cd7474e6de2df3d762a3e8a00b821264309f4ffeed86cc19789727b241e62aa42e10338065acc SHA512 b953f6bef70bc76c6952f57b9c3603857ea5b235571c25b6604d9fd3f999869d875e9739415bf96f401a582bc1812de203a34d913b87cbd394e21d640c958230
+EBUILD libgee-0.20.2.ebuild 682 BLAKE2B 2b274f26366a84efb4c40862f953deb29ea4a9dc2fedab397590146959e870d7d4b83bde3f0784c8556b1cf455ded52638cb6f96da68863877bc35a1355463f3 SHA512 04101e7bfc81a553db954080009e5337c960e5afbd4106c207a1ef44bb0f5e8da5f608e8f23ce8713d0e408f17ed0c24d0ddb4e0b4f8082714b11efb5d356338
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index b3be4767d4af..a929f90f5448 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 9f1ddbe4802a..8b1cd5eca738 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 EBUILD libgudev-232.ebuild 1113 BLAKE2B 1e963ec6a6ea7bcc322d55489203147edcbbde2593bdc9d24461b0bd2c2d6fd806d1b357b9b9ef4e7a47cd49f5826e96ec61506859f8ca6ac59e7a0fa745e63f SHA512 858e3f1db9b255b87115ebeeb7922db41cade10ad7b6cc1a45fb96f0108e20c6f29d54702fd2435a160d96141ea3b07f3eb595ea505f8367b0eecbc53faada64
-EBUILD libgudev-233.ebuild 1117 BLAKE2B 73f951d7c614b83b5fd8185b8be871f212cac1e3e0d6d0dea487b85a1b485382bef29d52b8b4340d38a48b3cb9259676b2d38cee339ab84eaa010da2cfc494d0 SHA512 49298c5be56ca9d509d115cd9a1ad0578c43b43bf8ceb571bec86ad3b4672d0897f216de25ffdfa070dc49e2b8ad387f1585791d42be0d483dde254bd35215d5
+EBUILD libgudev-233.ebuild 1116 BLAKE2B 0a1a9a03cba6b37cb21401d0b703bc7ff9c53101ce3d92c755df69d09097d60bc56991e657180504611279bc9df94bf3824b25c93bb653935c1da0c8eaff8dd0 SHA512 6959781fe0ebb6e99087abc98723179c9e5dcf98916cab86884987dae083fbe088c45f832c7bd3994513be00629ed1c34787b55b2d63e6a0d046f7932f6a5c3f
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233.ebuild
index dcc92f86ab31..c4c93639be3d 100644
--- a/dev-libs/libgudev/libgudev-233.ebuild
+++ b/dev-libs/libgudev/libgudev-233.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 0edb53931af5..a4f140e86814 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,4 @@
-DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.13.0.ebuild 1145 BLAKE2B e5b005971d77f8ead2d0c9132f968934c152f011ffed7ff6ef67403f9b04a5dc28fb12ec30975909021e2c7de9995713ebf35ee02621941cf16e11ae27019b62 SHA512 49f0f2abb804c5da0674a100d6d403d78df2f65a10f2bfbab60ef6cea054882db881c5875deba16d7b43798011809ba492b079b05fdbc3b4c0b49ed8c167afbc
 EBUILD libixion-0.14.1.ebuild 1081 BLAKE2B 9b054acb579d7e2d409386418433caf13e0d2c35559ffe77321e7878c7654ff943582c15785235f3aacc85660f324cabf6205227f0f318387ecca4c275317f0c SHA512 5e85969c94c1abc2ebfed5b1ba2e41bb45ff798e1bfcf1633ab9c11b53562d32d8d0fbcbf61c35cd3450cc29e7dbc32e570163d2c5b0ef53f878cdbcd260e6c5
 EBUILD libixion-9999.ebuild 1103 BLAKE2B 8ca8c29a35df52397f9e0d83671595f11ee97cad1302df5c159cf5ca9bc573bf8dee310d1d39d8bdad088c379d6e917c44fbf4e0bb8a3713df91d0977093c441 SHA512 7885380b0401262c300439b8c3c32f636c58abe65bec7478c8bcb7601ee9cda24bba34e469b0bc024ed6d96e8e4b542d2e247173d3e8c3d35dc27087667f0544
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
deleted file mode 100644
index ad201abb3871..000000000000
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="debug python static-libs +threads"
-
-RDEPEND="
-	dev-libs/boost:=
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	=dev-util/mdds-1.3*:1=
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 01fbee7b3ebf..403accc7ab23 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -2,4 +2,4 @@ DIST liblogging-1.0.5.tar.gz 571051 BLAKE2B 46959fa20d4cf00dff1eaa099ad69c199b18
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
 EBUILD liblogging-1.0.5.ebuild 735 BLAKE2B 9c7d51507c6de7ebb7b040b55aa60e7ebb21108b6092813c7119bd91ffcfd74f2c434f53a9d392069165c985f0d942149af8bec11c57bed6aefac1a9af0106d6 SHA512 9cdb8e7a153da3c646ca9fcaa24c928dc5f8eeca715bdfec6168a924d823ce8871140eb6b049aad3869ab4373d02e17785c580ed7a12ab28d8d102790b045b04
 EBUILD liblogging-1.0.6.ebuild 813 BLAKE2B 9f0f75b4d4cc1f28daf26e33982eb6f338e8569905f8a0f8f9f81fa676cb7bb0aee18a120c988ca909aefa5438b5ded2a2590de3dc7bf1c32c55c2155a573f4e SHA512 adc5da8bdb207461fcd51a15953df1ff00d07ea9bc4ea6467ddbd1889a22041b818e183a3ee795cd008cdf53eb0cd79f408c5f6031ad86c6c58d4f38d580f72a
-MISC metadata.xml 731 BLAKE2B b90fd6b63701e1a86f4ebb4e2c0d2139aa029a2bc7886e53491fae69feb589bc041b6fff7d0cab3f9b818cf0e979e2f51314e8e2d08ea2e64b96f580df1bef34 SHA512 3d8645d66e6e193d29b720ad618ca530ed793d229fe38afeae43a2bc741e3794d993ab97ac04b1e5cc2979472c81265bf43ed27786c1b3663320747c09fd0464
+MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 50284e1c1566..06391ac7ae29 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -19,6 +19,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:adiscon:liblogging</remote-id>
 		<remote-id type="github">rsyslog/liblogging</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 1afbba27b72c..55c42ccd2ffa 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -4,4 +4,4 @@ DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff
 EBUILD libltdl-1.3.5.ebuild 905 BLAKE2B 17a29c9938412946e98535f381d2b52356066803ae38807a2c7291a7bfb5b2c295d245753bd1c90f0404946e33fac288b939d65fe83317a369be8ef8aeb8dce9 SHA512 046ee53a680c7632700f78af5cb917cd8c9e284677020f36d342f88654f2253d47a3ca1ad01ec7b06797b9d8f5f64340618490f68699c23bdf124ccec503027c
 EBUILD libltdl-1.5.26.ebuild 866 BLAKE2B b67843df8ba4070f31ef8924b38a4a8c0607617b08b087dee35be01d2581fc04b6b35f5c81035fb43ed804e4424c38be69460b9c5243a0d1cf6a3206d920933a SHA512 8f5d1ba52a19df56d5efdd1a3dc9cc1085cab22b69badad778f6a10cdc5e9a1771216dfece334cb48d29b713881760a170770d58b66a6ac182a5e58714b94c71
 EBUILD libltdl-2.4.6.ebuild 1142 BLAKE2B f924f6626c14de066d238c6e3e32f601335eea616a5f351b0cc138140729c92899090008167566a9bf56e98f13dae4f5642773300caaf0154fd9433c34d2fd42 SHA512 961583240e659f8c60a6343f30d83944bef8e0d163d9a8d3760d6c2de7651b54a3d067b1ecb1cbd0ae13b4ff491ff6ccdef5dfc16a74a31a48916bc0f58d2781
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/metadata.xml b/dev-libs/libltdl/metadata.xml
index 56c124413057..c9dbcd910423 100644
--- a/dev-libs/libltdl/metadata.xml
+++ b/dev-libs/libltdl/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index b74435514872..5ee3f1e22c4d 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,5 +3,4 @@ DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a31
 DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
 EBUILD libofx-0.9.10.ebuild 1113 BLAKE2B 3631d753f719ba404467879b18d68ab9fddebe637b7ddca3e8c3821afe0a3d5527e9e6da69f7e031ef468b844f81ee567954ffde8a6c2939dfbc3965966dc2a4 SHA512 42493172e283ddf49306c5487eb22c5889b45d6c900fb41c1c33ab003cd316f4681ed239dd92a0a5b78f8f8b7bbb54fcb288622aa194b0ef4d602d853eecf9ac
 EBUILD libofx-0.9.14-r1.ebuild 1257 BLAKE2B f7cdc1d8f889624622bfb931ec3a514543c38433221c05df6fc0945763bb7cef7bf624b1353c9053cca1441e62e589c55088305b153e3c2f26c6cd7ab29cb3d3 SHA512 84b23985144ae9dd542306af7554a27bd02988e1ca8480d9e4445824f307c8a30506134d52d2da92dd29ae252584e656e88a6292af4243fbbcc3084e8ddd5110
-EBUILD libofx-0.9.14.ebuild 1226 BLAKE2B 9e56f0f44a875bb1e6548258483a73ceba593786321025bace10fae788b3569e645dff71cd3d489449275de533b036fe1b9d2baf7f68914958de295569976e0a SHA512 b64a98e16ebe5f3b1d5cead085683ec607d8d05e9f4ae33170f2820b1ddc28f084c7e52e80dbe735f7272345649f536c7b064ede0ceca999c3bea14af23f566f
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.14.ebuild b/dev-libs/libofx/libofx-0.9.14.ebuild
deleted file mode 100644
index 7896e2e8c5e8..000000000000
--- a/dev-libs/libofx/libofx-0.9.14.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	>app-text/opensp-1.5
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )"
-
-# workaround needed for ofxconnect to compile
-MAKEOPTS="-j1"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# we will tell you where we wants the docs!
-	sed -i -e 's:docdir.*::' Makefile.am || die
-	sed -i -e 's:docdir.*::' dtd/Makefile.am || die
-
-	# configure arguments alone don't disable everything
-	sed -e "/^SUBDIRS/s/doc//" -i Makefile.am || die
-
-	append-cxxflags -std=c++14
-
-	# build will fail without this. shenanigans...
-	touch INSTALL || die "failed to touch INSTALL"
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 0b3362288b51..c1fed6eeb866 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,4 @@
-AUX liborcus-0.13.4-boost-1.67.patch 1705 BLAKE2B 5c1fb62ff088163d07fceff4e230bee4728bae2bf4cf4f6e9b5cd0e15037560439efaa17a3b1cd4526df57fd0b5747454db54c6b7a382de4ff8afb9d1da87348 SHA512 eeb343ae4ec779e1b5a40ee93d3220d3e18a7bd3b906935d02e0019412a09c3e182a9e9ba67db30aa8f4e7b859a2fafcd68fd2daaa9d6506a004fd8176fc3ab0
-DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.13.4.ebuild 1339 BLAKE2B e3ffb431c8d4afb5f0e77ce8a6c1a6c2bebcf31eba4795161cd81fdb423997aecfdb7d9fea4bf2b4d328866128916f366e38837cea09ae5fb32dc59cbbd37bf6 SHA512 498f4d5deffdfc6bfdf42f41abd05bc4759ad88a0e29d0e1058a7e73eef0507e922cd5f79ea4f0dfddb6050868f0ffa3c6b2fced6f0dd347e5f6eff4a8aa7527
 EBUILD liborcus-0.14.1.ebuild 1232 BLAKE2B 9ce83461f3537a81c8d885b37b02f0d2d7b9db6d1ac3d89d8998c74f91d6f369790fd0c1d9a3086b96710dadcc129fd2b4375442ad2863335d1a3558276ac15f SHA512 59703cf3d056ed1c69de0f2d4a08067afcc1ea81541d9078d51e6bf270352d348d975420aa488e79f6710e321f7e283d8dab3c559694d6b12d46d39ee5eddfd5
 EBUILD liborcus-9999.ebuild 1235 BLAKE2B 9690fc7b0ae34d59f4fc3b96ddf1e590d101763859503e4097e7b63fc92412a57986e10f1b6f8750725dc8feab001636ac0dc4b44aebf43986fa860fd0617278 SHA512 63cc21fc924c9c599dad935ab51d4754e38ed6307dd21d0e6674c3fd74bd7f6fb623ee91a8778a409f1908ce5d6ee6646ecfd5fdecadc7ccaf4f50c651efabb7
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
deleted file mode 100644
index b1d44b8db4cb..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer@suse.de>
-Date: Wed, 23 May 2018 10:45:56 +0200
-Subject: [PATCH] Fix build with Boost 1.67
-
-Boost:DateTime that no longer accepts non-integer types.
-In the past, these types were implicitly cast down to integer
-values. Now this requires explicit cast.
-
-https://svn.boost.org/trac10/ticket/11168
-
-This fixes #60
----
- src/spreadsheet/sheet.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
-index 7df1aedb..33b372ad 100644
---- a/src/spreadsheet/sheet.cpp
-+++ b/src/spreadsheet/sheet.cpp
-@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
- 
-     double days_since_epoch = (d - origin).days();
- 
--    double ms = second * 1000000.0;
-+    long ms = second * 1000000.0;
- 
-     posix_time::time_duration t(
-         posix_time::hours(hour) +
-@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
-     if (time_fraction)
-     {
-         // Convert a fraction day to microseconds.
--        double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
-+        long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
-         posix_time::time_duration td = posix_time::microsec(ms);
- 
-         hours = td.hours();
-@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
- 
-         td -= posix_time::hours(hours);
-         td -= posix_time::minutes(minutes);
--        td -= posix_time::seconds(seconds);
-+        td -= posix_time::seconds((long)seconds);
- 
-         ms = td.total_microseconds(); // remaining microseconds.
- 
--- 
-2.18.0
-
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
deleted file mode 100644
index 81e4c1673a31..000000000000
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
-"
-DEPEND="${RDEPEND}
-	=dev-util/mdds-1.3*:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index defabea2dba1..c6cb7fd30ed0 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 EBUILD libp11-0.4.10.ebuild 786 BLAKE2B 9a8f418682368369a9db4a8e98f51f28a4034d2ca4c9e7d5f431fc966390f99c9a5c2678b9f30b27c2bdb0b1111a6b3661d229366ba20951ca26d8a9e2ab1863 SHA512 9ab3cd1b4ec99218d14d6e8af3ccbec6fce882bf8eebc84b4440f55d9e27b2137197ea94904e0ae17fc15dcab8bb015fe9bb6371ce0c3ffb5c594adc64af7ad1
-MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
+MISC metadata.xml 677 BLAKE2B 1978fa530cb22a95932fe30b3a4a317aa5be5ec105b2202d06d4076a5f7c320c261f1ba40363651c35eb0aa67511ab93f73656821657edce4df3dd2214b15d81 SHA512 735a547360535a34ad22c4bc81aa4d2d20c5717b33c6e1fe89cb8da17810e1226d7990141c1cc3c195e1e2ac8dbc3c52d78d50161241e8f65ea1406336269905
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index d6d0837d385c..831b8dce3afa 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="doc">Generate and install API documentation for the package.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="github">opensc/libp11</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 	</upstream>
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index fe655e437dc7..570799850057 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,3 @@
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
-EBUILD libqtxdg-3.3.1.ebuild 945 BLAKE2B 6d2d8add873c6a95d6492c4b930ae23116a24ce0bf0875fbd5c026389556edf50a6953edfffb89a8b9a915f26abb6a0d8853a59df1b365597c0f1595737c76e7 SHA512 a7ec712996a2cd6eb195845bba8cf27cd6c8ede78fee0f0aa15dd97064b4e5abbc62a90f147d72b1ba81148e2ea03bfa3c0bf925cb4f86df0b68aaf452b1ce05
+EBUILD libqtxdg-3.3.1.ebuild 952 BLAKE2B 700cd5434c978398171cf87d762e35968b598abbc2cb2dfa1303796fdade01ce41da61f6c17a0702f9ddfcbccd43cc7fdd241adef57718f4cf448a2512e400c3 SHA512 d3dcaa7c980c02ea089cceb8de12801f3aa8a907e49ced5f62756e21fe5147fd22e67281d1aa1efc2acb5f691eba96cc414dfa90ba8b1fcfc46ea22c8251edfd
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index 91b64f8020e3..b9a18597a1c9 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 9ee274c1c275..4da4db862b76 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,8 +1,6 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
-DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f4727610bf2d5aeca7321fde4e4cbc009f59bee46c1e5e5b88825d5bd2f3b4fa427ab3cd535584956f7541c16339f1d SHA512 9665e50ee964ca3cc323f26c2b8322677102d26a7a102558ffbc5bef7a4c4ea44ca5096a967e4044dac1404bfa343a37d846f22d1e1adc27592023d5d4ac40c8
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-3.6.1.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
diff --git a/dev-libs/libsass/libsass-3.6.0.ebuild b/dev-libs/libsass/libsass-3.6.0.ebuild
deleted file mode 100644
index 7bb47a910936..000000000000
--- a/dev-libs/libsass/libsass-3.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/sass/libsass.git"
-	inherit git-r3
-	KEYWORDS=
-else
-	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
-HOMEPAGE="https://github.com/sass/libsass"
-LICENSE="MIT"
-SLOT="0/1" # libsass soname
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md SECURITY.md )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != *9999 ]]; then
-		[[ -f VERSION ]] || echo "${PV}" > VERSION
-	fi
-	eautoreconf
-
-	# only sane way to deal with various version-related scripts, env variables etc.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc -r "${S}/docs"
-}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index e8cd84b594b3..eb7b70c6228f 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -2,11 +2,9 @@ AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d
 DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
-DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
 EBUILD libsodium-1.0.16-r2.ebuild 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
-EBUILD libsodium-1.0.17.ebuild 1306 BLAKE2B da03b755da6c2afa42c04c629d2f5f446f6b53bc1e5ad037e14451297eced8491ecb0c3741317f1784b5167aa34b6a024cd157f35b2aff0705d38b00cf7ba515 SHA512 13922c24a0abd9b75bb7716bef8f82ad46005a72c81350a90dc510f85005a34b30ea9f23df1a01caa9b4d6bb4f2a9f79de376bd875594fce00cf34e5d30a8333
 EBUILD libsodium-1.0.18.ebuild 1314 BLAKE2B 923670f66bee00609fe26356adc982103013d80cde9d4fa78dd14214aff05a13bef7cc1537b8e0164aa467b7d51d614bb012fa412faf035dea98593af7424087 SHA512 17c116372b69ddc2e52ad125b2a1c5da26df4cee12977855203dc7af7f2d59062a9950ca382848ffbd235bc9f63d2d10708442422e11db80618ab037d6526618
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild b/dev-libs/libsodium/libsodium-1.0.17.ebuild
deleted file mode 100644
index ca8df8c8f25f..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable minimal)
-		$(use_enable !urandom blocking-random)
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_aes aesni)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
-		myeconfargs+=( --disable-pie )
-		# --disable-ssp is needed on musl x86
-		if use elibc_musl; then
-			myeconfargs+=( --disable-ssp )
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 020e53fc73aa..00ad8720e6af 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,4 +2,4 @@ DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe7
 DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 EBUILD libtasn1-4.13.ebuild 1169 BLAKE2B 5c73d0e3b295b55119251f08cdecfc9d9594bbd6fc9eec6ddd11c6743704075caccf507ba22071c3d1f41b18b30232591a2c5afb71f7625daf43e975e3d3682b SHA512 66e9032f34ed0d179c4eda17bf53d1ec153d943a33c71767ee55a6894917fbb9715d2fc4d797a2abbe2e8e72d5dc215ea9db4612ec6909d240b176a2f83c990b
 EBUILD libtasn1-4.14.ebuild 1192 BLAKE2B 467335199718a62c712a767a6fa1d40446cd4b95ade3ab5ccbcd9b09a8ed80b9a95514ef0e09491e25fd01866b4182ae2577009db7996c383c04461328a4f187 SHA512 2093ea48c8052f0d1e7d8b75109d4c801ed5ed2282a49b4fe4a9441fc4ba5711df97f049d2f38987fc590d9393a68d7acbd14901fd8b43b6b682fef25f34d8bc
-MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
+MISC metadata.xml 428 BLAKE2B 85413f31c74675764c652ce8bec334384a0696c3eefdb517cde5f73c6385e9f52bad2087613b9fc4f37074fbcbdd6953dd25f87ba6095d13cf08a1aadde1488c SHA512 172d1c137ea4190da305ca987dfecf1db73e4e222cae61e8f7830a539a87ed3e919af93f0415563a9be2f65dd7b8787c22e8494e134c42e701ce1559a66cf5a3
diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index c7fc0ea791dc..6b44d2e7957e 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/metadata.xml
@@ -10,4 +10,7 @@
 			Enable usage of <pkg>dev-util/valgrind</pkg> in debug
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:libtasn1</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ed614460214a..51b859d5634a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,10 +3,12 @@ DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232
 DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd5428c918ff80fadd139b3416301116c1015953ff7be583523a5c977b1da003958e6dd66cf2f43ef5adfc798c3 SHA512 3ba158cea5027fe7c30314da08a620a718cb30ca38997e46ad00912eefac9d2d94f9dd256c204771686a546d7445da2db1be2a0abed7ba14f122332767ee5ee8
 DIST libuv-1.30.1.tar.gz 1228593 BLAKE2B db45d283b7aec00ee5b617a6d3578112aeae6f006da5b09c9d0eb07ce9ceee59d6acc0ae9e476602f664c67d24685c4e1ac0e1524f38475da1f00e89c8376bd8 SHA512 bf6d99e4807da3e90c1852b901953fb5ddb9354942a433d8ddfef9a0766abfe3783216936c546ea1b9f2872d0d031dd184519bb5c7f58f6baeae4446f0f5e3fd
 DIST libuv-1.31.0.tar.gz 1238566 BLAKE2B d6a9b92dc8a6f28dd89f65e6d1b7ff4921c7d591c13965e27304d3ca38f25d0436a1ab690a09238c511bb787bcecbaf2cc34a214a388515eef039fc5742ec7ee SHA512 bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409
+DIST libuv-1.32.0.tar.gz 1242643 BLAKE2B 39520790200c70a417103416a6c2a389aad7b67878872c3733cf0dbca5ace012e45da088b0695e8dcbf55859635b6d67672581bc13c444d078ffa536bd3d0c39 SHA512 3e043a56fd09fdaf3c89f81b3dff70a385ba8a59ec065447c95199a0e45da323b8545fb13b50139c557541357450103a88297fdc921832de661f3e2700173b96
 EBUILD libuv-1.28.0.ebuild 1220 BLAKE2B f2a288593c2b6dfec730f5eee44f92ca7547256397130f5237f331aadd2e6b2e9d4f9a48ab499885a3844f27363b357a09e607a027a7d4844c0c546801a15f4e SHA512 74b859a4bc98970f1eca1b6ad29f974bfeddc8815455842220d317fb2ba0173baa179987fe096ca58154b6fc84fbf95d071f89df8b50aa5ead1f2e0649808658
 EBUILD libuv-1.29.1.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 EBUILD libuv-1.30.0.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 EBUILD libuv-1.30.1.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
 EBUILD libuv-1.31.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
+EBUILD libuv-1.32.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.32.0.ebuild b/dev-libs/libuv/libuv-1.32.0.ebuild
new file mode 100644
index 000000000000..046df21f2944
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.32.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
new file mode 100644
index 000000000000..541259a7373c
--- /dev/null
+++ b/dev-libs/libvoikko/Manifest
@@ -0,0 +1,3 @@
+DIST libvoikko-4.2.tar.gz 653769 BLAKE2B 6c0e665d7b5eca394b49dbebf38a0815b1fe1ea328efa305e9d1574b551c633be6b2326b5b402bbc454557a559a821a28c668a1845b21a71c378d0e97103ca53 SHA512 483d3c259a52ae772d52f708789c3df39a4857188c7b9035ce5db8b16bfa4ef144e2ffd557dd6a0655e4c9a6984529784e4098bc949a1bc8a0a50529fee49656
+EBUILD libvoikko-4.2.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
+MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.2.ebuild b/dev-libs/libvoikko/libvoikko-4.2.ebuild
new file mode 100644
index 000000000000..7bdff963650d
--- /dev/null
+++ b/dev-libs/libvoikko/libvoikko-4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5..7}} )
+
+inherit python-r1
+
+DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+expvfst +hfst"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	hfst? ( >=dev-util/hfstospell-0.5.0 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf=(
+		--prefix=/usr
+		--with-dictionary-path=/usr/share/voikko
+		$(use_enable expvfst)
+	)
+
+	if ! use hfst ; then
+		myconf+=( --disable-hfst )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	python_setup
+	default
+
+	python_foreach_impl python_domodule python/libvoikko.py
+}
diff --git a/dev-libs/libvoikko/metadata.xml b/dev-libs/libvoikko/metadata.xml
new file mode 100644
index 000000000000..b61e52b54ad3
--- /dev/null
+++ b/dev-libs/libvoikko/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name='expvfst'>Enable experimental features of VFST morphology backend</flag>
+    <flag name='hfst'>Enable HFST morphology backend</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 08aba8b8ad8a..a4f3da634811 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -3,4 +3,4 @@ AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.33-r1.ebuild 3467 BLAKE2B d8663a0bf1b2ac475552d0319c05a702ad079c52f29da813ffe3b5815a1a93620731a415db5178e455452fcaa211eb9bfb6b70bee642a306a372a36bfae51b6b SHA512 48e01883b6660fe9e636b4fb128923e9a0d11b910aa922a72fec1b97a3126fb6dbf1986ef07d1a7e883e0202331312cf7b3e3d547693042f90f7205388510844
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
+MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 4cbddcaa19ad..4073f76c700d 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xmlsoft:libxslt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 833615f7bfee..53b445eddd95 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -5,4 +5,4 @@ DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb5
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
 EBUILD libzip-1.5.1.ebuild 1901 BLAKE2B f668410b13077d0cc6e36e2b539070fb1172424623082053c71fd0ffc1533545c3aa5abe50030e6b62c0cd7690332eac3198807a94e41eeb9af709ca79166578 SHA512 00692e68879b5c76936f632f32c5ccf2759f8022bf13802bad8c6c3931a2d984ae5b976115f2b11f65fd0bf732b02083dea6c91dc7c69483d16e8fab3879dc3d
 EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
-MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
+MISC metadata.xml 516 BLAKE2B 8bb4e6c42e27ee5e4547e7323d4464f77f37ca80f06a3830d86edb01228d2bafe670866d56c0ff421ac6a7e14c4085f1d8ef6818ee4edb20a2b996763f0809d2 SHA512 8330247191cf7628e208e0b001492948c3deaee4b65cd9327e708dd3a5b35022476bb52f631c6503eac875fa89c666fda7b973f95a8be2767638207fd7c5f049
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 87a5b99d4f34..7f6898ece72e 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -9,6 +9,9 @@
 	<email>kde@gentoo.org</email>
 	<name>Gentoo KDE Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:nih:libzip</remote-id>
+</upstream>
 <use>
 	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
 </use>
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index ec2acb4b6eb6..0cde4d8d1623 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,6 +2,5 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r2.ebuild 1889 BLAKE2B 38faa340fafed78795e2157b66178c3f423b7e00aa5f0d78783ceef03978ef4526993216bf2960e0da587d90ce81bb2cdf6518c3230947baaf24818cc59b6c24 SHA512 76e30de7368016f264b5f6f92a5b60c1f287f58fc7b52447e169b6457158cc8b7bef01cc50efdcd6eab82e0ed84dac2a34c4412ed15736499dea6a1c0c527a46
 EBUILD lockdev-1.0.3.1.2-r3.ebuild 2099 BLAKE2B 283cc4876b1a68e51a2b743109c2403966193d9a03c2054b59d93ae9d18dce3d745b296887154f14e7f34f5e14292fb765230bb675966f1c51bca7415a577b27 SHA512 168e95f181d6e24db2bd8817ab53ad4f06591217308c0d45f4e1851b490dbd5a1fc50dab85042512c3c72f4e196e12ace4d2d173b8a1ddc00c5080ba996be329
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
deleted file mode 100644
index adea574b396b..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit toolchain-funcs base perl-module eutils versionator autotools
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 3 '-')
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Library for locking devices"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_P}-add-autotools.patch"
-	"${FILESDIR}/${MY_P}-fix-perl.patch"
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-PERL_S=${S}/LockDev
-
-pkg_setup() {
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# Note: we do *not* want to be in ${S} for this, as that breaks the patch
-	epatch "${WORKDIR}/${DEB_P}.diff"
-
-	cd "${S}"
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	econf
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd "${PERL_S}"
-		SRC_TEST="do"
-		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${S}/.libs"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog* debian/NEWS README.debug
-	newdoc debian/changelog changelog.debian
-
-	if use perl; then
-		cd "${PERL_S}"
-		mytargets="pure_install"
-		docinto perl
-		perl-module_src_install
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	use perl && perl_set_version
-}
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 38debfea8381..d6b9c86c2367 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.10.ebuild 1043 BLAKE2B ae5730afb17e721c57dcfeb635a824c8a6afb4ad48b7026bfea8b4cde0330b3e568e105d88b7584606d4bba5e72f597f624a7b39c84eb98639b712a85cc38c92 SHA512 9bbc011168b42521e4a9c9849b63dfcf94e62594d52755c1ddd0b3c54263320e642081592021846ad7e42416ceb20a474021cd56510898f9c9514794fc374717
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
+MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/metadata.xml b/dev-libs/lzo/metadata.xml
index 0319eec4c8be..3300f7ef6f9d 100644
--- a/dev-libs/lzo/metadata.xml
+++ b/dev-libs/lzo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:lzo_project:lzo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 0bca2d44c077..4a1ec1a77783 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -3,4 +3,4 @@ DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff7
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
 EBUILD nettle-3.4.1.ebuild 1787 BLAKE2B 80b456defbf4e4c28bf9b0ed97b310d9993218964af3febb91649d25b69fa71fae0f2109b1b952e1a8c90f09311ef1f966d9d77f8af2f113630c64ef6821ec9d SHA512 9545879b7b41f3b4fb74a14cfa7b0c6c032bcf8228daf2d0e5265eec5ee32ad93a757d5dc54f7c5f7e76ba595328cf97eae0dc085e060a259f5bc00b74378c24
 EBUILD nettle-3.5.1.ebuild 1694 BLAKE2B 93fab2dcd60d5821297c3d577eaedf545ebd22c85d354a0b18eb13c93cca5c01d0103e959c096552a6b04a75a88658a9a6324ae6295223ce0e2a2826e4a38614 SHA512 93a3c4eaa29e1cce5916596df0cc62cf79b8f107527d21e6f12c2687b64a8187040658210ed72d240067b5a1ad72ee2ea71bc381b2cbe7e73d2999695f5b3c55
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 330 BLAKE2B 5133c1f98f3dadfef214d46f49e17ea1de8164d9dbe1d334fb2f8009bd40e302db7c1286a3a1cc184fd5240724a63410764addc3a2a4eb65964fcd22f2a7e082 SHA512 e872c0c186725e35f84b691049f8689d5bfcc24da81a2e29719509933f3a1019427b84da86c1dea634b6c05890663c712dd2d66b4513d72642c3037ec38e338d
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 040cba5f7c5b..213251be9d00 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -5,4 +5,7 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b0441f4752d8..cd3f643c573c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -10,5 +10,5 @@ DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cad
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
 EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
 EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
-EBUILD nspr-4.22.ebuild 3892 BLAKE2B 5633707738207a3a7b2dfcbb8798f2ad134f95f8a39e6f8619685e33b1acd5bcc3fa4784cceaf8225f7d5973caab467d79a4378c7399c8ec64bb08e6932d729c SHA512 0021005fde55f4c02782ad4f0ee5528e7df231e84e040503a1055fa42d4c09fb1db396108ae283a0096f4ddd34b24c16b4419c44fd9ed19d7a4878425a2337f4
-MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
+EBUILD nspr-4.22.ebuild 3890 BLAKE2B b728ab9595e38f2f314d9924906b0db4f8310a9f6ca600c251d5e6f6bc6cc3c8295235a279dc317c0dd5f66a59b708fb4ec9d393374ca90da9534ab5481b8b25 SHA512 6af9e856583ae709ff7cfaac08827d862834e9391e82fe493aa1a82e8864195076043c580192ad67e55be8fd093566679102b740468504e560afc3959314e6d7
+MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index d9b367ed3b93..cf9988e49a36 100644
--- a/dev-libs/nspr/metadata.xml
+++ b/dev-libs/nspr/metadata.xml
@@ -5,4 +5,7 @@
 	<email>mozilla@gentoo.org</email>
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mozilla:netscape_portable_runtime</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index bc218969f496..702de741da4d 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 094bc78d59a7..93b29d042b0c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,5 +10,5 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
 EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
-EBUILD nss-3.46.ebuild 9483 BLAKE2B 8a78fa10ea19489b4406e35ae63e8c66cae9c911b2275186c11b203cdefc36113b8fef9dbf4644e2600caf52309e7da6dfd9d8b65f9d5c101cfcde58408ffc20 SHA512 9c557ab24761ba2482ca3857989df10bd1a97d9c7181b79f1efb0279a037d221d129e4bef956abc57973928d81abb22c8c83473faa7606a7e95f7b5261793acc
+EBUILD nss-3.46.ebuild 9481 BLAKE2B 05c58b2fbc6525c4085db4fd3621bb91b7c74139511595a11964003247e7fea8d282c9d04668126ceb0a0a7bf97551ce2cb84a66ff8dcf25929e286e54210dc9 SHA512 8edf58eccffa289d9bc4177c0f7a2ac9454bda120d6af38c67e82958b23ed8ba2074aed8a9f6c1f0d74e4348bd9d6a7dcd21e4a18362ec9870c9a754023110f8
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
index d9753ccde6c0..86bc756f0b90 100644
--- a/dev-libs/nss/nss-3.46.ebuild
+++ b/dev-libs/nss/nss-3.46.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 3da123099be1..5da5598bbaf6 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,3 @@
-DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
-DIST onig-6.9.2.tar.gz 901931 BLAKE2B 93326408c7c9cd9c5053f14edd0e5fbf348a4da135146cfbff7659518686a83301b8d4111dbd65b834e201334871d9fa8202a8ed3cc4f793d444591e96071c74 SHA512 c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
-EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
-EBUILD oniguruma-6.9.2.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 EBUILD oniguruma-6.9.3.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
deleted file mode 100644
index 83ded610f130..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
deleted file mode 100644
index a8f178b9c387..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 6a7d4232ccc1..4e34601767aa 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -15,7 +15,10 @@ DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24e
 DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
+DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
 EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4969 BLAKE2B 8258165c7a8deecf2cf15da2be35d3bea56c7d6df869d9188fb0ec73e684257704d0aee189d520d54f5396c5e34498476db0966178cd43ad5b6cb76c19a6384f SHA512 463d439e67494224e40638fbbd4b44760371e10d0fcaddf6b6419f0baac04046f3bf4ce0013616c8b42a8896f5395488e6faa008acdbe1669f8308b24c20fdcb
 EBUILD openssl-compat-1.0.2r.ebuild 8037 BLAKE2B 1f652836c93e4cd7a8b0211a26a1e0b22c73a30a64a5248cc9a251afd83af8cf6e54b7f0a6a53a9beb184c7638fd834eaa565361ee710461321fc733359e630f SHA512 263f9a96aff760c96061702478651cca50b91f331d29cec718aa0bcea9f993b6fb60e01efa521a3513da5157e2364022fea747e451166ada000b1fc43e06c1d8
 EBUILD openssl-compat-1.0.2s.ebuild 8342 BLAKE2B 601201d0b2d0f2091032235e8ee6a82495b21ad1b53cb8e4e89c7919d5402c780ebaa3d48a9e3f3aa69dc283abbdad2440a3278a06ddc1e2bfde0f0c7119e117 SHA512 c9b722ce8c1c4eaa4a1299e91608b4e984a811389b7c1c2fe1883fda8b9817bcf96cfcbd83e0df7f4da45850959d26aec7c6a380db17dd3db28aa2fb283b1f13
+EBUILD openssl-compat-1.0.2t.ebuild 7686 BLAKE2B f95b9472999c5fc6a5b87f7244486c34e58e12013c62cde61bcefd9edaa6004c3f7d69f16ce420c0d64eccbe1252792f84894fc9176391e503496dcb81b971ab SHA512 b82fe66341fcab1cbdb73102932169d6874bce62f0f8b00bf97aedb136b6a2660e645c34950f1e9e3ceb088e1b49787bcfd75af987b8a0933a32a03af9ba14b3
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
new file mode 100644
index 000000000000..717d2d311a8e
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=openssl-${PV/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e813bc72a4c0..3f348282d680 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,6 +3,7 @@ AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
+AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
@@ -12,12 +13,21 @@ DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24e
 DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
+DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
 DIST openssl-1.1.0k-bindist-1.0.tar.xz 11716 BLAKE2B c491ba0899c44dbcc63f85b255548c439c965a20a04ac2a6324a4122c4691b7c95ec18e62be6d708a7ea62ea197d32e5091987cb5043969878f89e5bc26243d4 SHA512 1d5bc9d7b24cf55d32d996e2421d43a1218b605720293f00d07814afb481387856f0dc000ad3c3e4cba2361055668cfe79a945be44ab85a249555f37e683a909
 DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
+DIST openssl-1.1.0l-bindist-1.0.tar.xz 13168 BLAKE2B 1fbd1f7bdba08f14e21485175232283c2309687021a526b4a132b676d7f9429577f8f14e180fb4f59ef24bc9c06873a6936e64559a901803a3f1d21453177b50 SHA512 f664a6876a2a9c7467bbc6a436593eb21cc6be51e08408657f34b67fa69cd6bece3cc65f60220d7e41f36b359b5299adf49a59ede7f8f738d6a31e29d2a49714
+DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1c-bindist-1.0.tar.xz 11964 BLAKE2B 8c5190846d13984589a150089d329bb3ecc613788b9462c6f6a1833a040e21cb9bf940140449f09fd797c0e396b0aea073237be374bd16097795b8974c3e7ce5 SHA512 249c6d8c455130b98e3be635f12f323e0cc349f1770648bad591e5de15483917185a473c162ed871a2fa05b47056931e6f12e5fdd9cecee7e6d1c246b862923b
 DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
+DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9718b74b30afa9be2397ad80f88031920806b6603b6469beede02b6e7a742abf5f82ebdd7c9b8e69c1ffe223e4860dc9581128 SHA512 9e4296326852010d5cebc204d1a34a34198d8d65460bc91a2bd37c80be892a5ae519513e4b0109e6b51b6faab0e171ef6cdae868868c158711558d147083c06f
+DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
 EBUILD openssl-1.0.2s-r1.ebuild 10613 BLAKE2B f31ebad1aaef7aa81317c681315456874501e00f6f39f6c20e319a4365f4ec34d1c183a70d904dbe106aeb5f4503444cd63ead7cb73974c8fc5571ddba4fe0a3 SHA512 b53254e4b78fbcd48ab4d7cf3b43c5997e31a7487078e8534a18fc03af168f958793e5abd55db3b6a2ffc7baa397b461b588d2299f2a1192deaa5c0aafdeb6ac
+EBUILD openssl-1.0.2t.ebuild 9971 BLAKE2B 83d8f679cc26fba72329f33d3bf013c971a98cab355d2b1b3abe77f12294c734bd5a65ef25dced9122a3b70490d6a98ec168713946806f07241ebfe4a28e45ac SHA512 6bf6a508c87ede4ec0a326c2ef7de43e785c224284411e06603942a37dc0cfa3e4cff74237f550322f319a20c5b2f4e439bc2d8dd81087b4a691eb3971ac090e
 EBUILD openssl-1.1.0k-r1.ebuild 9463 BLAKE2B d04ca8cad9e3a763c606b88b66309a11c3f3d1b27af1870dadb258521f110e5d7e6b5482554ee3a00c5a92343542b411ebb084de338d751bd04ccd3afc69a9b4 SHA512 4be3b7b467ca52a35de64d7ec53bb414f67fa30953001a66503336ca32635e8d9d7682a1f15d60e627903bad8d5603c29398b418e263b638c58ff1ec0da42bfd
+EBUILD openssl-1.1.0l.ebuild 9601 BLAKE2B 37990d15c063ffbf5922bd3a4a195e5dd359bc8ccffe940376a80b3d2e5af694030e7bdf841e574f2d24f62f11d6427dfb2b926cb0f45f8387e51d4606907d45 SHA512 0eab2bde4858c9f74c4ae799ed2cd7bebd4e47edb6cff52e5b9487703287fa424e99f973d48b0a01d67b80fedfa7d03ddeb5be702877fc87da2b91bc18d53122
 EBUILD openssl-1.1.1c-r1.ebuild 9297 BLAKE2B 114347e74c4224d73956c4d9e333776da681690779a9e542422a9c15ac8bf624469ad337b3cbbde159b35474631de95a423f2ccdf20d3a2370d086b89fa24b10 SHA512 eb7bfe2b301769fc1e3118bf449c85f8af455c1e0252c3b574b426b4986ee1631581bbbd915c13f75ce9f1e1704f6ced048a0485dae69ba1aafb31f3aa455b65
+EBUILD openssl-1.1.1d.ebuild 9351 BLAKE2B cb70c810bc409ec11f2a1e92e3361b4f98c1976be3cfaee7a6d7c152d86f7505d5dceca7df3e93901d85926426aeefcc11d900f9f392d2da4aae0ae47b6863b6 SHA512 80bb6b67ebd60dd0fef87dd1d6f72ffae3371f7f7acb941069748ee2fadeee26a6702fd092a1a873019e7959e524217af89bdc1753bc4ae6590f41e2f84129f8
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
new file mode 100644
index 000000000000..35a435df28bf
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
@@ -0,0 +1,30 @@
+From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001
+From: Nicola Tuveri <nic.tuv@gmail.com>
+Date: Thu, 12 Sep 2019 01:57:47 +0300
+Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0)
+
+I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and
+inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this
+fixes it.
+---
+ crypto/ec/ec_curve.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
+index 2d28d7f70bb..6a58b3a23e0 100644
+--- a/crypto/ec/ec_curve.c
++++ b/crypto/ec/ec_curve.c
+@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group,
+ 
+ #ifndef OPENSSL_NO_EC2M
+     if (field_nid == NID_X9_62_characteristic_two_field) {
+-        return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
++        return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
+     } else
+ #endif /* !def(OPENSSL_NO_EC2M) */
+     if (field_nid == NID_X9_62_prime_field) {
+-        return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
++        return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
+     } else {
+         /* this should never happen */
+         return 0;
diff --git a/dev-libs/openssl/openssl-1.0.2t.ebuild b/dev-libs/openssl/openssl-1.0.2t.ebuild
new file mode 100644
index 000000000000..90f695879aa4
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2t.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
new file mode 100644
index 000000000000..09b9314d05cd
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 28,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.0l-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+
+		use bindist || eapply "${FILESDIR}"/${PN}-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1d.ebuild b/dev-libs/openssl/openssl-1.1.1d.ebuild
new file mode 100644
index 000000000000..dfb4be45e239
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1d.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1d-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 4a07c468d955..c559a0742143 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.25.1.ebuild 1065 BLAKE2B 473c17885fe3d618fa8ffcc514d12af4bb21a7e38e7a0667be24f334d18b360d1d5f9e3bd36ac78ead70cb05e36acc618e56fba711e830ca1d574f5e7f0f39b8 SHA512 fac27eee74cc0a196297e167d7024e3cebca0d9da4b72bd82268df0ca62246546f4a42e75b39fc59e660f0b6d21254125ae2a5ecc165e207fd50dedc2a39b737
-MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
+MISC metadata.xml 507 BLAKE2B 0931fc75f319958ede51838e6e22cc9eb99871b3bf3e1bebe2d635d6e1ce585f4fa723afd0b3a21c33e9545543e7d7d6b8b6f9e27e929b01d2c77b59ce2e41f6 SHA512 440b311a012774466333018e7000dc220fa8a0bba83bf7f8c54f2acd5d50939c827a5fc8105542da9c0a6087599387f3fefbb1458b31382127e597823c698428
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 4a627dd9cc2d..5ee8a8c1f2a5 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="nss">Enable NSS crypto engine</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 		<remote-id type="github">OpenSC/pkcs11-helper</remote-id>
 	</upstream>
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index d968b6c2f18c..4d632177fb57 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,4 +19,4 @@ EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365
 EBUILD protobuf-3.8.0.ebuild 2886 BLAKE2B aed1935e60a5acaeaeca5c4ab77add62f5c9126f1eee7c381b8264cfa6c44c8fd9e85c4b130294f7d64158beddc049800dda753ef199557ffa6bc0b77a611278 SHA512 5eccdd3553e80e7dbbed882c7ff76c0580c6a52a13b2e39540781ef71c03959e3375e2d164705d9a1dccb9ddfdca19f515affff49ebdd46a322e41d5d64188c3
 EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
 EBUILD protobuf-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
-MISC metadata.xml 426 BLAKE2B e4705957b7b549ca44bd4099f7ae592cc313604e00dba91d97887992e097e68beadbcb9cadca1a0f1c7da2a60d2fe844a79570db28d0606140d9204e73c739de SHA512 f7784ccfe1935b7946f0e4b25b1c0db457989f196b5551ab14e2b043549220260b29b014b6d330fd3ceb900490a2b87cb43a178dc45601e80ada30c6a0468fb1
+MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index ac91ac3eab9c..6858f31af628 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -5,10 +5,16 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<slots>
 		<subslots>Soname version number</subslots>
 	</slots>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:google:protobuf</remote-id>
 		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0d25490b2bdd..d19f8c1205e4 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -5,6 +5,6 @@ DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f
 EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
-EBUILD spdlog-1.3.1.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
+EBUILD spdlog-1.3.1.ebuild 799 BLAKE2B e9d1508a8c1c434e8d4fd4e372989c2b52bdf90ff7220fa35dd2d63d027f2fd7661c50bcb83a10558db3a30b1d0a2f98f524eb42177df143ef07f0ac13fb09e8 SHA512 d3a21825ee17b057048f8e756be28608e74b624d964238b0a9dce8abbf01b9268121d0f7b4a2913aa55c32a866849f1620cbd5ad99f38d832f719ea7df71a8b6
 EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index 497e7da9b419..430086637b62 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/spdlog"
 else
 	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 0b3325b72c8a..9a5300f5960a 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -3,4 +3,4 @@ AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 EBUILD tntnet-2.2.1-r1.ebuild 1889 BLAKE2B 5205f1c8c547cad508c6c8528dd23001e57f90a25988f73fa892042c80c0a694cc81c442e8ed003afc988bf6d31c2c23e24586ee6b47b61c3b84e27c206c4667 SHA512 c74171d0347eeaa84b64c988c06ac40cbe56c0b5df2e55ab946ca10e1639ed96d1e2ea279d2229a8f3c29cbf3cb4823ef961ce3ec62f3681d72a57c19e4e8272
 EBUILD tntnet-2.2.1.ebuild 1817 BLAKE2B 07c9432256c041dc21fcfb6691f4fe4f07b0f694317119517c446f1169baa77f4eef14a7b4fcde8eef1300feb3b8d24748b099713af273a34f5b9af8ba1b82bc SHA512 f67099b4cac43aefd68a0d4f819bc9f9d4cbe825d03356e2587e2f0832d0423f60df9e8817f71fec61fd2339af3eaac70d83a8bbe6a1e36c3c27a4a3abcd4998
-MISC metadata.xml 555 BLAKE2B 89b58ae15701bd0e48eec8e3adcd99228f4a202b60b9904d04fa1b461c70f06876f36f2ad48b9f5596ca164f9eda7ca2617380503c427698c6a2ab1edc822c44 SHA512 060415a8e9aa8550ba30ef7f987ef5862e03fc9abd905eaec60715401279ed92d467b116cdce70626a3bfb3ca58d0d999611da23b09726a78ad47d553f97d4e4
+MISC metadata.xml 239 BLAKE2B f2ef9bcdc2a3034a37a49206e8f14b7cd40fbd0305562d1c642c37a55587e9d23bd32eebf28985ebbbb7553f57100fd09cbc107f5f66cb5300da6c2cd2b56edb SHA512 e6905ccc2f98e4c858d49f5e54b4de2762488fc33b9be4edf3d2419f4f1b3ca0db6ba64086198c731cd9e71df816a05ae579c2612d2751bcff808e3c4d3644f1
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 7884d9df8a09..77d1be7cc249 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">                                                                                         
-		<email>hd_brummy@gentoo.org</email>                                                                        
-		<name>Joerg Bornkessel</name>                                                                      
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
 	</use>
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 470006c9dce9..cf51d3186ba4 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -3,4 +3,4 @@ DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bb
 EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
 EBUILD utfcpp-3.1.ebuild 953 BLAKE2B 6a720484675821e5d573f61dc3ccaf8137cf81bc6e0f289a8f9b8db43cc5e2120c2e6c091ff3c3a31d254289a809592c6d16ee0c12bed69009e7acca81a9ad96 SHA512 e64e0dc995ce290ea855966f39f76814314e029ef6297a02a47a2033820b9b5ea2e1e0afb3da78a06550ce190e6cba11cfb416a83d6a0cb1691f1b737176d500
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
-MISC metadata.xml 352 BLAKE2B 4ffd4d4fed2363f01b91b53dd2e869b6c49aa0bbddc249e7525b064df74e51528c193a5a987880ca2a3d20a13eba774498d220181d4f55ae262c8ac0e2867083 SHA512 bcd0d5ab729af171d91a6147ff7437f1627638a7d1f4e0c6501aaf6269d9912bca3ee8666dadd1d7037f06850468a40952ba97d572bcf846c38ac7b9273e6cad
+MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 433cf52c3011..d25cf40411bd 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -5,6 +5,11 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nemtrif/utfcpp</remote-id>
 	</upstream>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 05d1b9689711..e74a78cde73e 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.45.91.tar.xz 3358640 BLAKE2B e51e1e30042cce60f58f9c63698222d40e719f2cd9258d264bdffc2226cd0c126dc0c256d557a2bc600cd2c0cd9f1f55987f9e96ac666d9d57fdd7b1501afb1d SHA512 7bddbd0d711b50154be6e6d3ebe0576c3ead0f533a0b177c3eb181555eb3d096353157cc490b49c9453686e765739283e30d3881652a9bfb82baeed9be4817b6
+DIST vala-0.46.0.tar.xz 3362148 BLAKE2B d0263aeaf19477e1f511004456f8ac575a7de406179fbf152d2e8c31cebc70570fa4072102007aa57f5a019a340401a2b0610c027c987bc10bafcd9dfdad7fff SHA512 d7d31926936251054b66c3e53df264bafd0ee56c4c2168bc77eea3308d80a0b5b250eb4cd3df31a4cbef8b1954a47ce70655629910e071bf5b46ada47aface2d
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
 EBUILD vala-common-0.44.7.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.45.91.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD vala-common-0.46.0.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index 39980802b1da..243d9d0d89c3 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:vala</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/vala-common/vala-common-0.45.91.ebuild b/dev-libs/vala-common/vala-common-0.46.0.ebuild
index 5d6856bd6561..5d6856bd6561 100644
--- a/dev-libs/vala-common/vala-common-0.45.91.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.0.ebuild
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
new file mode 100644
index 000000000000..5e0fad397904
--- /dev/null
+++ b/dev-libs/voikko-fi/Manifest
@@ -0,0 +1,3 @@
+DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
+EBUILD voikko-fi-2.3.ebuild 695 BLAKE2B 6d1f636c6195ff077904553e0af107310dc4c7c9a81d62c6783c08530d3e6fd3c346b041866f7e0f70144f0fb7b112aa72c48c1b0c4710b591f1fb162da790e1 SHA512 e10ff8100d3de6fc3efbefdbae5382f196cff741da5fa54130c31993d4a077864f11765a5939ad7f184d0a7370089de720203fa117f3430e0680dfed52206278
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/metadata.xml b/dev-libs/voikko-fi/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-libs/voikko-fi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
new file mode 100644
index 000000000000..e267dbf7a4c5
--- /dev/null
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5..7} )
+
+inherit python-r1
+
+DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/foma
+	$(python_gen_any_dep '
+		>=dev-libs/libvoikko-4.0[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake vvfst
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
+	einstalldocs
+}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 1f358a0d5a3d..590fce80d856 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,11 +1,7 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
-AUX xerces-c-3.1.4-fix-build-system.patch 2080 BLAKE2B 02e67cf0c737c30405b967619aa8deee0c1f1c8b9635265226b111ca729b23bcc1bb1d094ba3342269051cb9a819b281b0985d2c1785bfa524f3844b29d65636 SHA512 38ec4237425e63aaf00e4b969ad0c478bb788b803272f7406f38ea250e5ed1ba4e78f061959fbe180956058d1d7f3b56d31451450872809999b2c6be29add4dc
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
-DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
-EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
 EBUILD xerces-c-3.2.2-r1.ebuild 2956 BLAKE2B 00df5adb4b7200a4bf69549d7f317116d962e5a4631d02c257b12d44b035c05a026aec628eb9ef538a135173889fab37dcc0382f7fddef36c0692f8dc90f8110 SHA512 911ba0ef96cc8f5ecc6ef4e72cf3c8e7829bc2f2c97d14ad1b9323b382d3c0588e694041bd8d7e36d3064bc6b415af896e80f8f1543ff344ef338aca54a185cf
-EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
 EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch b/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
deleted file mode 100644
index 6b991d24b56f..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-* Fix build system when USE="-threads"
-* Add DESTDIR in order to prevent sandbox failure
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -124,6 +124,7 @@
- AC_CXX_HAVE_LSTRING
- 
- ACX_PTHREAD
-+AM_CONDITIONAL([THREADS], [test "x${acx_pthread_ok}" = "xyes"])
- 
- # Checks for library functions.
- #AC_FUNC_ERROR_AT_LINE
---- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
-+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
-@@ -5,7 +5,7 @@
- prefix = @prefix@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--mkdir_p = @mkdir_p@
-+mkdir_p = @MKDIR_P@
- 
- include $(top_srcdir)/version.incl
- 
-@@ -48,11 +48,11 @@
- # for installing the library
- # for installing the library
- install: $(RESTARGET)
--	$(mkdir_p) $(prefix)/msg
--	$(INSTALL_PROGRAM) $(RESTARGET) $(prefix)/msg
-+	$(mkdir_p) $(DESTDIR)/$(prefix)/share/xerces-c/msg
-+	$(INSTALL_PROGRAM) $(RESTARGET) $(DESTDIR)/$(prefix)/share/xerces-c/msg
- 
- uninstall: 
--	-rm -f $(prefix)/msg/$(RESFILES)
-+	-rm -f $(DESTDIR)/$(prefix)/share/xerces-c/msg/$(RESFILES)
- 
- 
- # Needed to support "make dist"
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -21,7 +21,7 @@
- 
- check_PROGRAMS =                                ${testprogs}
- 
--LDADD =	                                        ${top_builddir}/src/libxerces-c.la
-+LDADD =	                                        $(top_builddir)/src/libxerces-c.la $(PTHREAD_LIBS)
- # the  -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp 
- # header file when doing out-of-tree builds
- AM_CPPFLAGS =                                   -I${top_builddir}/src -I${top_srcdir}/src
-@@ -86,8 +86,10 @@
- #                                               src/ParserTest/ParserTest_Parser.cpp \
- #                                               src/ParserTest/ParserTest_Parser.hpp
- 
-+if THREADS
- testprogs +=                                    ThreadTest
- ThreadTest_SOURCES =                            src/ThreadTest/ThreadTest.cpp
-+endif
- 
- # Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
- # dcargill says this is obsolete and we can delete it.
diff --git a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
deleted file mode 100644
index 7ccfabeb38f0..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/"
-SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-	curl? ( net-misc/curl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README version.incl )
-PATCHES=( "${FILESDIR}/${PN}-3.1.4-fix-build-system.patch" )
-
-pkg_setup() {
-	export ICUROOT="/usr"
-
-	if use iconv && use icu; then
-		ewarn "This package can use iconv or icu for loading messages"
-		ewarn "and transcoding, but not both. ICU takes precedence."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local msgloader
-	if use icu; then
-		msgloader="icu"
-	elif use iconv; then
-		msgloader="iconv"
-	else
-		msgloader="inmemory"
-	fi
-
-	local transcoder
-	if use icu; then
-		transcoder="icu"
-	elif use elibc_Darwin; then
-		transcoder="macosunicodeconverter"
-	elif use elibc_FreeBSD; then
-		transcoder="iconv"
-	else
-		transcoder="gnuiconv"
-	fi
-	# for interix maybe: transcoder="windows"
-
-	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-	# But the docs aren't clear about it, so we would need some testing...
-	local netaccessor
-	if use curl; then
-		netaccessor="curl"
-	elif use elibc_Darwin; then
-		netaccessor="cfurl"
-	else
-		netaccessor="socket"
-	fi
-
-	econf \
-		--disable-pretty-make \
-		--enable-msgloader-${msgloader} \
-		--enable-transcoder-${transcoder} \
-		--enable-netaccessor-${netaccessor} \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable threads) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc || die
-		doxygen || die "making docs failed"
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_install () {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		# clean out object files, executables, Makefiles
-		# and the like before installing examples
-		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# To make sure an appropriate NLS msg file is around when using
-	# the iconv msgloader ICU has the messages compiled in.
-	if use iconv && ! use icu; then
-		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
-	fi
-}
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
deleted file mode 100644
index a7d0dd1ec9bb..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/"
-SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-	curl? ( net-misc/curl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README )
-PATCHES=(
-	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
-)
-
-pkg_setup() {
-	export ICUROOT="${EPREFIX}/usr"
-
-	if use iconv && use icu; then
-		ewarn "This package can use iconv or icu for loading messages"
-		ewarn "and transcoding, but not both. ICU takes precedence."
-	fi
-}
-
-src_configure() {
-	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-	# But the docs aren't clear about it, so we would need some testing...
-	local netaccessor
-	if use curl; then
-		netaccessor="curl"
-	elif use elibc_Darwin; then
-		netaccessor="cfurl"
-	else
-		netaccessor="socket"
-	fi
-
-	local msgloader
-	if use icu; then
-		msgloader="icu"
-	elif use iconv; then
-		msgloader="iconv"
-	else
-		msgloader="inmemory"
-	fi
-
-	local transcoder
-	if use icu; then
-		transcoder="icu"
-	elif use elibc_Darwin; then
-		transcoder="macosunicodeconverter"
-	elif use elibc_FreeBSD; then
-		transcoder="iconv"
-	else
-		transcoder="gnuiconv"
-	fi
-	# for interix maybe: transcoder="windows"
-
-	local mycmakeargs=(
-		-Dnetwork-accessor="${netaccessor}"
-		-Dmessage-loader="${msgloader}"
-		-Dtranscoder="${transcoder}"
-		-Dthreads:BOOL="$(usex threads)"
-		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
-}
-
-src_install () {
-	cmake-utils_src_install
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		# clean out object files, executables, Makefiles
-		# and the like before installing examples
-		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# To make sure an appropriate NLS msg file is around when using
-	# the iconv msgloader ICU has the messages compiled in.
-	if use iconv && ! use icu; then
-		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
commit	a1392efe64137262023d92492396ca9156d22396 (patch)
tree	de438b2711c7697c4597fb04f07e988586f34233 /dev-libs
parent	e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)