gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-libs
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
192 files changed, 3979 insertions, 1155 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e44478f987d4..2c7193fcd076 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
index db76b3f68191..6fe675d814b5 100644
--- a/dev-libs/antlr-c/Manifest
+++ b/dev-libs/antlr-c/Manifest
@@ -1,4 +1,5 @@
 AUX 3.5-cflags.patch 632 BLAKE2B 34051800ce235fb8b913abd1b3c01f2364d73a7103d380cecc861d2b89eacaefe65a6038199799c3974789e6d4cb17aae43c74a3276c299a95dbd3406a6e8ed8 SHA512 8f68bc1d56de08d144ca6dc29c530a6d89347aed58d497a7f5525d5375086cbce1c4365e4ac917ef92eaae9471c6031d38df98244dbb426620073f697c8fbf68
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+EBUILD antlr-c-3.5.2-r1.ebuild 1386 BLAKE2B 03f4c638d3f6c0d933b39537a53e40b7a8bf8a30722e320a9e2eac2619ffba8dd4cc349f7ea043461094d983b67bfbd8a6d2a6de423449b85b2269c3820c0374 SHA512 bd23886362f0f2f102f620cc693e7fb968e9cf21b2b35e3c521a93d57855b8b8c1c18da0e29bb7b4e464948ee9f03d7e78817018dbe993c85a8b1f0f19761358
 EBUILD antlr-c-3.5.2.ebuild 1367 BLAKE2B b75a954abbdfbd4024675f3f1348231ce0c12da972fb60b0d598268d702fa8f2c88ac48a55afec4ba93c3ead596df95dd7b528120bd3172c7d25aa1539da42b9 SHA512 39c49f79ea909c9bf107bece3b969d19ed987ad89af7bb5700f28ffc0e41a2336d2191d47fe212a742372273978def36a6009f35ff7e484cc876a0526f680006
 MISC metadata.xml 336 BLAKE2B 980e56da4035d18792f5f65654223bdfa1bca764c18677a1e4cb6ee7da3e2f59a09944c0c6bfd63045f0c2855ed353d0cc2bd68a3cefced82ec9f3d82f478401 SHA512 4d1c32d4948359f596c0b006237cf7ee33d662c1730c4c68b9b4786fb46d762e3e4b1c89f9ca5ad99cc727c9be96c2a0f0ad92e5ceb990e71fcfd8b37ec257aa
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..743a7d4e90ab
--- /dev/null
+++ b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils autotools multilib-minimal
+
+MY_PN="${PN%-c}"
+DESCRIPTION="The ANTLR3 C Runtime"
+HOMEPAGE="http://www.antlr3.org/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug debugger doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen[dot] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
+PATCHES=( "${FILESDIR}/3.5-cflags.patch" )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/antlr3config.h )
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	sed -i '/^QUIET/s/NO/YES/' doxyfile || die
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local econfargs=(
+		--enable-shared
+		$(use_enable debug debuginfo)
+		$(use_enable debugger antlrdebug)
+		$(use_enable static-libs static)
+	)
+
+	case "${ABI}" in
+		*64*) econfargs+=( --enable-64bit ) ;;
+		*) econfargs+=( --disable-64bit ) ;;
+	esac
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		einfo "Generating API documentation ..."
+		cd "${S}" || die
+		doxygen -u doxyfile || die
+		doxygen doxyfile || die
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/api/" )
+	multilib-minimal_src_install
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index ef5eee451903..30c10b95729c 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,7 +2,9 @@ AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c
 DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
 DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
+DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 EBUILD atk-2.28.1.ebuild 1419 BLAKE2B b54bfca44773cc5d28023f6a80b13d3c65947d08f76cd4cd3fcd61bcc87b1916989bbeccb188499b5a9dfa0448cc30bf24110f29c6dc9157918489324fc708e7 SHA512 e36d9b19836b966cdb4d547dcce195f8169ac3b3e132c8871a553be7ce1b0719a5ddd9604dbddd64f92928462429fecd208900a066d07b2ce95b2165abf99af0
 EBUILD atk-2.30.0.ebuild 1227 BLAKE2B 0a21234fffdf74308704e199dd20ae4c4b6229c29d0265ce2734d0ece6b5fcfb9298ce65e6496b53f0a757863856e73dcc7d7a8287ab33b9371c65b0cb064c8c SHA512 7a23da2f804ef760dd5fc941f77f745c259203cb7e58c6cc218300a52c901e75c1efbd427245e7ec484ad8eaa57802d8855a0005c48e25a086b6d52e34863aa6
 EBUILD atk-2.32.0.ebuild 1175 BLAKE2B 8e6da9c1bf673c7e4e8c81e0b6181d60054e63b2cc3c61b76e77e05edb0fab820a03ef2c1bf7905ffba6b39e9ca81f174e8fe1e99413b1de78b3e86db2d852e5 SHA512 e6d4be88b1cba082260d4a95e597403369d7c8b063fbac3cc68ed5c8aa85da1b2aeb9a7cf8060110b71f0301d386ce4595728861ea051f3f548126e17b1c4e02
+EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
new file mode 100644
index 000000000000..7b6ef0410e7e
--- /dev/null
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson multilib-minimal xdg
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=sys-devel/gettext-0.19.8
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index a79b58551488..9a87d4f02b41 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,5 +8,5 @@ DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c2
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 EBUILD boost-1.65.0.ebuild 12413 BLAKE2B 46cecac07c7772137d690212714fa54f29b1afd623ca17270565ac75960408e54185f1b8e70883397084e761cfbaeabf2b5d83879d2e5f81f5693101a911a896 SHA512 d1d91b697c7027587dd90f0ecdc07e0c5af1a3ab922fc33caa7a2850f597e4cf4c67603dd8ba651c0afc02ef09451ee2417c869c64ea16ccbced9151380acf19
 EBUILD boost-1.70.0.ebuild 10140 BLAKE2B 3248ad7f134f001c8a626d0062ce39c72ab00ea451d57c4d78c82f2994a490df20798ebedff5d8e072999abbf5ca7b93b8340f1be9ae411072434720440f7e33 SHA512 8934c3d1ec1f4e35d58779e440db7da9403fe57a49c2bbb3bb87b6bd0f5d2c5f08e3138e96c14dfa99b183f9e67c5e35b87db89b8879b3b243e5112172f4ff2a
-EBUILD boost-1.71.0.ebuild 10634 BLAKE2B 44c6a146303aa2e6e35c6fa99d775b121adabc18a9d76f495d264be4085210591c79f31a73915cf1f2260a08ef6235c60c74f49382ffb83857a6c4f43cbb3a83 SHA512 080e1223a342f235f61876c30b70631a2dd939c231c87624fc20b95f1feecdaff11fe2020059193cdfcbf47395d0b830c0c940b086edb07568f1edc07628602c
+EBUILD boost-1.71.0.ebuild 10631 BLAKE2B 3a19da69011852882e86923f7c36cd47c9732d6103bc9d5e05cefcd91e682755304a557337903fe5531aaa02e6811612331fc0d9d66ca8dc17710951b67f2b8f SHA512 097b83a4503a6f1520b88128e6a55bee9d17eb98d8e9181c9484fa879c7bc8de3d4a78e25e5f46910b1d1e114bc4fdd55c1c828d4246eda4f002c41ad81f0002
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 97762b39de26..2113074e74e3 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index aceefb06e9ea..78d1bcd9ebc8 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,6 +1,8 @@
 AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d51b27bcc310c409c054630c5dee7a0d1159c929d08524fc1bd2fa6e596a9098684d5353c111bb5a09e519798 SHA512 f4d6066d194f19ed46c0fe773fdf3d80b833df2d6e84d90d409c43577ee871f400c0a6cd4cae115d64109232384e924d4d8f4fee5ff3b856f1e921cc9b38c384
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
+DIST check-0.13.0.tar.gz 301386 BLAKE2B fbc79ad9f0bacd7c7461cde631a499d92e004233b5d35ba35cb0791195362e12fc21ca059e2019280cbf256215528af239de988755e0183cb6e332a5b145624e SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f
 EBUILD check-0.10.0-r1.ebuild 1792 BLAKE2B 258840e8effd0212bda0d7851ebaf09b8685a479566e8cbb50660b00f133b4b5d129db93e4022297757bba8ff2486353e4767d6279c430bf2f9d0cbc864bb359 SHA512 b058e308c58f2988a63d0b7e4fa0c3c1cac7cb34afbaab74d1b032eb0512420bd0330c20df527e23b5211bf14a1c5212f3e2bb79feeeef89952ce430f3af0dc0
 EBUILD check-0.12.0.ebuild 1783 BLAKE2B da5d9b52a93cb886150e906f778578aaddf923467b4275bb38eb94388fd01b55a16d02ce43309259a349616b1c200b2c2708932a05145cf652ce5e94bd518cf3 SHA512 03b6274c56da34948c52843cadbb610e5eef33a67a6da2203c037d71e87719ffdd9f9f9b76098822b494617689387955b2a1c3784a417dc523a15746e846c92b
+EBUILD check-0.13.0.ebuild 1481 BLAKE2B bd9c08fe2754ebb540f40caf81be0b93f0a23f692150a2974ae34b2129ff1bf24850b53f4b8755c692639d4851df568e2594fb7b154539c0505394d072e565d6 SHA512 d7490e59df3204aa2b7247412632ff7b13da78ea8c456795b149bdb40af2cb434a1f5921ad133697bea4d114606fdb0a15b42d438ba01360fb665408efe5d0a3
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.13.0.ebuild b/dev-libs/check/check-0.13.0.ebuild
new file mode 100644
index 000000000000..dad18b128cb3
--- /dev/null
+++ b/dev-libs/check/check-0.13.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A unit test framework for C"
+HOMEPAGE="https://libcheck.github.io/check/"
+SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs subunit test"
+
+# https://github.com/libcheck/check/issues/208
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		$(use_enable doc build-docs)
+		$(use_enable subunit)
+		$(use_enable test timeout-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+}
+
+src_compile() {
+	if use doc; then
+		cd doc/ || die "Failed to switch directories."
+		doxygen "." || die "Failed to run doxygen to generate docs."
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+
+	rm -r "${ED}/usr/share/doc/check/" || die "Failed to remove COPYING* files"
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index b4ebe3d72dc9..c1e2d371b3b3 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,4 +1,3 @@
-AUX cyberjack-r1.rules 895 BLAKE2B b4a372c05db5efa74e4b433709e99a089d839a84b509c76612de220e80eb0940428bc5d461bc3a5dcc4095f08cfd66ffee2c3cc058c2aed6c0574e78c75513f9 SHA512 baeae4d96ffe6d965d123f54969595bc52f57b6f5c0418adad76b3f69ee2365c9840956ca37eb8ac8478f5a90971b4101bef95aba40711b1a4feb4be49f99a8c
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
 EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
 MISC metadata.xml 741 BLAKE2B 1660cf6afa7c5988573bb7a651560b0ce38832ad7149784aabd2589407c3d6fff7a9a76a0ee3bef81c1e3efaa46c8733e7e8de724d07bff7766280ebb8dcc4be SHA512 442fce5186e7a04e0d96b2d179db3438a4d7b8f0b5b11443d494d8b0203881c63dd4e4238eae594ad5c15b7eab683c7d35d50d24e147ce896128784ffe7442bf
diff --git a/dev-libs/cyberjack/files/cyberjack-r1.rules b/dev-libs/cyberjack/files/cyberjack-r1.rules
deleted file mode 100644
index 775ed4cb592d..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-r1.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# If not adding the device, go away
-ACTION!="add", GOTO="cyberjack_rules_end"
-SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
-ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
-
-
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd"
-ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd"
-
-# All done
-LABEL="cyberjack_rules_end"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 5e64ebb3a1d6..38f0426d69c8 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,9 @@
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
 DIST efl-1.23.1.tar.xz 77466768 BLAKE2B a8507777f84ee356bb53982d2b102eb6413ab274ce98dbd87b62a11b6a89eb7d12e0d858b5dfcbbe3da0e1bcc753c338d4c4b7060c569ee621e71afa2477397d SHA512 9c81f28bb0d87e1a3e5d2204c0e2401d9b3f6dcc34f47cb2b41711ef033b3134f4cd283e87a216a0ce4ee903f721a1f8c2f003577444c5781e7f47ce827201e6
-EBUILD efl-1.22.2.ebuild 6917 BLAKE2B e72f02cdd98c2b951dc29df62c53d2b4d964466a7e77e0612503649c2176bfb7c462e4f9442ad71337b008e143e04e199401573996b06dce37e26ac3640834b5 SHA512 85f8cf01985e23021383937b402097f9f4c2439398c3b4bab96ef031a620bdc8af54e2f3bc8bb87dda1e94b204a5f48c6d6738d73c5238e718bb1ee82e20b172
-EBUILD efl-1.22.6.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759
-EBUILD efl-1.23.1.ebuild 7489 BLAKE2B 0e86657acc4b135253b59734886917bf36d3bb2eda37a1016fb676492a1aa99e0c8f1f518b33164683785dbd2590e80b83aa5087753642c08ca5d962a1894f58 SHA512 7d953cd21de64cc52af81a938cae07ecf8bbadf551c5585e4ae2539ce963eeaf7bf0856dafa0b4a1259207b2d53d8d161cc6cfc4999d2ddfcef05f9509870f3b
+DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed
+EBUILD efl-1.22.2.ebuild 6910 BLAKE2B 992fb4fe1844bcda988b88071d7e09573d3b4d697387a05f532e3fe784adeeadd3f8ba461289396bb1cb5a55eac237c5858a10ff4755d95888ec0a4fb60eb0b2 SHA512 9492793263d7fbb32da95d393ea8a54df31e81c04581c54f80e69f5a9567207455754db4abd194c25f827ca95933b47f2b773321a83def2e12f659f469ef92f0
+EBUILD efl-1.22.6.ebuild 6912 BLAKE2B b10cd975207ab13a1d3172273c37e08fbaecb6f545599c86f0bc88576250f53d4d040df197aee81d300c511dbaba7c0d7650147b2bf92250b21e195421ad8f32 SHA512 02bafb8642f3605167bc74f3c4b79d991cd8d7c33e44c133587eed2418d0d0c4f6875a422e676a35150bdaf411c521af8ef9718e8d56906e2ff752b4434ba442
+EBUILD efl-1.23.1.ebuild 7480 BLAKE2B 0a404c51fc2984ffbaca4df3a8f6e19adb54838dd67163ab64296b8b9259f6956e48c14b512d881f9a9b1d38fc8d8db9befb2f0b9009ed30a5be34c02bc386a9 SHA512 a8a7eb785323e12f236a3390a7c9041a3aaf2c383089969315047213134d8bf887bbd9cb7e9abe9b361512ef90aa1d73ab29a9da853a87cf525619d0e62ec1be
+EBUILD efl-1.23.2.ebuild 7458 BLAKE2B 98221bada550fdacbb9d379e4f1499887c96b9e52d931f9bb4cdc37b13256409bf00087c8c90ece4693da0c815f519bd2bd939bf3d8d8e8ddd1f5af14c9f7da6 SHA512 81e09ac146a3e585aeb6bfaf821e6da28e27205779579e5c04ca63a012a238004af4d4be7b5b5394b5fa843cc1adfe530d2beb6b4cf30952b6c1a13b9297036b
 MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.22.2.ebuild b/dev-libs/efl/efl-1.22.2.ebuild
index b5138cbe8aa4..1b17f116ce8d 100644
--- a/dev-libs/efl/efl-1.22.2.ebuild
+++ b/dev-libs/efl/efl-1.22.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.22.6.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
index 5af4a6a9437b..b4a90ad0d777 100644
--- a/dev-libs/efl/efl-1.22.6.ebuild
+++ b/dev-libs/efl/efl-1.22.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.23.1.ebuild b/dev-libs/efl/efl-1.23.1.ebuild
index 939c0e238232..9b1afbddc390 100644
--- a/dev-libs/efl/efl-1.23.1.ebuild
+++ b/dev-libs/efl/efl-1.23.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
 	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
@@ -37,6 +37,7 @@ RESTRICT="test"
 RDEPEND="
 	dev-libs/check
 	net-misc/curl
+	media-libs/giflib:=
 	media-libs/libpng:0=
 	sys-apps/dbus
 	sys-libs/zlib
@@ -72,7 +73,6 @@ RDEPEND="
 	)
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
 	gles2? (
 		media-libs/mesa[egl,gles2]
 		virtual/opengl
@@ -85,7 +85,7 @@ RDEPEND="
 	hyphen? ( dev-libs/hyphen )
 	ibus? ( app-i18n/ibus )
 	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( dev-libs/rlottie )
+	json? ( media-libs/rlottie )
 	lua? ( dev-lang/lua:* )
 	luajit? ( dev-lang/luajit:* )
 	mono? ( dev-lang/mono )
@@ -152,6 +152,7 @@ src_configure() {
 		-D xinput22=true
 
 		$(meson_use X x11)
+		$(meson_use debug debug-threads)
 		$(meson_use drm)
 		$(meson_use elogind)
 		$(meson_use examples build-examples)
@@ -209,7 +210,6 @@ src_configure() {
 	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
 	! use dds && disabledEvasLoaders+="dds,"
 	! use eet && disabledEvasLoaders+="eet,"
-	! use gif && disabledEvasLoaders+="gif,"
 	! use gstreamer && disabledEvasLoaders+="gst,"
 	! use ico && disabledEvasLoaders+="ico,"
 	! use jpeg2k && disabledEvasLoaders+="jp2k,"
diff --git a/dev-libs/efl/efl-1.23.2.ebuild b/dev-libs/efl/efl-1.23.2.ebuild
new file mode 100644
index 000000000000..14721b4005ef
--- /dev/null
+++ b/dev-libs/efl/efl-1.23.2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
+	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
+	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
+	tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
+	xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	^^ ( lua luajit )
+	ssl
+	gles2? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20191101 )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:* )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D install-eo-files=false
+		-D mono-beta=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D xgesture=false
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use elogind)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use systemd)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	if use static-libs; then
+		emesonargs+=( -D evas-modules=static )
+	else
+		emesonargs+=( -D evas-modules=shared )
+	fi
+
+	local disabledEvasLoaders=""
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local disabledEmotionLoaders="gstreamer,"
+	! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
+	! use vlc && disabledEmotionLoaders+="libvlc,"
+	! use xine && disabledEmotionLoaders+="xine,"
+	disabledEmotionLoaders=${disabledEmotionLoaders::-1}
+	emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
+
+	local disabledGenericEmotionLoaders=""
+	! use vlc && disabledGenericEmotionLoaders+="vlc"
+	emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="luajit,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index c63874aadf24..0bcd594cc26c 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -3,12 +3,16 @@ DIST ell-0.21.tar.xz 448612 BLAKE2B a20e177bb2ef7620c79cecdb84e47db662d97904189c
 DIST ell-0.22.tar.xz 452692 BLAKE2B 6e8add0e439bfae287be5522ccdb0b9a7f1cc0c378f0498f8b2193bd4e8b10cac71df2b21cf0df202a16182bd188cb56efecf0cc7e8b027c2d00b2579f2c155f SHA512 6977f0fe2d7e2c86317163d45ee92750d9f42a2d04cd28e8fcb48e0ef680d98f586e983cc1821eb19430ea951bfe408d821da3a58244626f97244ed2b4a9e539
 DIST ell-0.23.tar.xz 453040 BLAKE2B 027adbaf786bd83070acfcbb1435c36adb70e6d798c6664cdb4d6f9ea0b7aaee2b45b2738210889125c565da06360fe1337b3847913195533be2f87ef1f9d48b SHA512 0a55316816f44482e6958c9745ebf2beca64b8a0d81db9367dfdeb05e36012a14d7b645f3077eab01ea743df129ab8dad0b8d72f21e8ccb2741863eb5f4bc948
 DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c5440a780959cb832f9414030040abf91072a751b19028713cc8527f5dbb24450b07c69dcebcc9d8f62366b SHA512 14e9b31ab0f08761c7672798a23ee91b7d2fe8fd509df35c40e413e26b90f86a192f48283b3798402d9d23acdf1fbcd1d506e5fa9331a32279f03f4cf462205b
+DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693
+DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.22.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
-EBUILD ell-0.23.ebuild 1049 BLAKE2B aa1d8c875e062bf875c58b93bca4c3da4bb12779eb254cb2d78be3421a96a0037efdd463408e06d7f09002cc25637c46c33d74756381315d655d3228117f58b8 SHA512 950be003d142b2094396a10065c1018ec84c1695181e24d0d8f1106140c3d7ce561d977ee57447484519684bc0eb888bcead48ddf80ffc62e531963ac2388e60
+EBUILD ell-0.23.ebuild 1048 BLAKE2B 3ad500373c36074fd147ba65234f25b61ce46b9f1d7235625c749369e4a8b2e89682c48a6b78ebebf185be232a38ecd539eb644099cc4339cc538196c894b21f SHA512 07e80a76a8e6ae61b4c5183613140efc63704175772cdd90f734a08808ddd38659c5b1d4d10a25bd5a60c259e4f3ee754eccf9cafb1df51e1c9db914f9523a58
 EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.26.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.23.ebuild b/dev-libs/ell/ell-0.23.ebuild
index 974745cd299a..9c1223c6f05c 100644
--- a/dev-libs/ell/ell-0.23.ebuild
+++ b/dev-libs/ell/ell-0.23.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.25.ebuild b/dev-libs/ell/ell-0.25.ebuild
new file mode 100644
index 000000000000..cafd42ed2ce6
--- /dev/null
+++ b/dev-libs/ell/ell-0.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild
new file mode 100644
index 000000000000..cafd42ed2ce6
--- /dev/null
+++ b/dev-libs/ell/ell-0.26.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 45acaec6b44a..ec053b668e56 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,7 +1,3 @@
-DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
-DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab66d736e87fb516ce52d599711b3014218bef822640781b8852c7238b6f071b5bd439a13838fcbc7767d06a7 SHA512 bf3af5b5a8e1a1b76658a41f67dbe7b10104e3b724e1882f529fecc509b07c75dde02d8f8b89b1522e05484e8dc417d47651c5f8d4aac1749676ba5c4752c107
 DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
-EBUILD expat-2.2.6.ebuild 2474 BLAKE2B 00981a6b7fd2c347340a8fd5d807fc8433a52bd2dac47665d57624bc12b27db6cf866f15590e00108e41ba33d20753362c6444d61c92a4df68d1e1a54164c1fe SHA512 465ef4312e9bf5a2fba5265ea1eee376a351080b9e6a39e13c204c7c10fe8d8f5d1509b5a3df375392731482d68a99ae0dd9eb9456ab77b7ab69cd08a1a74375
-EBUILD expat-2.2.7.ebuild 2492 BLAKE2B bb4bd479446ff68661e650efd1c3119501921c0fafcae09a150e721bc4039ab365d0dd2cfadc887232f84bf5c832a8be19328f0f6addc697eb040c83019e6208 SHA512 fac8cc1baa77aaeb261a0c9b5bde41dcf04085a36eea303e1139216814464ebd209218278cff564cc3a89b8c1deee7f87059e769624397a36c6e932feac5c21c
 EBUILD expat-2.2.8.ebuild 2511 BLAKE2B e2d4f349316d2df8e84569179b8eb5bf5455b2a8815f9e25b0b727a60b5f218b3f1e818ec94f97d115b7a13b40b5ab7d238c8195d9ef876c7ccd18ae78fe5f41 SHA512 6a30cb61afc656dfc0ba524294cc2feaf6477062d83b498e3561c574e57804cf193b2fd3ce8137b24596ad5173780a72a0cfcc9c56a4f671493a8217d971a29b
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
deleted file mode 100644
index a8ea133e1e29..000000000000
--- a/dev-libs/expat/expat-2.2.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND=""
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html,png}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-libs/expat/expat-2.2.7.ebuild b/dev-libs/expat/expat-2.2.7.ebuild
deleted file mode 100644
index c7c178878a89..000000000000
--- a/dev-libs/expat/expat-2.2.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html,png}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 0ec1a709b26f..6d2820c37229 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -3,6 +3,6 @@ DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f9
 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-0.3.3.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
+EBUILD girara-0.3.3.ebuild 1062 BLAKE2B b6f9471c622831ed7df8e2582ea49515145d2ee16d74912ef2e8e7a94e8e7ea10500fcaa80289f71cc005c3014ef787a122648fe0f69776da91cd9d5042cd4e8 SHA512 927718908e48bfe659a325f21e4ad9c746a180851dc47a455e297af98524559122b565413bdc6d3b1e0fb9c33ea11ddb33a7013fc5c2b63ac730117a4caf2d42
 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
index 6aba9061dfb2..2555ff2cb3af 100644
--- a/dev-libs/girara/girara-0.3.3.ebuild
+++ b/dev-libs/girara/girara-0.3.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 614dec62c928..ac685a5f59c4 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
+DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
 EBUILD gmime-2.6.23.ebuild 1722 BLAKE2B 9e3fb8377a4908c8569739940a39fe147dfa02bc1983812e041a37f66b0d53569d666b5cf27645a27b325fed4d73fb3503b18fcd2b79c91d0c6e89679336c3ed SHA512 73455c2979fc958713fb9f7df51bdcacaba08c76ca3205a6993bb2ded1784f27a41bb7fb2a22dfbca648bdee908dc7103733f4f86c231cecede6cb757c25c97c
 EBUILD gmime-3.2.3.ebuild 1554 BLAKE2B 21b99a57ad848545e879df34eac874a423f3892b55757ea30c379586a88bcb24a8f5bf5446ee9fbe00b8dcf8e63a6fb3a670af2271d529671edb3bbced553612 SHA512 69d726e3a11b73103725d9ce3d0bcad3100de5e7cdd9d6cd23cffb78ccb749662a7fa8a99a556173818d90179a16534e3bc00b576f23d159f58d8fab3cdf9c40
+EBUILD gmime-3.2.4.ebuild 1556 BLAKE2B e5130c728d1348b3e96ebe56b5723b10127aecadff2dca05ca55288c211e8ac6269616c2fa127e0695809a786e5db5bd7f14786edb80754658074167e65868ef SHA512 bf54e2b56e5874b4dad0060aafd810f29f00cec0655f074fe8abc7fa3ca0353a23c055c6d9f482f92d8f17f61e7d79098432f8564ff08833afbd1d5e26442235
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
new file mode 100644
index 000000000000..9ee27431db57
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		$(use_enable crypt crypto) \
+		$(use_enable static-libs static) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 4231cdff3983..48e3678e70d5 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 2101 BLAKE2B 866d4517a1dab7c782f52ac9025b76acc84f57dd259e80c0fec2cc7f9873f59ed8185c4df51297cdbfd3517fcdc88f0215b4c25adad5fadf2b2e8a3b6bb2ddf2 SHA512 c5fd3ea99ea9ec6ebe1752d4decafd20627a3bf5e0268ebcc0eb542669fc3be3fd4fca7afcc4ebfbe34e58e41da9139b711723a763917bb602026560eee942a2
 EBUILD gobject-introspection-1.58.3.ebuild 2178 BLAKE2B f2ef3c53982192cb2bd58f52f84ba033abffd354e62ad12f93b155e5ee82ca719f99749e22de750c3029080700c4abe1157bcb859604eaadd3c7d7ca027a0831 SHA512 07339b10f27d38e9b1d244e80156710eadd91f009fff57a69065305fd505f779a9bd9c5134307aea4a059a4d630258523551561e7a015a24770e694988a1bf18
-EBUILD gobject-introspection-1.60.2.ebuild 2093 BLAKE2B d9edaeb9d4f8b3e6c3df7dff795c7dcca481c01757489ad4e9f20d907928ed172b387c26f012b5e2d3434ce788366d5830093100dee4d32d98ff4eaeee059a8c SHA512 74d47ee1e186c5d37cddd78467a17b7771be44bcb125eed7156860f0da7d851e8ac7bcf4354d93604fbb0d821074066cabc0439dfb7a7283edd23244264139b2
+EBUILD gobject-introspection-1.60.2.ebuild 2135 BLAKE2B 48d77747097f9228b39ede21893bf0e407824c236132d9fb6d89388319897d1b8cd41bc5ab9778686ef598297c0ab1a54376bb61dde0e0c6fd34e2e01d952376 SHA512 f5f85387b190dcb1dfb72ac0fc368b6db70bc899f4805b544994c36ebba12f0e281d98caf35b259241a869f15b65a71d7e15dea36c3e8c53849d0546e2557b6d
 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 4b9721af843e..ecde3bca4d51 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -35,7 +35,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.19
 	sys-devel/bison
 	sys-devel/flex
-	test? ( x11-libs/cairo[glib] )
+	test? (
+		x11-libs/cairo[glib]
+		dev-python/markdown[${PYTHON_USEDEP}] )
 " # autoreconf needs autoconf-archive
 # PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
 PDEPEND="cairo? ( x11-libs/cairo[glib] )"
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 608f6d7abc20..fcb46cafe4ec 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,5 +1,3 @@
-DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
-EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
-EBUILD granite-5.2.5.ebuild 878 BLAKE2B 3f2bc70da0a84f0fe0dada47d656a1950a80a8e9bd1e2a2027e8808ae42d7d9951f6f53ea938e815926a09fed12cfe0c54f826adbc54eb1c6d9c14e9a846bf58 SHA512 d3c18dfa50a11ece4d3c14e8368252b9f32834e15aef25f2175bfde2db18eeba6be1cfef6251fb46def4f63b93cf71fdb928666c5fef50dafea34d5d65495c0a
-MISC metadata.xml 835 BLAKE2B 20ae3ed5c84b3340f2e70a4c95bd80c1b769db96371c64fa8aa15e34591c2e206ba2a814cef4346613f173a48f43863e3fe64ea4a208840f7ff7ec7355e69ef1 SHA512 3d4e7730d8010f143314237e3c1b49f947ce00a1e60b9eb0c2ef46d0a8c3e2b4a5775c28b817b96234e6eddfa205c38d6ce270603a4567fdf308999a98ced416
+EBUILD granite-5.2.5-r1.ebuild 1867 BLAKE2B 3731912ee305d02bf85b53b83f2d45a342494ec21ee668a774cf1426f51ed41e55fdc4d66e38670bb38b64c7945be7d108946a29abd6d3e168e0afff05eced7a SHA512 ff7953d1d51b4317e8043d5afbec2931cb097d36dd71b39cb516f8dff16910d90a9fdc499b5d09edb104e52158f5cbf3b4ac73d79486b84f169f992159b23647
+MISC metadata.xml 695 BLAKE2B 251666b8d527fe7308162cc3cb8f9930df967e9eb57673cff6ba7306c65d3cd7082f42cddcd40f920bb8f0ba838cc57c652690b98e86784df2cc0d3fecc0906e SHA512 e90e892b32e3439be4ad4b3aea593878f4c7c158e97fda4c657fdc6b1f56ba31b18bc516e2db40b0a766820dba0bab255fc361d5ac86147c6f422b39de51c835
diff --git a/dev-libs/granite/granite-0.5.0.ebuild b/dev-libs/granite/granite-0.5.0.ebuild
deleted file mode 100644
index abb46af52627..000000000000
--- a/dev-libs/granite/granite-0.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.32
-
-inherit gnome2-utils vala cmake-utils versionator
-
-DESCRIPTION="Elementary OS library that extends Gtk+"
-HOMEPAGE="https://github.com/elementary/granite"
-SRC_URI="https://github.com/elementary/${PN}/archive/$(get_version_component_range 1-2).tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="demo nls test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgee:0.8[introspection]
-	>=x11-libs/gtk+-3.14:3[introspection]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/"${PN}"-"$(get_version_component_range 1-2)"
-
-src_prepare() {
-
-	# Disable building of the demo application (if needed)
-	use demo || cmake_comment_add_subdirectory demo
-
-	# Disable generation of the translations (if needed)
-	use nls || cmake_comment_add_subdirectory po
-
-	cmake-utils_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVALA_EXECUTABLE=${VALAC}
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-libs/granite/granite-5.2.5-r1.ebuild b/dev-libs/granite/granite-5.2.5-r1.ebuild
new file mode 100644
index 000000000000..dc1cb86a0666
--- /dev/null
+++ b/dev-libs/granite/granite-5.2.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+inherit meson vala xdg
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc +introspection test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+	doc? (
+		dev-lang/vala[valadoc]
+		dev-util/gtk-doc
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	dev-libs/libgee:0.8[introspection=]
+	>=x11-libs/gtk+-3.22:3[introspection=]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	vala_src_prepare
+	if use doc; then
+		sed -i \
+			"s/find_program('valadoc')/find_program('valadoc-$(vala_best_api_version)')/g" \
+			doc/meson.build || die "Failed to replace valadoc"
+		local doc_sed_list=(
+			"lib/Widgets/AboutDialog.vala"
+			"lib/Widgets/AlertView.vala"
+			"lib/Widgets/AsyncImage.vala"
+			"lib/Widgets/Avatar.vala"
+			"lib/Widgets/CellRendererBadge.vala"
+			"lib/Widgets/DynamicNotebook.vala"
+			"lib/Widgets/MessageDialog.vala"
+			"lib/Widgets/ModeButton.vala"
+			"lib/Widgets/OverlayBar.vala"
+			"lib/Widgets/SeekBar.vala"
+			"lib/Widgets/StorageBar.vala"
+			"lib/Widgets/Toast.vala"
+			"lib/Widgets/Welcome.vala"
+		)
+		for src_file in "${doc_sed_list[@]}"; do
+			sed -ie "s@{{../doc@{{${BUILD_DIR}/doc@g" \
+				"./${src_file}" || die "Failed to fix docs for ./${src_file}"
+		done
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc documentation)
+	)
+	meson_src_configure
+
+	if use doc; then
+		cp -r ./doc/images "${BUILD_DIR}/doc/" || die "Failed to copy doc images"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/granite/html/." )
+	meson_src_install
+}
diff --git a/dev-libs/granite/granite-5.2.5.ebuild b/dev-libs/granite/granite-5.2.5.ebuild
deleted file mode 100644
index 3a143613f480..000000000000
--- a/dev-libs/granite/granite-5.2.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION=0.40
-
-inherit meson vala xdg-utils
-
-DESCRIPTION="Elementary OS library that extends GTK+"
-HOMEPAGE="https://github.com/elementary/granite"
-SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
-# FIXME: Figure out issues with enabling doc.
-# See https://github.com/gentoo/gentoo/pull/12690#issuecomment-525027164
-IUSE="test"
-
-BDEPEND="
-	$(vala_depend)
-	>=dev-util/meson-0.48.2
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/glib-2.50:2
-	dev-libs/libgee:0.8[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vala_src_prepare
-	eapply_user
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 9c251c8633e2..9a1a6cde3148 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -14,9 +14,6 @@
 		it provides complex widgets and convenience functions designed for
 		use in apps built for elementary OS.
 	</longdescription>
-	<use>
-		<flag name="demo">Build the Granite demo application (to present all available UI features provided by the library)</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">elementary/granite</remote-id>
 	</upstream>
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index b74e3273d732..7f6ac57e3d20 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,5 +1,8 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 AUX icu-layoutex-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
+AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
+DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
 EBUILD icu-layoutex-64.2.ebuild 2557 BLAKE2B bf296e4c6aeb9efa43289ae335dc5a821480694c9ec45f0a5d4241c5611892bf70b7e55982398d6f583a1ac18dafa1d1addc1c8c0b9708f4b629ce5a03793cdd SHA512 0621a4c9e5da886127fad73dddbf6ba5be4eda63069e8287133569c830ba728089c308167042eea20001ecf72c5286caf76cc9d4d62d3d8acc3a7a6b32ade903
+EBUILD icu-layoutex-65.1.ebuild 2584 BLAKE2B 301cc12f7b5c758ab5a85d6748ffa9e94ff699aa33fae6e59f244d2a2782fcb632aa9acb18cee817d4ca3cdc08350d604a399e30d86e271f41eed75c56a75d84 SHA512 e1d903a29915821c1ffab8e4c5070fb161cef4e8ccd6abf797eaef7541aaadb22958f3d0cc1d934f527d102ccb0d831272a810535d4c2cd4b62ce86bcdb3f76f
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-65.1-remove-bashisms.patch b/dev-libs/icu-layoutex/files/icu-layoutex-65.1-remove-bashisms.patch
new file mode 100644
index 000000000000..f052a06dc62c
--- /dev/null
+++ b/dev-libs/icu-layoutex/files/icu-layoutex-65.1-remove-bashisms.patch
@@ -0,0 +1,207 @@
+--- a/config/icu-config-bottom
++++ b/config/icu-config-bottom
+@@ -218,65 +218,65 @@
+ 	    ;;
+ 
+ 	--cflags)
+-	    echo $ECHO_N "${CFLAGS} ${ECHO_C}"
++	    printf "%s" "${CFLAGS} "
+ 	    ;;
+ 
+ 	--cc)
+-	    echo $ECHO_N "${CC} ${ECHO_C}"
++	    printf "%s" "${CC} "
+ 	    ;;
+ 
+ 	--cxx)
+-	    echo $ECHO_N "${CXX} ${ECHO_C}"
++	    printf "%s" "${CXX} "
+ 	    ;;
+ 
+ 	--cxxflags)
+-	    echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${CXXFLAGS} "
+ 	    ;;
+ 
+ 	--cppflags)
+ 	    # Don't echo the -I. - it's unneeded.
+-	    echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
++	    printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
+ 	    ;;
+ 
+ 	--cppflags-searchpath)
+-	    echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
++	    printf "%s" "-I${prefix}/include "
+ 	    ;;
+ 
+ 	--cppflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCPPFLAGS} "
+ 	    ;;
+ 
+ 	--cxxflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCXXFLAGS} "
+ 	    ;;
+ 
+ 	--cflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCFLAGS} "
+ 	    ;;
+ 
+ 	--ldflags-system)
+-	    echo $ECHO_N "${LIBS} ${ECHO_C}"
++	    printf "%s" "${LIBS} "
+ 	    ;;
+ 
+ 	--ldflags)
+-	    echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
++	    printf "%s" "${LDFLAGS} ${ICULIBS} "
+ # $RPATH_LDFLAGS
+ 	    ;;
+ 
+ 	--ldflags-libsonly)
+-	    echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
+ 	    ;;
+ 
+ 	--ldflags-icuio)
+-	    echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_ICUIO} "
+ 	    ;;
+ 
+ 	--ldflags-obsolete)
+-	    echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_OBSOLETE} "
+ 	    ;;
+ 
+ 	--ldflags-toolutil)
+-	    echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_TOOLUTIL} "
+ 	    ;;
+ 
+ 	--ldflags-layout)
+@@ -285,7 +285,7 @@
+ 	    ;;
+ 
+ 	--ldflags-searchpath)
+-	    echo $ECHO_N "-L${libdir} ${ECHO_C}"
++	    printf "%s" "-L${libdir} "
+ 	    ;;
+ 
+ 	--detect-prefix)
+@@ -321,47 +321,47 @@
+ 	    ;;
+ 
+ 	--shared-datadir)
+-	    echo $ECHO_N "${datadir} ${ECHO_C}"
++	    printf "%s" "${datadir} "
+ 	    ;;
+ 
+         --incfile)
+-	    echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/Makefile.inc "
+ 	    ;;
+ 
+ 	--incpkgdatafile)
+-	    echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/pkgdata.inc "
+ 	    ;;
+ 
+ 	--icudata)
+-	    echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_NAME} "
+ 	    ;;
+ 
+ 	--icudata-mode)
+-	    echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
++	    printf "%s" "${PKGDATA_MODE} "
+ 	    ;;
+ 
+ 	--icudata-install-dir)
+-        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
++        printf "%s" "${ICUPKGDATA_DIR} "
+ 	    ;;
+ 
+ 	--icudatadir)
+-	    echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_DIR} "
+ 	    ;;
+ 
+ 	--shlib-c)
+-	    echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
++	    printf "%s" "${SHLIB_c} "
+ 	    ;;
+ 
+ 	--shlib-cc)
+-	    echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
++	    printf "%s" "${SHLIB_cc} "
+ 	    ;;
+ 
+ 	--version)
+-	    echo $ECHO_N $VERSION
++	    printf "%s" "$VERSION"
+ 	    ;;
+ 
+ 	--unicode-version)
+-	    echo $ECHO_N $UNICODE_VERSION
++	    printf "%s" "$UNICODE_VERSION"
+ 	    ;;
+ 
+ 	--host)
+--- a/config/Makefile.inc.in
++++ b/config/Makefile.inc.in
+@@ -124,12 +124,6 @@
+ # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
+ ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
+ 
+-# Proper echo newline handling is needed in icu-config
+-ECHO_N=@ICU_ECHO_N@
+-ECHO_C=@ICU_ECHO_C@
+-# Not currently being used but good to have for proper tab handling
+-ECHO_T=@ICU_ECHO_T@
+-
+ ##################################################################
+ ##################################################################
+ #
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,24 +26,6 @@
+ PACKAGE="icu"
+ AC_SUBST(PACKAGE)
+ 
+-# Use custom echo test for newline option
+-# Current autoconf (2.65) gives incorrect echo newline option
+-# for icu-config
+-# This may be removed later - mow (June 17, 2010)
+-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
+-case `/bin/sh -c "echo -n x"` in
+--n*)
+-  case `/bin/sh -c "echo 'x\c'"` in
+-  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
+-  *)   ICU_ECHO_C='\c';;
+-  esac;;
+-*)
+-  ICU_ECHO_N='-n';;
+-esac
+-AC_SUBST(ICU_ECHO_N)
+-AC_SUBST(ICU_ECHO_C)
+-AC_SUBST(ICU_ECHO_T)
+-
+ AC_MSG_CHECKING(for ICU version numbers)
+ 
+ # Get the ICU version from uversion.h or other headers
+--- a/icudefs.mk.in
++++ b/icudefs.mk.in
+@@ -161,11 +161,6 @@
+ ENABLE_STATIC = @ENABLE_STATIC@
+ ENABLE_SHARED = @ENABLE_SHARED@
+ 
+-# Echo w/o newline
+-
+-#ECHO_N = @ICU_ECHO_N@
+-#ECHO_C = @ICU_ECHO_C@
+-
+ # Commands to compile
+ COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
+ COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
diff --git a/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
new file mode 100644
index 000000000000..39c599c35b15
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-65.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 76f16ca32f8e..5e746e797d2e 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,6 +2,9 @@ AUX icu-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1
 AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
+AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
+DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
 EBUILD icu-64.2.ebuild 3424 BLAKE2B 455ef59b9f573a627eb83438bd98d2f71c82bcb800934373fe5e5ed3005efc05ec650ee699e00fbb4bf85073bdb686c849cbce11fa0b97816db961f4303903c6 SHA512 9f02fe5ddfe77f9dc2528d7aacf4eaed43eb5322396e3a3f7f275e38d90261f2cb77470babad8a205a62ef7cce41aedf1a064ab3e19d5709cacb38d4cbb74794
+EBUILD icu-65.1.ebuild 3402 BLAKE2B 530737cf53623fc9853338799a78520f47f76667da7bbd29e4d21f5cb283b7e2c84b7d18dd83674fe28ace4c47945503c3796fa6b1bfa1ffcf214e4d1a2c3da1 SHA512 9e43b9b81178ca6fd346864981fd3da6f565778d703098312d9c0b325f7efe27c87505efb02966ac266afac551b0ca987c93d19c30058667fb015512be74f539
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-65.1-remove-bashisms.patch b/dev-libs/icu/files/icu-65.1-remove-bashisms.patch
new file mode 100644
index 000000000000..f052a06dc62c
--- /dev/null
+++ b/dev-libs/icu/files/icu-65.1-remove-bashisms.patch
@@ -0,0 +1,207 @@
+--- a/config/icu-config-bottom
++++ b/config/icu-config-bottom
+@@ -218,65 +218,65 @@
+ 	    ;;
+ 
+ 	--cflags)
+-	    echo $ECHO_N "${CFLAGS} ${ECHO_C}"
++	    printf "%s" "${CFLAGS} "
+ 	    ;;
+ 
+ 	--cc)
+-	    echo $ECHO_N "${CC} ${ECHO_C}"
++	    printf "%s" "${CC} "
+ 	    ;;
+ 
+ 	--cxx)
+-	    echo $ECHO_N "${CXX} ${ECHO_C}"
++	    printf "%s" "${CXX} "
+ 	    ;;
+ 
+ 	--cxxflags)
+-	    echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${CXXFLAGS} "
+ 	    ;;
+ 
+ 	--cppflags)
+ 	    # Don't echo the -I. - it's unneeded.
+-	    echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
++	    printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
+ 	    ;;
+ 
+ 	--cppflags-searchpath)
+-	    echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
++	    printf "%s" "-I${prefix}/include "
+ 	    ;;
+ 
+ 	--cppflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCPPFLAGS} "
+ 	    ;;
+ 
+ 	--cxxflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCXXFLAGS} "
+ 	    ;;
+ 
+ 	--cflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCFLAGS} "
+ 	    ;;
+ 
+ 	--ldflags-system)
+-	    echo $ECHO_N "${LIBS} ${ECHO_C}"
++	    printf "%s" "${LIBS} "
+ 	    ;;
+ 
+ 	--ldflags)
+-	    echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
++	    printf "%s" "${LDFLAGS} ${ICULIBS} "
+ # $RPATH_LDFLAGS
+ 	    ;;
+ 
+ 	--ldflags-libsonly)
+-	    echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
+ 	    ;;
+ 
+ 	--ldflags-icuio)
+-	    echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_ICUIO} "
+ 	    ;;
+ 
+ 	--ldflags-obsolete)
+-	    echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_OBSOLETE} "
+ 	    ;;
+ 
+ 	--ldflags-toolutil)
+-	    echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_TOOLUTIL} "
+ 	    ;;
+ 
+ 	--ldflags-layout)
+@@ -285,7 +285,7 @@
+ 	    ;;
+ 
+ 	--ldflags-searchpath)
+-	    echo $ECHO_N "-L${libdir} ${ECHO_C}"
++	    printf "%s" "-L${libdir} "
+ 	    ;;
+ 
+ 	--detect-prefix)
+@@ -321,47 +321,47 @@
+ 	    ;;
+ 
+ 	--shared-datadir)
+-	    echo $ECHO_N "${datadir} ${ECHO_C}"
++	    printf "%s" "${datadir} "
+ 	    ;;
+ 
+         --incfile)
+-	    echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/Makefile.inc "
+ 	    ;;
+ 
+ 	--incpkgdatafile)
+-	    echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/pkgdata.inc "
+ 	    ;;
+ 
+ 	--icudata)
+-	    echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_NAME} "
+ 	    ;;
+ 
+ 	--icudata-mode)
+-	    echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
++	    printf "%s" "${PKGDATA_MODE} "
+ 	    ;;
+ 
+ 	--icudata-install-dir)
+-        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
++        printf "%s" "${ICUPKGDATA_DIR} "
+ 	    ;;
+ 
+ 	--icudatadir)
+-	    echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_DIR} "
+ 	    ;;
+ 
+ 	--shlib-c)
+-	    echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
++	    printf "%s" "${SHLIB_c} "
+ 	    ;;
+ 
+ 	--shlib-cc)
+-	    echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
++	    printf "%s" "${SHLIB_cc} "
+ 	    ;;
+ 
+ 	--version)
+-	    echo $ECHO_N $VERSION
++	    printf "%s" "$VERSION"
+ 	    ;;
+ 
+ 	--unicode-version)
+-	    echo $ECHO_N $UNICODE_VERSION
++	    printf "%s" "$UNICODE_VERSION"
+ 	    ;;
+ 
+ 	--host)
+--- a/config/Makefile.inc.in
++++ b/config/Makefile.inc.in
+@@ -124,12 +124,6 @@
+ # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
+ ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
+ 
+-# Proper echo newline handling is needed in icu-config
+-ECHO_N=@ICU_ECHO_N@
+-ECHO_C=@ICU_ECHO_C@
+-# Not currently being used but good to have for proper tab handling
+-ECHO_T=@ICU_ECHO_T@
+-
+ ##################################################################
+ ##################################################################
+ #
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,24 +26,6 @@
+ PACKAGE="icu"
+ AC_SUBST(PACKAGE)
+ 
+-# Use custom echo test for newline option
+-# Current autoconf (2.65) gives incorrect echo newline option
+-# for icu-config
+-# This may be removed later - mow (June 17, 2010)
+-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
+-case `/bin/sh -c "echo -n x"` in
+--n*)
+-  case `/bin/sh -c "echo 'x\c'"` in
+-  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
+-  *)   ICU_ECHO_C='\c';;
+-  esac;;
+-*)
+-  ICU_ECHO_N='-n';;
+-esac
+-AC_SUBST(ICU_ECHO_N)
+-AC_SUBST(ICU_ECHO_C)
+-AC_SUBST(ICU_ECHO_T)
+-
+ AC_MSG_CHECKING(for ICU version numbers)
+ 
+ # Get the ICU version from uversion.h or other headers
+--- a/icudefs.mk.in
++++ b/icudefs.mk.in
+@@ -161,11 +161,6 @@
+ ENABLE_STATIC = @ENABLE_STATIC@
+ ENABLE_SHARED = @ENABLE_SHARED@
+ 
+-# Echo w/o newline
+-
+-#ECHO_N = @ICU_ECHO_N@
+-#ECHO_C = @ICU_ECHO_C@
+-
+ # Commands to compile
+ COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
+ COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
diff --git a/dev-libs/icu/icu-65.1.ebuild b/dev-libs/icu/icu-65.1.ebuild
new file mode 100644
index 000000000000..a8993d916efc
--- /dev/null
+++ b/dev-libs/icu/icu-65.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index ae5453c88b17..424f56d4b7d3 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,10 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.7.1.tar.gz 814579 BLAKE2B e29e8bbdb58800e35c4c790b833a512ead0e177e22f140f16ef725738336b49afa709976ab6062b7219b705e14a369f31eef0ded26d51240919ace2cba1de739 SHA512 753cb89f7511b6fbc66e49e9c1fc3ecf1a2d61781b65baea763666f49780cf84a20e0a90fb98e7146f6e11555f892cbfb9c3b4f0d84961af7cce7fc4a277a7f1
-DIST leatherman-1.7.2.tar.gz 815088 BLAKE2B d011d2ae8b75c2a6c10c35da0293624fac0a30dac35d5b7f8b2fee264140666996821f60c8f67eeafc351b669c8263d1a95a00ffcdcd28448b36852c607ca69f SHA512 2976e8d56e603ba86bc22217c1c6b729fed62536ea56b0a74afed4d48a85429d2c79900652344e63905448a13d60d29440623980fd770d40e3db729af5d70ef3
 DIST leatherman-1.7.3.tar.gz 815236 BLAKE2B 26bb6cbf19675741c0d325f42ccce993cd7fa58b116601fa5fc79d2fb443f2c8b26799138289714a1663996247c267efb5485b04cfa68161bc291d91758f7f84 SHA512 4ce424d90c83e5268925095f267f3365b0a75e60d92af83836c790f538d381153c200fff1a1e152b60e247240698d3cbe9a59c4e366040eece0101819775ddff
+DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
+DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.7.1.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
-EBUILD leatherman-1.7.2.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
-EBUILD leatherman-1.7.3.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.7.3.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
+EBUILD leatherman-1.8.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.9.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.7.3.ebuild b/dev-libs/leatherman/leatherman-1.7.3.ebuild
index 335426971404..3e365ff23fc8 100644
--- a/dev-libs/leatherman/leatherman-1.7.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.7.2.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
index 335426971404..335426971404 100644
--- a/dev-libs/leatherman/leatherman-1.7.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
diff --git a/dev-libs/leatherman/leatherman-1.7.1.ebuild b/dev-libs/leatherman/leatherman-1.9.0.ebuild
index 3e365ff23fc8..335426971404 100644
--- a/dev-libs/leatherman/leatherman-1.7.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 74a25ac05e07..adf034709ac1 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,7 +1,9 @@
 DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
 DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
 DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
+DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
 EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
 EBUILD libarcus-3.6.0.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
 EBUILD libarcus-4.2.0.ebuild 1000 BLAKE2B 2ad2ccf6a15ca1ee672b35eda65d78cbd86e6688ae936b4b9c12646f82f9e4cf50ae8d1ddd3a33c3a4c5e4ba6e0126072469f12443530bc43060890daaf7f3a6 SHA512 65df9fb5e3d0772c5b71dbf5964de27115d6b692f0db6d6581b414480c6c7186c44121da1c9cd6d02abe1ea87fb0aa8fc56016af7bf5d41483d017e15aa70564
+EBUILD libarcus-4.3.0.ebuild 1375 BLAKE2B 02ba9a2c0faf8f2bb6bbe17ebb7e4d8c950bf18e24bc7db7851072e25f59bc2fc83ffeed9e013017428e9ac7918140bdab6256ce59bfff023a07868b0974eba4 SHA512 4f5a659694a51f5e639141a01002f276d4f2cca280ab54774cc380524b67c71be4b8c924c59e3effbb7b012f40a5c4fc8774a727d2f1ebaeec0dd3eb6f6f208f
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0.ebuild
new file mode 100644
index 000000000000..d053a69288eb
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-libs/protobuf
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index a56a731a0d34..c533c2c0b136 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -2,5 +2,5 @@ DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 EBUILD libassuan-2.5.1-r1.ebuild 1255 BLAKE2B f44e065a49a9ac1f9a2ca3c6fba5109c29bb4e8e95bcd75b7c30b798a7b43f7ac932e627d85bc78c8e73ffcc53ccbc3f4ae79c8a0dd9452c7a40f4cf08b1d066 SHA512 d7d0968ef815caa65d8793bcfd9cbce3842a8a2a9303072c245375ebde859205f7257335092dc8c84e7102f6d99216fc338b9a4da319fe7eceec8539fbd33b20
 EBUILD libassuan-2.5.1.ebuild 1065 BLAKE2B 15ddd091eb5c4a64f47391ccdf42fc4b07a53e0e11d0ba5874ae0feb3f9b51dd1859e89accf43a198a5e6d3d31c26fe228a098dc240e76f504d7efbf2f105743 SHA512 2e538553eb20f7fc20b8666f7083d647db095df0662ea210392c97dafdab3907df607c59f4589713d4302007cc1592dcce94a73d3090deebcc272f6eabee54ed
-EBUILD libassuan-2.5.3.ebuild 1255 BLAKE2B 2f2346fbf41182f23aa84ce40783e2b4dd0d5ab6c5d728b8c042c5535499a77529eeb634ea794b587898398357094368bd57754eb079df90cd03cebe717d657c SHA512 91d949cf1ad77b8e1350d7bceb361bde744bc524b1c27a1113e235028062903817b2238e41dae45258e90bb29ec1b789a416e65e838d1eabfdf66423e17f3bf2
+EBUILD libassuan-2.5.3.ebuild 1253 BLAKE2B 99741f29886ad6510a507206597a0c93ebef6a66c1a1e7f547d175fd77f21fd566c590cb5287c3eeec6239ad83d675d4030264a1ad46454011e937115d111ff5 SHA512 b053ad9e7a8a4c737a5b590b9fc1d9091b86a7cdd7db1d621db556775bff6a1bba0211b00c6cdfc1d7c79c77e5511a77e3ad1a6688ab6c779e0c1c73d45ba6d5
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index aaf0c72680b1..8a00919e7748 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index f95176c51889..5ba5788746d7 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,5 +1,7 @@
 DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
-EBUILD libatasmart-0.19-r1.ebuild 947 BLAKE2B 073735d386281eed2d06473756dc5c2320c630f682c5896961fead7384c9b015fe998d18fc10481f3989ad28fcdc34efb0f2d4b6f7dc0da1b18e75debfcb0d98 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0
+DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
+DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 EBUILD libatasmart-0.19-r2.ebuild 962 BLAKE2B ee87912f6b870e8ccb660802d46708d171bc057ec404c04f814483feec58e6cd65c0afe358e52a5868a5331ee25989523579b17b6dae814655066b560739d8f1 SHA512 d6ea6bd3d6982e89fde7189312757e1bafef524f8ee8e69074291a01f35005d53d433454a289a635debc723be4fd1a1e071269cf9d41148c6afbb759c5e3c304
+EBUILD libatasmart-0.19_p5.ebuild 1055 BLAKE2B 161c4bb23868cb06ead1dd68bc7f66a43d78a660135895f859e1a0f15c1f43494a0e05706c110f82e94dbe3ae5a4251055dfb061eba4301be706ed029b185199 SHA512 1620ca2a89aed751ddc6660c3da2e07fbac6c49bccee4292eb3a3417205c016e77d90cfbaef6609269611e4ff2fbc30b5d1c55876ee779e2bfd59a84785f762c
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild
deleted file mode 100644
index f2820bf64e2b..000000000000
--- a/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-PATCH_LEVEL=2
-
-DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
-HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz
-	mirror://debian/pool/main/liba/${PN}/${PN}_${PV}-${PATCH_LEVEL}.debian.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="README"
-
-src_prepare() {
-	# https://bugs.gentoo.org/470874
-	local d="${WORKDIR}"/debian/patches
-	sed -i -e '/#/d' "${d}"/series || die
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
new file mode 100644
index 000000000000..14cb1e0f3a06
--- /dev/null
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
+HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart"
+SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
+	mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="virtual/libudev:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+	# https://bugs.gentoo.org/470874
+	local d="${WORKDIR}/debian/patches"
+	sed -i -e '/#/d' \
+		-e "s|^|${d}/|" "${d}"/series || die
+	eapply $(<"${d}"/series)
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libbegemot/Manifest b/dev-libs/libbegemot/Manifest
index fba01bcdb131..49aa7df95cfb 100644
--- a/dev-libs/libbegemot/Manifest
+++ b/dev-libs/libbegemot/Manifest
@@ -1,3 +1,3 @@
 DIST libbegemot-1.11.tar.gz 266310 BLAKE2B c76b2b5e6fe6af0b55da779d6a98d52f1f519b717472338ce17bd2fd709bf397b3801782e1be89dbe2ba289ba9fe19c5527f544f1709770f019f2ad745ffbbd1 SHA512 ea5b0b548ad4240aa945ee9376e13a8ec5848bd9675f7fdc57c3daf1e79735e442c44a550430617a1048d5a0cef06adc9b48d45f42cca9f6049e3f3d0571e627
-EBUILD libbegemot-1.11.ebuild 535 BLAKE2B a46b0905f5133fa0be3c7010fa71509462d664c881b3aa9f1987a7df1a02fe1fc6292119c3f11e0ff91de813af893b04b0c1e3abd93d69b7cecf15835a4c9174 SHA512 1fd9bb617a9cd7e1297bc364d3d644f0737ce46f7a6051b30ed9eef44e4173b308a4a426d61ea4e660d5d1284b33de0f5f82d67ef13f55775e7cf2bd51398748
+EBUILD libbegemot-1.11.ebuild 396 BLAKE2B b74a5c021e0cba3bf0387e8f2f51558fadb19c788c29b52c3e8bb0c7ce60d5fc8383845577f8aac2d8476a135fa5b9780c2f6c84c2e361cc92cc3389eb74044a SHA512 511adeaaee30394ef93c87e1c82da2d650855b9cc3a705b2a11a00ba3e29301b928ff2f8764f09c96d2aaf97b3a4180b311ab4a8e86c6281d3212c2750406bdc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libbegemot/libbegemot-1.11.ebuild b/dev-libs/libbegemot/libbegemot-1.11.ebuild
index 929296a5a713..a66e0e144ee8 100644
--- a/dev-libs/libbegemot/libbegemot-1.11.ebuild
+++ b/dev-libs/libbegemot/libbegemot-1.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit libtool
 
@@ -12,18 +12,12 @@ SRC_URI="http://people.freebsd.org/~harti/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=""
-
-src_compile() {
+src_prepare() {
+	default
 	elibtoolize
-	econf || die "econf failed"
-	emake -j1 || die "emake failed"
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README
+src_compile() {
+	emake -j1
 }
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 8b707811fb37..1655092a839a 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -2,5 +2,5 @@ AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
 EBUILD libcec-4.0.2-r2.ebuild 2156 BLAKE2B 0a245492984af445db8a51798b15b2c1a3df525247489fd404d52e81637cfdd16e734cc7870a40141be2675c164956bb60daa29df2444d718543152df3843565 SHA512 956c302374463bd798916c81ae5bce5adc74fd16fc21bb50272fa5b853aa464eac1657da1049ff0834ba39589e19d43a8b701e6335c6494e4c7c8769e0ccdd65
-EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B ae289b16a60c6e0e02e5a9854aa1466fadeb14c3967c0b4b71d1ed7c9968eee9a7a588549e7fb4037c8ad937e304abec039b6ce704393f569e9d082ae2eb7d27 SHA512 aa04477c02bca7b841d6723d34c66202bcc9f4e32eb8bd8d822d7544db4faed3c54601d63414d0318c9f60cf7a8597a492df974514b3aa46ddc96c954c0468d6
+EBUILD libcec-4.0.4-r1.ebuild 2039 BLAKE2B 33a7e385a5a123d4c910273f6f7377874dccab0d0714b3e01a161c04ddc3dabdac7eac37d62414a749fa6867680490ad5cbeb3058509fae56455b2eb2fb8eba5 SHA512 f7cb3b763ed3579000e1ae6c968e8f449a28f549aad293f3b7f71e8e2c59c81e81e8e8abd2dc34bb6b2076c923bddb9fa981b30f4e03e010b450eef2a7983250
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 949084865bd2..3b6b60f5de21 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 1334d7d4480a..f425af9664cd 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,7 +1,9 @@
 DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
 DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
 DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
+DIST libcharon-4.3.0.tar.gz 145484 BLAKE2B cbb0edca76921c32b69809dfa8e07c07baedba90ff3c8f2ad5128cc1efa60e34f0f96c1936567825f7e876d298ef1ed4c10d0058f5b3697f87c412891654fabb SHA512 77ed18fbd11c008659a02419250647c9c977a57772d648f4af353c637224ba586006665e60e7fa2394b9f8cf53359a6211b936b5920ccc379754a743dbf2416f
 EBUILD libcharon-3.4.1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
 EBUILD libcharon-3.6.0-r1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
 EBUILD libcharon-4.2.0.ebuild 573 BLAKE2B 7eb27b3193128396696421ef953f0cdabb7d72bb24088e0757eab0c640c95037581bb6782e9e4003cafcdd9d2bf9b2d84dc022f312903b998506231a3bdbd5e4 SHA512 d155e903cbc2a1f1ab0b3b22e181760e69b22763f212fb4ae93d07c6841bf8d514bdb2602f078b35c62712a5ec0d8a060d56bc4df52a09d978dd6d5710ffe3ad
+EBUILD libcharon-4.3.0.ebuild 799 BLAKE2B dddbe5968e56e2d0756c0c9093bb21fdea754d0501a52fc48119f3770f23ba54bc5c1f88f272e80fedd390d0f93685bb6dcbeafb184523396e56900c9767f8c8 SHA512 d1d40b0eced84ee8eeb3b0531f91b3f033c9ac9abd4389f520bf306ffc35cea94518b14cd21e5757ce9d3bac18ee87013cbd47a38e72b31acf837ecaa14ea31f
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-4.3.0.ebuild b/dev-libs/libcharon/libcharon-4.3.0.ebuild
new file mode 100644
index 000000000000..19d4856e4353
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# Use current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 70dcb4de1264..f88141b76c1b 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,5 @@
 DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
+DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
 EBUILD libclc-0.2.0_pre20190313.ebuild 1888 BLAKE2B 0b53eb6d84dddad0e37cde71f16750105fbd64fa8b1e30e5508789927ac4b2e9f30ae152575dcf63e85e9b9bf69a79de64a6e8b65c79787490224a211c1ad9aa SHA512 bc80152ef6b2fbe8e600f3c57a8607d979c73aa7939bb172905663dc2290feb246fcc7c4ec98cfbc0db11d51359cb43bd57a659f71e9a564e4d76d0d80bb06d9
+EBUILD libclc-0.2.0_pre20191024.ebuild 1583 BLAKE2B cf80a510c31b8021d6e478b29b687e7c37c907a430890da33507b81bfd577c66a835bb3144ec8b4827b7b3dac19c122de97cbbd2e15da902bc12dc0d2d787d06 SHA512 b92a96b7a509ba120cdc75df4cefa45b1c33c762239dc4b939030b03dea395d12a1efa1347cdfba46a491e15c73fcbeb2def7765aae35cf9c16939672021efa8
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
new file mode 100644
index 000000000000..09e0ed6af9b5
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -0,0 +1,65 @@
+# 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,6,7}} )
+
+inherit llvm prefix python-any-r1 toolchain-funcs
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+# libclc subdir of https://github.com/llvm/llvm-project.git
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+BDEPEND="
+	|| (
+		sys-devel/clang:10
+		sys-devel/clang:9
+		sys-devel/clang:8
+		sys-devel/clang:7
+		sys-devel/clang:6
+	)
+	${PYTHON_DEPS}"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify configure.py
+	fi
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
+	use video_cards_r600 && libclc_targets+=("r600--")
+	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
+
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	./configure.py \
+		--with-cxx-compiler="$(tc-getCXX)" \
+		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
+		--prefix="${EPREFIX}/usr" \
+		"${libclc_targets[@]}" || die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 641f578a89c0..61e6422b793c 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -2,5 +2,5 @@ AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b6
 DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
 DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
 EBUILD libdazzle-3.30.2.ebuild 1418 BLAKE2B 17728c31418560be84d81ad57278bbddeaeec59657956a22c548e70861639eff121d4199fc57d321e88f90dbfbc791fb2f9b51104d09a3a44849d34452e52717 SHA512 e81703274d2f3801069553ebcfe5a77f3c4f096741d9ed44ac2f02ce971b6e54c6561a4a0c6bab3a0ca0a44bbb17fd03c1dfa0522a57b8b6220ca0e17ff0af3c
-EBUILD libdazzle-3.32.3.ebuild 1579 BLAKE2B 3e3f9c9319f2ad4869370b848b0adc19ebc8dbbbbad8f74cb55bfb4c69a05878dd47d81a3a997a6a664490625b899acecaafdb706be4585df6cf0354d1beb411 SHA512 7203827c55be6e2226f0ebef71386d1e7436b486e850bd1de67058808031c0466e2a53bbbdb37bcf102673607993b33663b25de460b1301334931bc4488232c4
+EBUILD libdazzle-3.32.3.ebuild 1580 BLAKE2B c075f550bd84ae90ba35da42c629556d6b395f5147c37109c1863d8d908540c722b2ef21782ff71e5183ceb372390a98678dacb4356f67a77ab051a0ba94ae9b SHA512 25e959cc030e506a28d13bd36806e52deecda4ff8d2067edd9b01bc94caa37663b29242f88ee4d57e03ac84b45727817a62821b87aeaa342adbb2261e3f69a96
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
index e982bad9364a..688356df7c4d 100644
--- a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="gtk-doc +introspection test vala"
+IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest
index cd4c0e57a03d..d2bf6b71ed44 100644
--- a/dev-libs/libdivecomputer/Manifest
+++ b/dev-libs/libdivecomputer/Manifest
@@ -1,6 +1,4 @@
-DIST libdivecomputer-0.4.1.tar.gz 481798 BLAKE2B c4e132087f833dabc8504cd2cdacfe2c5fb29c208855d799cbb095a1ac3c75e7562136a5d47a8ff5717fa7241eec2114812c3c854cb950e0260f9111f873ad9d SHA512 a1104981b1820ea93c3b3e389e42996f9199c5a4c37daf16e9577d8fd29b21440521d1ea5f89ec2df2861b582fd2e748d35eb811ad0d484eacce7d13d39bf88f
-DIST libdivecomputer-0.4.2.tar.gz 487401 BLAKE2B fb6abdf8ac4a6bc4ab121dfcf4e898aed65a3ab7e8692c4a9525c46e3f7c890eeeac88d4903d7192752175f7c964fd0135cf1d119ffc2a49d572e4abf72d906f SHA512 590aca350d86d17a889f47238ad46f0a6a1353b5f7ed67c64a9bae303a010ab042e94a73a36c6f05f2d03d10c80b1fae49431ad581b3024db83b81711d5d1048
-EBUILD libdivecomputer-0.4.1.ebuild 1479 BLAKE2B 60fc4c250cf16b8908cf52fbd2141001440f4ab84afa523d2f4520d44cb5fba409b848dcb03c1d6bb50bbe00d97ced46cc91e44eaa1748b0d71b3f987d418278 SHA512 21e604750a37e9e4d2bcf7378c18cefda7b3cfe1adbe467d72ff8f1cb36adc20654b99ffa8491bd8b1ab640c39b1a33dacf1f3590ba9c372ff1c58d90683baec
-EBUILD libdivecomputer-0.4.2.ebuild 1479 BLAKE2B 60fc4c250cf16b8908cf52fbd2141001440f4ab84afa523d2f4520d44cb5fba409b848dcb03c1d6bb50bbe00d97ced46cc91e44eaa1748b0d71b3f987d418278 SHA512 21e604750a37e9e4d2bcf7378c18cefda7b3cfe1adbe467d72ff8f1cb36adc20654b99ffa8491bd8b1ab640c39b1a33dacf1f3590ba9c372ff1c58d90683baec
-EBUILD libdivecomputer-9999.ebuild 1331 BLAKE2B 06c1a47003a8cc9a90cf73a19ca8f30417d147132ff02728d6c739057366ef2deed0a71c2329d5b7f65b38fdefc78a991d6a38b4ec551be2d913349e8054aae9 SHA512 81bd24c8afdf6a51219f31b258ca79acc52a1c95d999597085672ad9130094ecd757e6aa8ef4b824c14654202923d0c83c0793cc4175e90844f8aa0db0fd2b00
-MISC metadata.xml 578 BLAKE2B 8758cfa00c96cf28dc5eea77fa20cbda4b050d9b9f881696dff6a2680bae6cd3d553cb2028a6aa647c967e2b6d6e1b5563d2a648c701acaf6d23ac742bad0e1e SHA512 b468481446a9ae7690fb066d44723f9ed4caa27255220eb4c7ec75b320bdac20578a3dfe6eaf55a8e8bce6bfb47fa6fed314b2c50f672fc502f93060d34af818
+DIST libdivecomputer-0.6.0.tar.gz 680425 BLAKE2B 9ed951c6cdec07929ea7a9d3b842483ea1c88bff0171bfec1ec5a1a1d21a73580f70034856c97397bd21061d01967e14477ffabdf75b10bd6a736820b17e5b7f SHA512 b199d3e7e89fb2f79e4de5b54b086ae5f8b6bc08d02513e903e8fb008c1a453cf4cd4c4b7a94b1f7053ac53cc7b9085193b0ee0682318594c27ac2cb693c9b3f
+EBUILD libdivecomputer-0.6.0.ebuild 747 BLAKE2B cc40bd672524a46c22b3dea373e556547a13637d062c4c3c0be86035da66360f33b69ff7973e613c0808a0d6b3d812093a608510ba89625b03afe31375ac3cd9 SHA512 3450f2d7fa03bfe00b9c04b522d94f10b0767fb0e61be4a01f06b0e30b23b38731bc404c0da1d1e2c07249d69fb4d8efe4284ad5afc925dd1d76b33119d56376
+EBUILD libdivecomputer-9999.ebuild 747 BLAKE2B cc40bd672524a46c22b3dea373e556547a13637d062c4c3c0be86035da66360f33b69ff7973e613c0808a0d6b3d812093a608510ba89625b03afe31375ac3cd9 SHA512 3450f2d7fa03bfe00b9c04b522d94f10b0767fb0e61be4a01f06b0e30b23b38731bc404c0da1d1e2c07249d69fb4d8efe4284ad5afc925dd1d76b33119d56376
+MISC metadata.xml 483 BLAKE2B 530cd37101a8b0f199376c57b83bf1d16098c11d13550a869573d7388125f290c8ab5070685fde6c937a5580d4fdbea6a6d6cb84b08c90875810b4b60f869339 SHA512 d8b8f22b939030536510dc41a6d6ef12b8863c8897e6213dd89076d01018d532f94e85c7b017095723fdcab259e24d2fff17820d212bdf27b57462f501056191
diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
deleted file mode 100644
index 36c4f31c9269..000000000000
--- a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git"
-	GIT_ECLASS="git-2"
-	AUTOTOOLIZE=yes
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit eutils autotools-utils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.divesoftware.org/libdc/releases/${P}.tar.gz"
-fi
-
-DESCRIPTION="Library for communication with dive computers from various manufacturers"
-HOMEPAGE="http://www.divesoftware.org/libdc"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-IUSE="usb +static-libs -tools"
-
-RDEPEND="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if [[ -n ${AUTOTOOLIZE} ]]; then
-		autotools-utils_src_prepare
-	else
-		epatch_user
-	fi
-}
-
-src_configure() {
-	autotools-utils_src_configure
-
-	if ! use tools ; then
-		sed -i 's|examples||' Makefile || die "sed failed"
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use tools ; then
-		einfo "prefixing tools with 'dctool_'"
-		pushd "${D}/usr/bin/"
-		for file in * ; do
-			mv "${file}" "dctool_${file}" || die "prefixing tools failed"
-		done
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if use tools ; then
-		elog "The 'tools' USE flag has been enabled,"
-		elog "to avoid file collisions, all ${PN}"
-		elog "related tools have been prefixed with 'dctool_'"
-	fi
-}
diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild
deleted file mode 100644
index 36c4f31c9269..000000000000
--- a/dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git"
-	GIT_ECLASS="git-2"
-	AUTOTOOLIZE=yes
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit eutils autotools-utils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.divesoftware.org/libdc/releases/${P}.tar.gz"
-fi
-
-DESCRIPTION="Library for communication with dive computers from various manufacturers"
-HOMEPAGE="http://www.divesoftware.org/libdc"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-IUSE="usb +static-libs -tools"
-
-RDEPEND="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if [[ -n ${AUTOTOOLIZE} ]]; then
-		autotools-utils_src_prepare
-	else
-		epatch_user
-	fi
-}
-
-src_configure() {
-	autotools-utils_src_configure
-
-	if ! use tools ; then
-		sed -i 's|examples||' Makefile || die "sed failed"
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use tools ; then
-		einfo "prefixing tools with 'dctool_'"
-		pushd "${D}/usr/bin/"
-		for file in * ; do
-			mv "${file}" "dctool_${file}" || die "prefixing tools failed"
-		done
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if use tools ; then
-		elog "The 'tools' USE flag has been enabled,"
-		elog "to avoid file collisions, all ${PN}"
-		elog "related tools have been prefixed with 'dctool_'"
-	fi
-}
diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild
new file mode 100644
index 000000000000..0facf2467857
--- /dev/null
+++ b/dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/libdivecomputer/libdivecomputer"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.libdivecomputer.org/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library for communication with dive computers from various manufacturers."
+HOMEPAGE="https://www.libdivecomputer.org"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+IUSE="bluetooth"
+
+RDEPEND="virtual/libusb:1
+	bluetooth? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ -v EGIT_REPO_URI ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with bluetooth bluez)
+}
diff --git a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
index 05e2cc29858a..0facf2467857 100644
--- a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
+++ b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
@@ -1,62 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git"
-	GIT_ECLASS="git-2"
-	AUTOTOOLS_AUTORECONF=1
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/libdivecomputer/libdivecomputer"
+	inherit autotools git-r3
 else
+	SRC_URI="https://www.libdivecomputer.org/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit eutils autotools-utils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.divesoftware.org/libdc/releases/${P}.tar.gz"
-fi
-
-DESCRIPTION="Library for communication with dive computers from various manufacturers"
-HOMEPAGE="http://www.divesoftware.org/libdc"
+DESCRIPTION="Library for communication with dive computers from various manufacturers."
+HOMEPAGE="https://www.libdivecomputer.org"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-IUSE="usb +static-libs -tools"
+IUSE="bluetooth"
 
-RDEPEND="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="virtual/libusb:1
+	bluetooth? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	autotools-utils_src_configure
-
-	if ! use tools ; then
-		sed -i 's|examples||' Makefile || die "sed failed"
-	fi
+src_prepare() {
+	default
+	[[ -v EGIT_REPO_URI ]] && eautoreconf
 }
 
-src_install() {
-	autotools-utils_src_install
-
-	if use tools ; then
-		einfo "prefixing tools with 'dctool_'"
-		pushd "${D}/usr/bin/"
-		for file in * ; do
-			mv "${file}" "dctool_${file}" || die "prefixing tools failed"
-		done
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if use tools ; then
-		elog "The 'tools' USE flag has been enabled,"
-		elog "to avoid file collisions, all ${PN}"
-		elog "related tools have been prefixed with 'dctool_'"
-	fi
+src_configure() {
+	econf $(use_with bluetooth bluez)
 }
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index 93908aedd958..f4838fd208b4 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -12,7 +12,4 @@
 	<longdescription lang="en">
 		Library for communication with dive computers from various manufacturers.
 	</longdescription>
-	<use>
-		<flag name="tools">Install tools that can be used to test the library.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 3050b6eb77fd..8de94b5f7ed0 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -6,6 +6,6 @@ DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01
 DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
 EBUILD libev-4.23.ebuild 1076 BLAKE2B ccb46133baf1abbfbe8999d6763201819ecd0ba91d2035cd837c059eb2f575d851b1093d83bb951c74f29a50e1c82f563d583f6ff3991a323b6f1e9932602ed8 SHA512 1e001c0b698429b355e0c4e783676edb4a3215a9c184ea423e6d91b637132c42d5839a7422300fa064d4b88f057948937fcf1b65648ba6dc763425505eb2e9f7
 EBUILD libev-4.24.ebuild 1093 BLAKE2B 70318df4f7926477dff4822bf6a53b6769a70d093eadf8eea12264bb5f7bfdece5c4846b62b5fdc86b332590ac3902029fdd12ae69968af2eb789d210bb7f9fe SHA512 0071e46906d078048052970e511285c95343f141ad1f871e52a5b329990caa3ae731dd321562851137f54d274235c665e1c39f00df791f1110bbc4f85d51159a
-EBUILD libev-4.25.ebuild 1132 BLAKE2B cfcce90535e6733771720d7f1ccf2d5341bbf4a03e462f0ec2244e8e1dbd4aab359b5ae4dddb30ae640a02db6df0730aceb378975c85eacb64c480d65c3aec7a SHA512 bfa43a4607d538a999e0b291f3072f7f1c191f4517db3d040d3f57d714217b9d60b15e9568e97b1b4e753ba4bf45059b648446a973dbbbeedffb34344e602feb
+EBUILD libev-4.25.ebuild 1124 BLAKE2B 287e487fcdd92c3a1c0a867a99b7e8499e9515d709349cd6674030400fad46e8963b969d37a570a0b8d2f3bb3ccd23da71b478311125147a3d7a46417d8e309d SHA512 114717b614ec4557d4e53e5fd353c2ffb9589a127ad63e990997c6516f4765964af6e0b4aef264c8eed18c4e437edd8d86c87439cb3772bce6de80684783c2f1
 EBUILD libev-4.27.ebuild 1139 BLAKE2B 0b8c753c1f77f9a3e7b1486efdcd499031a8444d7c41903e5a04fd58fff1160ab8b29640ace1785fe2b7a3c2ab1f9a50ffff682e04702a1b545274551f36e7e7 SHA512 acdc3bd84f41ed391df8e9f6f5d676fe8ff009b0a897820d403714dcf0983caf8d6374897cec644a65b256c946aa4ebb8f7dd488cc063fde470af07725152b80
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
index 8c1307b5ea95..2480cdb45c60 100644
--- a/dev-libs/libev/libev-4.25.ebuild
+++ b/dev-libs/libev/libev-4.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index fd7857ab6e02..7450301bf2a6 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 EBUILD libevent-2.1.11.ebuild 1658 BLAKE2B 254f8add1a9bdef775072433e2d14e5affb753f5232ec950cc45fa09d9ed7f24a74f71e46a10742fc6488bff01b109cb383a6a1ff22f9819c71e70a5e41f44b4 SHA512 ba9205268ddaf9d5ff35009fb6690d589c9625fb76039be0ff782a4a681d9c379c803390eed04923f89f726d508b19c89fde2e52690d9556c8288c7feabb4ee9
-EBUILD libevent-2.1.8.ebuild 1681 BLAKE2B 58875a32ef92c8de91f1bea410793118ee7a0f01ffbee2ffc10f522ec8c29799d6840ec41f8f9a0a3b518cc2f71c0a56ce1ad250c3ca5e24096cd343acfdbcbe SHA512 3a7c7e5c130da1144e7760d3295f094ac7396d16dc6214626852d54b3fee45e2b8eac178ca4d4227a930c4b14b698800e248d71546bad2351860c8e01ae9c48b
+EBUILD libevent-2.1.8.ebuild 1630 BLAKE2B e1b3f696f4dcdc378d63f5c90a1a0ef89aba84c4f6cdf7090c32c301e1467088cff61129cad6f147855e31783eb505fc46597632f00c8e8af633a961d67bed72 SHA512 6470eae8528b9dcb7f64e7c03d9d8108a435da77cdd4c450ccfbd3651c288bccc09b66f6b81c33e4f4cc97dc59aaf7a81ca26bb694e66516892235b2fdb467af
 EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
 EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index 95b9917355c9..85d47d58908c 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils multilib-minimal
+inherit eutils multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
@@ -31,11 +31,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 S=${WORKDIR}/${P}-stable
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
 	# fix out-of-source builds
 	mkdir -p test || die
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index bc50789259f0..ca209dd56de6 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f5826524659
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-compat-3.2.1-r3.ebuild 1619 BLAKE2B 34e94e79583b9b5398eae3a7bff5e8029b1ada7397d7ccdae12db3f24abc87cfb1bbeafad88481df8ef0e39421ce72087eb0ec53706b8fb56ff6e01d369a2875 SHA512 ef9b16a52e35f9c65c7fec307ac13eb51f8b35cbd07c084ee6a22786aaa5e148973d4ccfa34ac95963578e52a19d2b663ee36590f7101a96573fe8a5da9e997e
+EBUILD libffi-compat-3.2.1-r3.ebuild 1617 BLAKE2B ea2bb90bb51b833dc1fb743f800cb44265fb4707d419e5ad71dd221c2bbcf12acd6b57df08742bf8fb62ef8b9b9f530e5d3212393de31259e128fa30f14ec2fc SHA512 4230d44ddea461a5fc8243fb1626b1514f13506391bccd88e6a0a7581dabc9bf63abdfe12ea0285bcf96132be266d735f270573498daf90420699662c0c3993e
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 7604ac448291..7a2f341bd1cf 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel test"
 
 RDEPEND="!dev-libs/libffi:0/0" # conflicts on libffi.so.6
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 03e7567704b9..0ea36920fc8c 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,9 +10,11 @@ AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
+DIST libffi-3.3-rc1.tar.gz 1122483 BLAKE2B c849f3c20bfb899f6659303bc739e894b842a3e0d85138a73915eafb8b2fe25b8d491f7eb023c735a9acd83933a9aa6cec562ca035513d774f5754c22a786fea SHA512 e1421d1bff8b71433dc06f6397f2f47894180b4f85e0a80b465b3a3edb904921e74be19d8ea15ef40f13275050e4b2c1432b6059372127c74560a4c73f18e18f
 EBUILD libffi-3.2.1-r1.ebuild 2247 BLAKE2B af3fe29f0a3bed8dc2796651bee68f94133f1a3e7aebeab9fed8f2ab1e956e678e36dc746e5e19cb60707e0b8cc122a82c45229750b2b628a39c8d7665605fec SHA512 3d4f77b9d81d6963b34aed7a2677825187f811a49f0189114bdc94b358860913268dce3cbc27b9b4f862a23f18b226610f0c74c0d0ac54c1d3cac491b5dd89ac
 EBUILD libffi-3.2.1-r2.ebuild 2306 BLAKE2B 2aab5739ecccb926509487d44c113df73113f393c37ad55ab546b43172767ee93bf4e8d927831dc5d5ee406b4674cb73ca0a6b4503bf5190327cac9f2e2f42e7 SHA512 5f531fa8a5231a653e7a6dc1037cb6c3c37b7961a175d3ac3b346ac68f6030e266f1d8745e2ca29600965b03691146a545862a73ad59d189d5120509cc28278c
 EBUILD libffi-3.2.1-r3.ebuild 2358 BLAKE2B d9b06232210d47d8f46ec3d5ccecef1c01bdc434df74a521500dadb6879eb091c9954cff2277035676503318d50a8e30eb0d7626f1a1f2b0fa2f62a68646fb8f SHA512 6f05734cc0fdbdb82b869847c248aaae89aadd97f1aad87356002e020cf52464d0db311fdc37bebea8aa15aa4ccd3fa5c5017cabd1f6e18af06a7e49642f3ae1
 EBUILD libffi-3.2.1.ebuild 1946 BLAKE2B 064f5d08503166205bd4f7b655e36611703055e7b5a7e0313a406ffff6f20ca17f8ead0c5c4276e05b23cf6e73cd050b7953a2b279001359c96b30a106a7c5c1 SHA512 55c6e14e2a5ae1b9f1b2e3645fc8d4ddfa590b62d4fc1ad64b01de069e5c0b8bafedfdf3568239899141a20dbe3d87990f9890af9372b81f96c439e2141f3ef0
-EBUILD libffi-3.3_rc0.ebuild 2080 BLAKE2B 507e6e8f94ab4c3c21d268e699d1d7bf6c6203c2c66a36954f0b5e18fa85f79cf021b924d75206fe4aa748e2880ed27ad2c9c883eda7340541453cbc5de69f9a SHA512 0303f61e1a8a633b76dec8e61ee09508019eab8a48b8b4e55096bf53136584c370958e6016e6d3b6442f958bf3ec5824ae1473d1e6ae2fc68eef08ac8fdb962e
+EBUILD libffi-3.3_rc0.ebuild 2019 BLAKE2B 7f49078d36f4590c9aca7aa8a4b2c9b32a0f2504df9bc95ac8e7721b98123c081147e65efd05a33eae30bc34cdc47af5e0a37b4532b78b946f4724848a4a6a54 SHA512 48aca67191e74b74295be91611708c264479c976ca575c0b6948750264753486a4d917b343056b667359cf0bdd5d9b6ab30aa1ff893b7d6c34fba581b2234a0b
+EBUILD libffi-3.3_rc1.ebuild 1978 BLAKE2B 207a1164b7297f07a35744670b4fc1d237a81f0bf695012b769077ee0f9bf07349fcf8b18072e4b0e5a9a13bd10dbe00eef3b3d2598ffe1edbcc9aa204aa1399 SHA512 0cecab97db7b2e6f7d9d35f57043899c4403e30d0ab2707c2b5f44afe51f440bf544c2f5c4b90aab9381e2021b82e35baa8c4ae98dee502b6ddbcc70733659c3
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index ab6318f48edf..2033740cda01 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND=""
@@ -56,10 +56,6 @@ multilib_src_configure() {
 		$(use_enable debug)
 }
 
-multilib_src_test() {
-	emake check RUNTESTFLAGS='-a -v'
-}
-
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 	einstalldocs
diff --git a/dev-libs/libffi/libffi-3.3_rc1.ebuild b/dev-libs/libffi/libffi-3.3_rc1.ebuild
new file mode 100644
index 000000000000..f926011c2803
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 5ab970380b96..58556ae7511b 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,4 +1,5 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
+AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.15.1.ebuild 1085 BLAKE2B de263bbdd76de10fdc6a03cb8056b7b13f8b096e807d2f87f0722b0f7c12d8f3cb473e4bd43db58a111df8b788e5f23722197a5d56a88435ca7f69afaf74b538 SHA512 1952e0590d6e30a4cd146ff82fb35ef9cd7a9618ae58de3df620cfa56d4a1b810ebaca87fe1f836c598db867e294c61900d02d877c482d852c3a4b7fa99ce94d
+EBUILD libgaminggear-0.15.1.ebuild 1144 BLAKE2B 9453c0e334dfe1490bb1e7b8c846d8acabc05ca8031e8c074f85d63f27f8e37e2e9619ff936ed2f04a505b0404d198e8fe15249f953d90f36c74dc3320459635 SHA512 58a98f5c998021f966b09718cfdddd2fd9acaea368c51edcc341953eef2f730af2bfa451a896424778396ac81fcc207da3ae4c72d7b7f041d02e4a0706fb9f51
 MISC metadata.xml 334 BLAKE2B 245d055909acec999e4e5e299ed9832df4ea83e59c8b02b464f8bd6da255ad713666d6db088f89014b5d006ca5171723fbef98d5daf19ac34088f2b58f44aa5c SHA512 f820f9ab3cd47f39e43ee66b01244397d9cf8f3da675208e1b26d97e908a037a9ee61a7c25d05b4e071a9a666b04aa46a641e49dbf93b55fe02f7ffe08b033b4
diff --git a/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch b/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch
new file mode 100644
index 000000000000..1afc05c0dbec
--- /dev/null
+++ b/dev-libs/libgaminggear/files/libgaminggear-0.15.1-cmake-3.13.patch
@@ -0,0 +1,25 @@
+From eb4ef0dcfcb4b9325f2cc520445b03f2b63c3b6d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 31 Oct 2019 00:28:39 +0100
+Subject: [PATCH] Fix build with >=cmake-3.13
+
+https://aur.archlinux.org/packages/libgaminggear/
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36b5f93..3b02457 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,6 +75,7 @@ INCLUDE_DIRECTORIES(
+   ${GTK_INCLUDE_DIRS}
+   ${M_INCLUDE_DIR}
+   ${NOTIFY_INCLUDE_DIRS}
++  /usr/include/harfbuzz
+ )
+ 
+ ADD_SUBDIRECTORY(configuration)
+-- 
+2.24.0.rc1
+
diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
index 4e350d095d8c..5a1347b66e79 100644
--- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	virtual/libgudev
+	dev-libs/libgudev
+	media-libs/harfbuzz
 "
 BDEPEND="
 	dev-util/glib-utils
@@ -35,6 +36,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-doc.patch
+	"${FILESDIR}"/${P}-cmake-3.13.patch
 )
 
 # Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index cb34a8f4fd2a..c703bd7b9569 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,5 +6,5 @@ DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02ad
 EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
 EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
 EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
-EBUILD libgcrypt-1.8.5.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
+EBUILD libgcrypt-1.8.5.ebuild 2290 BLAKE2B 5b30e13295593ebc9a866f1cef12dcb11e56429f067311e07bc616f14f7fb412f3d58b36d4b5fa03b678d00e3913f12739be3b19f4115f66dae1db5134f645cf SHA512 da7094afa0bcaf653427ee91e8ae6806c8008573dd15e66db1afeaa5937815692f2c6955cc814c90fc8a95752868883e89c3042fba033ae93aa1276e01d4220a
 MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 778b99687913..22a611ebfeec 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 6307642a3058..023fe39bff48 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 1114 BLAKE2B 31a649c775c10b05f8868d9a40de1b4e4b8674fed25a2cd40d429a2db50c83c98c050e3b2704c73cb99a3ef96a56eac78f99f0643228e70a38bdbdc5e467f724 SHA512 084c10c2107744cc2a425eed499523318bda4417c84e8e42fa8296d2cf027cb640ade870bb86304067ff954da28d5e5ea72eb92084da1314e7f520e98dc4bb1a
+EBUILD libgudev-232.ebuild 1116 BLAKE2B dde5fc1388a6ba70b7bcc91963608042a7097305567d74f5a828de04f1e8825ae5d425590a1e3ff1f8cfe3762bff4478a749d4f11c6a45036db46da2e78d90cb SHA512 33b4d6a6bb030640cafadc6aa3a4a3fa8f3c58d754724b48e0ea070e0b31e54093ee1a48b669d3a939317e774cfcf3d0d34df001b83f0ea373c9e7296532992d
+EBUILD libgudev-233-r1.ebuild 1117 BLAKE2B 6ac3e152df633e0dbf31e2ffe8a8608c498b00c3872b17258e8f764bad110906c2f3919bb33834a3e0f3ab5107a69fa78d34ef1ea2a0e30b5eaece874176dcd1 SHA512 cab0e376acd7ad7a030fa2d3619477d7ba0b74a288799675211a215c8d08534d627b4ec3191b5eb4c91f169a118ee023ffd0d51d5fbc575054c6ab7ac978a715
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
index 600d6061721e..73f6bb32f5b5 100644
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ b/dev-libs/libgudev/libgudev-232.ebuild
@@ -15,7 +15,7 @@ IUSE="introspection static-libs"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild
index 0418a5ea6276..0798be876fe9 100644
--- a/dev-libs/libgudev/libgudev-233.ebuild
+++ b/dev-libs/libgudev/libgudev-233-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="introspection static-libs"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 2c3084310cb2..f05e94c12a01 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -2,5 +2,5 @@ AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5
 AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde
 AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb
 DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
-EBUILD libhid-0.2.16-r4.ebuild 1204 BLAKE2B a343e37a99d08a223df900bd2442ec693473b5059be4c097d092532910dcda944650f07daf58d048e84fda4025b4a4b9acbc941ba682ac490ba346bd8dfb9e40 SHA512 6ea1d3c6d7b505502f4032d4e15fbead19da7521495efd7f2f89c0c2a05a3da4657de546238c699cf88777e8236f982df22f70bc5c07fc8dbeb1f389473c5151
+EBUILD libhid-0.2.16-r4.ebuild 1248 BLAKE2B 4747606716b55f804658147a08b58d4bfa4920886d40e550a5ca205f1d5eb5025609113486b66b0e3701578f39ba14b0ff53fc12e31c7d292164940223ed0a1c SHA512 a03b9f7036baa794c6a5bf9635a954a4eaf6d08b4eed218a8b84a12826b84784a7aea97f577fe299a05df067818eaf01bba744caf56675bd3dcc166f7ee66788
 MISC metadata.xml 495 BLAKE2B 1cf63c758e96eaeb6195814d8f568f80016982d94561737c3077637165c4fe5f791ca88d45374f95e0208aaca523f77e887e5c99b5839c8c8ce34573febe5987 SHA512 e465b7596e61565aa21ce9c32d7d76b099ee21c471c341677604f5816f2b7547c57f8a065f2bb9df2356c3e6d5fd26efb303884117096e8178127490a14ca268
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
index 473d2bf3bf41..e979176c107f 100644
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
-HOMEPAGE="http://libhid.alioth.debian.org/"
-SRC_URI="http://beta.magicaltux.net/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,11 +18,13 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	virtual/libusb:0
 "
+
 DEPEND="
 	${RDEPEND}
 	doc? ( app-doc/doxygen )
 	python? ( dev-lang/swig )
 "
+
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 1e169a48f238..20eea7160d9e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
 EBUILD libical-3.0.5.ebuild 2063 BLAKE2B de5f7497391cd3be77755b00b034ea61d584cc68c7ac10f6270d14387a237b753f0ca8eceb2fde5ef9e6d1fb5b2fb479dcf0770f37b8959f6e094fb53f16ff00 SHA512 7fc2aef6bb07ecacccf61471b7f3ba429b11d2026cadec9e531ab70fc40bf1a6843b214002f52a5e8295258613b6c5bb21ee7816a1f8cf2df6fc269fada0131b
-EBUILD libical-3.0.6.ebuild 2291 BLAKE2B 7b7d18118a84ca73d7280c8efcadabf4f9ba5cb0e8afed4e07f8b72c2817c774013ba5cb98a8e044b87d2b113bcffa2c79d3f7329784843c926d9e5785e027bc SHA512 75fa075af5f10bc756c5972e04fb8dcb09a6d7b22ca61948ac0769708cda020aca40d2aefa8dc5d57531460cf90074a674ef6e2be0a1ef6c3b0d85af7474b82e
+EBUILD libical-3.0.6.ebuild 2285 BLAKE2B 4398e1640e6b1619d812fdf520113cdb9c676fa6041e478f33a6351e940d9aa8fcd98d62f12f9201d9e04fdf5bf9355c5e85fe93039c99bb4526c44ba5c2386a SHA512 bae6aa954d4735ee357567ea3e1e3a7037bb1bd8e378c3361d2752a1de3a723cbf09c14773ca5af3b1e891f87411f5123fb86c3cfffaefefb46c4a7e8d58fc0b
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index d54602970273..2c44b3a5d404 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7155c5d1fb15..0597b91a8497 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,7 @@
 DIST libinput-1.14.1.tar.xz 564412 BLAKE2B 185cede0e5d74dc27f544996aa003d50556ef50f432c73a45a1cffeac921ecc0a5c5c82158292bcd18a692d745fed552545e5ab60bcc29fb1451529cbdc7a57e SHA512 8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c
+DIST libinput-1.14.2.tar.xz 566976 BLAKE2B 498b7032122b2d757e691663bde9ca0025af92d33a5e4b03bf9ce87ec8a4d4c47fe07939583d7450626208ca761efde2de14a327e0fcd794699cc9b72b928e79 SHA512 932949a78bf95a7a05f50170cfc7dc109c99e1e3e70e63797566c0c3a3003632cad56e9b9ca2a180880f5e2ec1060613066d068b384096f37785fe70ac30c1eb
+DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
 EBUILD libinput-1.14.1.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
+EBUILD libinput-1.14.2.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
+EBUILD libinput-1.14.3.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.2.ebuild b/dev-libs/libinput/libinput-1.14.2.ebuild
new file mode 100644
index 000000000000..c6c5651aad46
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.14.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
new file mode 100644
index 000000000000..c6c5651aad46
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libmaa/Manifest b/dev-libs/libmaa/Manifest
index 4449f6299ab2..ce1d585c802a 100644
--- a/dev-libs/libmaa/Manifest
+++ b/dev-libs/libmaa/Manifest
@@ -1,3 +1,3 @@
 DIST libmaa-1.3.2.tar.gz 287198 BLAKE2B 62432f7f21e353c68a0e9b8f843a5a5acafba5c0cc8e745b07596d7dcaaf9adf723342474b95895fbe1cf003d87d856892ea52196808937b4befdc50ce6d0155 SHA512 dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176
-EBUILD libmaa-1.3.2.ebuild 471 BLAKE2B ffb388dbde73a49dd3eb14f57da330e2145b750ec23857368ac1d882a912e768071d12fda2412360889d95d971b5e41a602230bb5194161700ec632cfd4bfc0b SHA512 45484d5f0d42384c3ca526e2a3e5fd4ebd1b3db203831d63853cd5586374d6752efdb68187b91b2b27b9452a6f463af9064b406a90fca0b7e8a044b8aac4036a
+EBUILD libmaa-1.3.2.ebuild 578 BLAKE2B 836aa13a6f522e96f705ab137ee33a21d8cfb2b14b4880ed35cc3bcbfce97b26fa9cc863af874ba0250ec8669b90b68e969f884604837e42673e664fee469937 SHA512 9b13b915cdfbac1a2b11935c7133edfe58aa751c135adb0362b2a119a742a64c8dd5c7b9a7edad90edc8b038a677e9c52fe40e1593df6877fdcac67a344cf4d7
 MISC metadata.xml 786 BLAKE2B 45e7e06a21ffbabe58b1b85578d99ccf57ae8e312bb0412237382c0afa8aab9a621fad3bf9f767f9a42de741c144c6c55901da6d3c52f80d5b1d20ad0d461c0f SHA512 b3fd174acf49685a7fa9a3a99f9281b6ed03779223984dcbb8237a2da2c738b132e3cbecdf57c0c7b31581c2ca18d0c08e8bbe322cc01a7b41f8345301f1e729
diff --git a/dev-libs/libmaa/libmaa-1.3.2.ebuild b/dev-libs/libmaa/libmaa-1.3.2.ebuild
index 52d04eeae6c5..e1c047b6af42 100644
--- a/dev-libs/libmaa/libmaa-1.3.2.ebuild
+++ b/dev-libs/libmaa/libmaa-1.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Library with low-level data structures which are helpful for writing compilers"
 HOMEPAGE="http://www.dict.org/"
@@ -10,6 +10,11 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-DOCS="ChangeLog NEWS README doc/libmaa.600dpi.ps"
+src_install() {
+	default
+	dodoc doc/libmaa.600dpi.ps
+
+	# don't want static or libtool archives, #401935
+	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
new file mode 100644
index 000000000000..58d8e39f150a
--- /dev/null
+++ b/dev-libs/libmanette/Manifest
@@ -0,0 +1,4 @@
+AUX 0.2.3-optional-introspection-vapi.patch 2854 BLAKE2B 3e5499fc4cc28a926489c1a7b23f3dc5538c379982774328fa3168f0c49911e082502fded751e6f14b13f66c6003385ae4f79d7806a6f3f3355bc3d52fb61f3a SHA512 91c39c5ccfc87bfd484e93125112c12ec00aa191d748e2915ee06de19800d67e5d414650abb631a22e6ae3437a4dd3108aae9fc626fd8879d534ee3e790cd311
+DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6
+EBUILD libmanette-0.2.3.ebuild 967 BLAKE2B 3483687df5f2f0e6e90d89168adf644ce0f4d1ec82cabacf52cc7b93f12135bb1251b0832ed05b4a7caccbe5761b8152ccbd19828fc04a4661b81347bbd596ec SHA512 71e5b0d0cd28ec56705f2fd17cb1bfe4d3d86695f5508efeecfee72e716f60dabc9ec98a85dc7ef7b8bfb8f2b680847e263774de806633efba2709281de714be
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch b/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
new file mode 100644
index 000000000000..15558b47be3d
--- /dev/null
+++ b/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
@@ -0,0 +1,114 @@
+From b561bd29d8797ae2e72d45df8fc122164fc88b6c Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 20 Oct 2019 14:57:43 +0300
+Subject: [PATCH] build: Support disabling introspection and vapi generation
+
+---
+ meson_options.txt | 14 +++++++++++
+ src/meson.build   | 64 ++++++++++++++++++++++++++---------------------
+ 2 files changed, 49 insertions(+), 29 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index a7ce738..c794d4b 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,3 +4,17 @@ option (
+   description: 'Find devices via udev',
+   value: 'auto'
+ )
++
++option (
++  'introspection',
++  type: 'boolean',
++  description: 'Generate introspection data (requires gobject-introspection)',
++  value: true
++)
++
++option (
++  'vapi',
++  type: 'boolean',
++  description: 'Generate vapi data (requires vapigen and introspection option)',
++  value: true
++)
+diff --git a/src/meson.build b/src/meson.build
+index 7ac916b..50cad92 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -90,39 +90,45 @@ if gudev.found()
+   libmanette_gir_includes += [ 'GUdev-1.0' ]
+ endif
+ 
+-libmanette_gir = gnome.generate_gir(
+-  libmanette_lib,
+-  extra_args: libmanette_gir_args,
+-  export_packages: libmanette_module,
+-  sources: libmanette_headers + libmanette_sources,
+-  nsversion: api_version,
+-  namespace: 'Manette',
+-  identifier_prefix: 'Manette',
+-  includes: libmanette_gir_includes,
+-  header: libmanette_main_header,
+-  install: true,
+-  symbol_prefix: 'manette',
+-)
+-
+-libmanette_vapi_packages = [
+-  'gobject-2.0',
+-  'gio-2.0',
+-]
+-
+-if gudev.found()
+-  libmanette_vapi_packages += [ 'gudev-1.0' ]
++built_girs = []
++if get_option('introspection')
++  libmanette_gir = gnome.generate_gir(
++    libmanette_lib,
++    extra_args: libmanette_gir_args,
++    export_packages: libmanette_module,
++    sources: libmanette_headers + libmanette_sources,
++    nsversion: api_version,
++    namespace: 'Manette',
++    identifier_prefix: 'Manette',
++    includes: libmanette_gir_includes,
++    header: libmanette_main_header,
++    install: true,
++    symbol_prefix: 'manette',
++  )
++  built_girs += [ libmanette_gir ]
++
++  if get_option('vapi')
++    libmanette_vapi_packages = [
++      'gobject-2.0',
++      'gio-2.0',
++    ]
++
++    if gudev.found()
++      libmanette_vapi_packages += [ 'gudev-1.0' ]
++    endif
++
++    gnome.generate_vapi(
++      libmanette_module,
++      install: true,
++      packages: libmanette_vapi_packages,
++      sources: libmanette_gir[0],
++    )
++  endif
+ endif
+ 
+-gnome.generate_vapi(
+-  libmanette_module,
+-  install: true,
+-  packages: libmanette_vapi_packages,
+-  sources: libmanette_gir[0],
+-)
+-
+ libmanette_dep = declare_dependency(
+   link_with: libmanette_lib,
+-  sources: libmanette_gir,
++  sources: built_girs,
+   include_directories: confinc,
+   dependencies: libmanette_deps,
+ )
+-- 
+2.20.1
+
diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild
new file mode 100644
index 000000000000..3221014fc7e6
--- /dev/null
+++ b/dev-libs/libmanette/libmanette-0.2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple GObject game controller library"
+HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="+introspection +udev +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.50:2
+	udev? ( dev-libs/libgudev[introspection?] )
+	dev-libs/libevdev
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${DEPEND}
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/aplazas/libmanette/merge_requests/18
+	"${FILESDIR}"/${PV}-optional-introspection-vapi.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature udev gudev)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/rlottie/metadata.xml b/dev-libs/libmanette/metadata.xml
index 6b0a0fb3a729..39980802b1da 100644
--- a/dev-libs/rlottie/metadata.xml
+++ b/dev-libs/libmanette/metadata.xml
@@ -1,8 +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>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 40bab2866b95..9806b01c57c8 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,4 +1,6 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.3.2.ebuild 556 BLAKE2B 54b2ac32420725354a62ca86c2383f66a51057e9d9c13fe478c66bb1c58784e7e82f3ceb650fa8cccd3d23a7f9ee8fe2b49a8c27693a8239f6ed3b87c567d9c8 SHA512 b73e97483c0877c0fc187eefa5a851b67467056dbf955f001c3df2615e760f0e1f9857e59919dae0eeda280d8e7ed337febf8fe70694d49efcd77eed3b8bc2e7
-EBUILD libmaxminddb-99999.ebuild 534 BLAKE2B 17a96d2066900a4c310b913932bf72ccb410e13ffe150e8044bc9db80bd8af2ad82b9b5d6385b676ba5c723c0219b5001e552ce8a1c52f5529af6d949937aac9 SHA512 74e11c6417593375ae978788fc7b3790d0568229232114e5966505da839f7971ff6b77452a7649f7d430883781f39ab950f9cad4fc255fc84f1b12b8911f55a5
+DIST libmaxminddb-1.4.2.tar.gz 600664 BLAKE2B df78522d2d764f813ca708fdaefeef47f3a97afbb010c108ca4e47ef2d711c445b5ad7d3d059b31ef0e72b08be569050b31f461fc6acf2c17ee4ce43225acbd6 SHA512 bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1
+EBUILD libmaxminddb-1.3.2.ebuild 555 BLAKE2B b6e7f21aaa4740b0e98ca26c3aa62ddf2d2a5798f2f28f678a9ec5a9112d9a459bf768f4cb6b0c3facf0a3f8d8dace5d08da3c806b1765e94bd723a7d396bd46 SHA512 239d357145fc988884281371f1dbe5b7b1f82adaaead4b6ab54bbb68225a16d2789881c203aa956cb44aad5bf44a24e8fecc33a7620c4566611e0014dfcc869d
+EBUILD libmaxminddb-1.4.2.ebuild 593 BLAKE2B 19a07c359071ecbeadeb97a0129ebb74720ab7622bafc83571beb12dab0ee1326cd0eb78d97e1eae1727d3644c89ef6135bf4b72c2df94a450f74e2e549435cd SHA512 1ea29c3bf96f26d00ba3bbb02469bf4ec812431a1f922e74ee42fe2df880ea94ff233c3a010bb0a804e776e65d410b423c971b4c2cd865434e91745c4c1eade5
+EBUILD libmaxminddb-99999.ebuild 566 BLAKE2B 0b79eac4fdb7a49d85faa10074a3fa541521413f83891b3d40a32ad3b3c90f45b240f156f23b2d9bcb0eb709bdb6b2dcc17d975a9ffff94e590f0b3b266efd02 SHA512 4f45005dd929c7646724693227c05652de0b28fd491710ed2b95078738d5cef6f2813676b3886f3bc605d23ebf81db76e2668832d0fd7edf06b2427859f334ba
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 8c941da15298..643f0e3bae5a 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
new file mode 100644
index 000000000000..e33cbb9af17d
--- /dev/null
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.0.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
index 22ef31d40939..0162cffa49fd 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3
 
 DESCRIPTION="C library for the MaxMind DB file format"
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index c76d27d6e0e7..8a82c358e990 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,5 @@
 DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
 DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
 EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
-EBUILD libmirage-3.2.3.ebuild 1162 BLAKE2B 63aa09264c2977d6cec5bec2618bec3954e6417beeabd057a128bb14b6d2d85dbf1cb89473afe64b97be6578148f5b5b158088ccadefd42bf30e0a780f2e79cd SHA512 2ca81b70bd5c8c955b7d45f1eedb594b65af47fb65de82e548e86ec389ed97bf6a514ec327d8c8ad6d92b26668a9e6e33a0546857cd60ac88e77dc1ce0cec99b
+EBUILD libmirage-3.2.3.ebuild 1161 BLAKE2B 3661674fe2968ba2e4257219aa4bd636f16665752c611e8675f2848ed8c4c2fdf434f207b1f80ce928dbf681e4e45b5986ca22721be1a79dd5dc47ead508c1dd SHA512 0c01bf4477189aa681db1b9fa38733cd7eea631aceae3a697ecfb16a2306dda440015e90e471bff04085a49f42a1d0958c0b2ff87e07eb10b26a08fc96a4b5cf
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.3.ebuild b/dev-libs/libmirage/libmirage-3.2.3.ebuild
index 51ba1adcb272..28c1c7527cf0 100644
--- a/dev-libs/libmirage/libmirage-3.2.3.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 6e708ec773f5..0a00becf95af 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -8,5 +8,5 @@ EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc4
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.4.0.ebuild 2407 BLAKE2B 7bb952c54ccaa828e964afae46e02aeafaaef93eb357c09b70f5c56966a11d261f40a402f41668adcd781d5b006e2d971b2325aff594024e71da6d9dacd92677 SHA512 a2a65e942a7f2dd0209a2afae4964af96d0133fe73cb76b8cbc9131e9b8b246b74f05a1869a10c25f0ce539bc7c7bae4bca7ff6639ade62a031245356a1db05c
 EBUILD libnl-3.5.0.ebuild 2412 BLAKE2B 823b9e509a918f65e677233921127990c063e97fd6c8c302e924917428913c2da2de4649daef6a88ebd4d6e3acf3b0c49d905e239f8b5a259d6c07275222ee41 SHA512 b008bbe84e8f5e90f9de71442d8da8998448bdbee8e726f4b9d57e9e5720b35c934da55dfe25748bf39837cce03cd6d23cf26038cb3c4ac111543028019c0cd9
-EBUILD libnl-99999999.ebuild 2191 BLAKE2B c809f82bfa87fb44a6e0447f7f92e9f046027c45ea7780ce0d1c59261f302ad88d83ed4c474e7fde04696ad93b535eeb63f8a794ef5772dd837ee8c478d35a71 SHA512 5714afc5b9651f7de94b9c44723d05c278280b503c7b329ab12c947495ecab7479e34b3e93a001846dd05b3bc89312e5d2b6f69a07697ada101fd5dfd1367920
+EBUILD libnl-99999999.ebuild 2175 BLAKE2B 68c392e976282c0b90ff94d94e7fdfe114f27e5a7f9edb3b799a3963fd3cc4e2e20cfa87ec9bf594dc2ea6e2c6bfa1d5106b361aa2f645eb6b25a5337a05e746 SHA512 ae82c5142e5340ebc5d0f86e959bddc7d22bf953b0134c6c43adfece73b39336106449dd425b2aabe2763b91b9dd2465236044b0d5cea8b1dbce4e1ed487ab3e
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 43eb90b83be5..bb976be45138 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal
+inherit autotools distutils-r1 git-r3 libtool multilib multilib-minimal
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
@@ -84,7 +84,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if multilib_is_native_abi && use python; then
 		# Unset DOCS= since distutils-r1.eclass interferes
@@ -96,5 +96,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index da821071a8d0..2b2f75bbf144 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,9 +1,5 @@
 AUX libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch 697 BLAKE2B b7afbecfa66af17004ca9d8280ef491b08269eee834c3bfead44c1237ff35aeede455514301c31eb46c6cfd6431b68cbaea8cbe6993957e8883dbeb43220c8d8 SHA512 9c30bf1061666ce3659ec1a0ac00a4b5368213e8ebe338fab287740ae08ce1840f0bf80448ec2545e5d1269e25a2223b41bf91ce00d2f7e3c1b64ff6e5231a10
 AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
-DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a3186c0f7a3451883b6572c0dd27427579baf280ac2ae6409d0738bd578f69eaa9debfe50024411c6b0ccad11f5c9 SHA512 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895
-DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
-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.15.ebuild 995 BLAKE2B 137ab8211813d86b3f703a02c97a54271ad9dbfee5c25b8a6f533e4e95536be97e6a3c757ae7c118d760df2fbde836062432e3288d8524d4ec2e94d5c167d5f6 SHA512 663bb695a30871914252932ac9a772c376028b9ecb0e9eefd2bc896bc95b87abc106ccf47ff1b0dabee2943578ad4858838820cff3d350d96529b36cc72e27de
+EBUILD libofx-0.9.15.ebuild 1003 BLAKE2B a665c10d613b4d69fbf71c7c952b6a7e7de11fe368d62389e219dd4157ece94d101e47d7b3c60f93e2ab5fa14945eb2d829b346ae5e297102fe281a6918b7b41 SHA512 3d4d1189a88063b6b52e6b49fec5633727f1edacc5e95ac8d8aa2e56140fe90bf0b0be0b870c307d0d9decb556a7b2d947cac47194be5125285479d8cfc76ab9
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.10.ebuild b/dev-libs/libofx/libofx-0.9.10.ebuild
deleted file mode 100644
index 873562de1519..000000000000
--- a/dev-libs/libofx/libofx-0.9.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library to support the Open Financial eXchange XML format"
-HOMEPAGE="http://libofx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=app-text/opensp-1.5
-	dev-cpp/libxmlpp:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	# Be sure DTD gets installed in correct path after redefining docdir in install
-	sed -i \
-		-e 's:$(DESTDIR)$(docdir):$(DESTDIR)$(LIBOFX_DTD_DIR):' \
-		dtd/Makefile.in || die
-
-	# configure arguments alone don't disable everything
-	sed -e "/^SUBDIRS/s/doc//" -i Makefile.in || die
-}
-
-src_compile() {
-	autotools-utils_src_compile CXXFLAGS+=-std=c++11 #566456
-}
-
-src_install() {
-	autotools-utils_src_install docdir="/usr/share/doc/${PF}"
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL}
-}
diff --git a/dev-libs/libofx/libofx-0.9.14-r1.ebuild b/dev-libs/libofx/libofx-0.9.14-r1.ebuild
deleted file mode 100644
index 7b0ecd9362c7..000000000000
--- a/dev-libs/libofx/libofx-0.9.14-r1.ebuild
+++ /dev/null
@@ -1,63 +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="
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	>app-text/opensp-1.5
-"
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Makefile.am-remove-INSTALL-from-docs.patch"
-)
-
-# 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
-
-	# configure arguments alone don't disable everything
-	sed -e "/^SUBDIRS/s/doc//" -i Makefile.am || die
-
-	append-cxxflags -std=c++14
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
index 5daccd32df70..9e4c2c66d82d 100644
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ b/dev-libs/libofx/libofx-0.9.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs test"
 
 BDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index c1fed6eeb866..5f321173427d 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,4 +1,4 @@
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.14.1.ebuild 1232 BLAKE2B 9ce83461f3537a81c8d885b37b02f0d2d7b9db6d1ac3d89d8998c74f91d6f369790fd0c1d9a3086b96710dadcc129fd2b4375442ad2863335d1a3558276ac15f SHA512 59703cf3d056ed1c69de0f2d4a08067afcc1ea81541d9078d51e6bf270352d348d975420aa488e79f6710e321f7e283d8dab3c559694d6b12d46d39ee5eddfd5
-EBUILD liborcus-9999.ebuild 1235 BLAKE2B 9690fc7b0ae34d59f4fc3b96ddf1e590d101763859503e4097e7b63fc92412a57986e10f1b6f8750725dc8feab001636ac0dc4b44aebf43986fa860fd0617278 SHA512 63cc21fc924c9c599dad935ab51d4754e38ed6307dd21d0e6674c3fd74bd7f6fb623ee91a8778a409f1908ce5d6ee6646ecfd5fdecadc7ccaf4f50c651efabb7
+EBUILD liborcus-0.14.1-r1.ebuild 1241 BLAKE2B eda54e39c6ec27d9a5cd580d7d345d0b9abc99f6173bbc50e684dc18a263608b9569417d58268c54ec3fbb6289d3fbba28710146de8081eb0bef9bef2773e70d SHA512 c212f0a0eba560b736796a1c33ba6ddd16d94bee5325156bd285e005a555e8f9220a933b1a88ba8ff65baa1d5f0ab85511da028d4daa8df2dc2fa13f32a334f1
+EBUILD liborcus-9999.ebuild 1244 BLAKE2B 2a570591cdcc1cfd6ba09cc69ffbb3b9d871b891daddb36c91c36a1453f2f4a07bd5f9e1365c6ce1c14751f4dd62624ef3c3e7650a5bbbf0749ade067d9bdbc7 SHA512 8b1ea73e5181973b5b54b2664b38108b50d5d64c52d8eafc0117898c56bc6a7215c49cca33aead55ec0c2e0fa416020ca631cd554d34dea46f25e26912768bcc
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.14.1.ebuild b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
index 23cb5009d8fa..fee41849ef82 100644
--- a/dev-libs/liborcus/liborcus-0.14.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0/0.14" # based on SONAME of liborcus.so
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
-	dev-libs/boost:=
+	dev-libs/boost:=[zlib(+)]
 	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
 	spreadsheet-model? ( >=dev-libs/libixion-0.14.0:= )
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index ffb340248f38..97a7a49aaa21 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0/0.15" # based on SONAME of liborcus.so
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
-	dev-libs/boost:=
+	dev-libs/boost:=[zlib(+)]
 	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
 	spreadsheet-model? ( >=dev-libs/libixion-0.15.0:= )
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index b656de392567..f77461e0b55b 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,7 @@
+DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beafcb6bc84d99d588a9dc0a957697380d906474f6ac59ab509e6c7ee5a0879b8d6ec9d06a0aceb8b02c7b16f73602d034927dc836 SHA512 4a0e86756cb96e6143df3add6cd6bca4fb9bb8fcb6a4d2df1530847b946b2494132e9842da01d75b385c33555d96e25f1390788b9e41ca320c1d65f31c89b281
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
+EBUILD libpcre2-10.33-r1.ebuild 2508 BLAKE2B 2bda27974d2cf8a1cb407003cd9a07097d3754b5c6fa46415db2f0b6b7e7fbde2ba8743b4c71f4afe7ed21a6ae5f16c08f18d468d8a68850d7f8e45640b42465 SHA512 b39653dc491a8ba9b23bc551f7754a838608c32257056617313942904bc543401fc4dd67e64988cc80c507984f6be31b6d628f4d47730a09e4a0b845fc3604cd
 EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
new file mode 100644
index 000000000000..b19e0e4b8f80
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+
+PATCH_SET="${P}-patchset-1.0.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index b7e8a0ccfbfa..d0f0b5f6b53a 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -7,10 +7,12 @@ DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329
 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bfb991d3956dfc0a5d8d80f80b61df41059e645f9f096185724470e8466a5b7a444a575f5f09d5a0f9eb35ff3ae7e SHA512 460fa390012218262b7c148a28e6ddfc0dc3d669c4bdd37b68bfa6f50a0cb2fb81a277fb46ae0ac22673aae5b5cc4476fe96e56471a6812176bf76e9c5e10838
 DIST libressl-3.0.1.tar.gz 3668819 BLAKE2B 0e0e9db5018f7fd6c5d3f15dd911e375ae51885321fda2a6bef8f56620ca9d8b63d587f5acdf78afafabdd7ee1243c79bdf9b68a890dfc5f76fa45bbaf060563 SHA512 d2d665734d8aab2b998769492cbb1e7fddead52430ef503650c14786196241a6d1137f47b33ddf2037cc1ff13c240283f591dce83ec0da475619679a051d725f
+DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
 EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
 EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
 EBUILD libressl-2.9.2.ebuild 1713 BLAKE2B 7450f36e1dad66cd156bd346401022f6829ae4feacf1b7d680276ae24611bf18a197906564321fef865d4bfa3ed2717e43bc5a6637535ee0df42ecc4bdcad305 SHA512 8dbe7abdf2738a06e72dd60857ea90f3a62488d8603c5d1ee9d330f5603af617a1a8bc6fbc2ca13fbfee363d10274c0ea182705d244838fbff906e991b42f411
 EBUILD libressl-3.0.0.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
 EBUILD libressl-3.0.1.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
+EBUILD libressl-3.0.2.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
new file mode 100644
index 000000000000..65dfe075bbcc
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/47"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index b02152c88f6a..94bd75151684 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -3,7 +3,9 @@ AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e23259
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
+DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
 EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
 EBUILD libsavitar-3.6.0.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
 EBUILD libsavitar-4.2.0.ebuild 954 BLAKE2B b3ff29fa31144f53b361f8353d46dcada694f20e2f629905d4557e607e12fa5b0df5a855943d7b9c8d3f0174c85b03e9470adc36530352f03fdbe21bc25da39a SHA512 4b0e25439a97dfde13afe91b7a9898d6559b5c5b1ef206b3497f85b7a0562763430bd845d07068a9a42011ad927d78f93c3d7ca6d89acaa205e565a3f5731dbf
+EBUILD libsavitar-4.3.0.ebuild 1319 BLAKE2B 2239449007a33f630dc114e61b4e5d6c15f36c6a9e098a15ce67a3316eb209b24b0a35226a019a6a51fe36bfa7181d55ff53799ee965f008a35e40616433a009 SHA512 e4b98654c45af5f6e3fd6173f0a322f4e5cb789774018932525d749ced0a99d7383de24dc9352b48bd2d28096e7976c9b9dadef9503936b35dda7813e27628ca
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
new file mode 100644
index 000000000000..7673c5d7e059
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	dev-python/sip[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 23f5971d3c15..ec461f0f8972 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -1,7 +1,7 @@
 AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286df8153cc3912a7df414ad8328ba4de04cd558e3c7884102d4b431bc3c584a6f0c883a663f681fbf96bf90 SHA512 9c73f4b3eae1af1bd26d4c08eb926847fb7d8f26cb3e472afa940d12b086f5a142e9f918cab1beeebfc45e2893480a185180cc9b4bfe5930bb0cafe6b66098d0
+AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49648c0814535c02b129e49f4d7185edac370f17e58428e180056dce31844a1accfa6503f0ebfde32c53571f0c SHA512 8f064315215fb99d7302b544b7a3da1c239bba21e8ffdc21b0bd05e496bb0ddd54ae5ed55c36b9fc0386026d007f19082d1eee95264edda1a124e9629c5093c9
 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
-EBUILD libspt-1.1-r2.ebuild 740 BLAKE2B 515ea54db749d792a2340498ec075764ad3d79f5c6257b05ae3fe462fd81fc09ec35981a7f03d92ca0e2184b303203cfc5ab4fd76f8da36917a3c8ff2f938b33 SHA512 de6b47b133772e8fd2ac2b237c17296d3ec112cc5ea64515d217bb5f04f1d214d118d79637fd27ca2c71383df6b5964d079ce6a3ea71cb576c568fc61d7cedcc
-EBUILD libspt-1.1-r3.ebuild 872 BLAKE2B 3a749b0fc4afe3a796cd2c512bdd8ec61616e909da187e852a1fecbd129fafe99c6dcc8177b1eea05ced2ba059d2af29c49d942b8398eabe278103e7a77b4e2e SHA512 0f6f502171794eb8c3a983b2549ac0cb3bd0b2fd00abc06f67db292347b53d8a16d25ad67fa5e611105d4da4c7cc7f2efb4cc692b554f564ef0f2e5221e6bbbb
-EBUILD libspt-1.1-r4.ebuild 787 BLAKE2B adf3acd0c3f5f806647194eaf173fde247bd9abde50cff92c6d9b2428aa2c16c97abbbfa13071940e9e8cdfe243627055baf3ac1028b5a3f73b080f359d35948 SHA512 695a9e205985711608c84b0c557c7ee1b1ff58815201396f6470166b3bb806784fa1397b6c436cb48dc4d5e596c4e7e02cb5f513862dfd6dc6de4a295a3cf078
+EBUILD libspt-1.1-r2.ebuild 722 BLAKE2B 6cc6605f6371007890cea96193166233a58de89e6465045f919be3e3d78927c7a483c7fdf9363845b9de884a9d56b732b46ac307aaba3776c15aac56eaa2df72 SHA512 9d5b8c0e54db911d474f461a9a000793afc5867e45677c7d2944f6f752196ee14341c4e8402f29ae86098d1ada364c362886b50607fb9d0e26d99570baa8dba4
+EBUILD libspt-1.1-r4.ebuild 772 BLAKE2B 26baacbe890186df7441fa3b74f7a2a54c1038358ed2c9a7dbc65c76509354fe27e31d9e029e2315a4b7c7421ccf5ec038eea3c49d3fb2af7f57be5f9acd5aa5 SHA512 97eb80fb1a122982cf83233c463d68ec5c5c1990d6ffddc7d65701686b10ad5e1e7bf3e6a7746301c5e7589af92c0ea60b27f1ed2f8f5bb95a7f9bb5e541964b
 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/files/libspt-glibc-2.30.patch b/dev-libs/libspt/files/libspt-glibc-2.30.patch
new file mode 100644
index 000000000000..1ebb9b969b24
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-glibc-2.30.patch
@@ -0,0 +1,12 @@
+--- a/libspt.c
++++ b/libspt.c
+@@ -7,9 +7,6 @@
+ #include <time.h>
+ #include <stdio.h>  /* for perror() */
+ #include <signal.h>
+-#ifdef HAVE_PTY_SVR4
+-#include <sys/stropts.h>
+-#endif
+ 
+ struct spt_handle_tag {
+     connection *pconn;
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index cf5d08f80b28..a2bbec0ed4d9 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,9 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Library for handling root privilege"
-#HOMEPAGE="http://www.j10n.org/libspt/index.html"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.j10n.org/libspt/"
+SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -23,6 +22,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
 	"${FILESDIR}/${PN}-rpc.patch"
 )
 
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
deleted file mode 100644
index 402e4599e1e2..000000000000
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Library for handling root privilege"
-#HOMEPAGE="http://www.j10n.org/libspt/index.html"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+libtirpc suid"
-RESTRICT="test"
-
-RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	libtirpc? ( net-libs/libtirpc )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch"
-	"${FILESDIR}/${PN}-rpc.patch"
-)
-
-src_prepare() {
-	rm aclocal.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with libtirpc)
-}
-
-src_install() {
-	default
-
-	if use suid; then
-		fperms 4755 /usr/libexec/sptagent
-	fi
-}
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index bb37bffe21cf..4679b16bc3ff 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -6,9 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Library for handling root privilege"
-#HOMEPAGE="http://www.j10n.org/libspt/index.html"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.j10n.org/libspt/"
+SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -22,6 +21,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
 	"${FILESDIR}/${PN}-rpc.patch"
 )
 
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 68ff6679eda1..48b79968a9b1 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,4 +1,6 @@
 AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bdfd06cd5684c07fe2a8a466698109dd68c0626615d20636d230858e5a2868dd450b5fabcbb4482e6814a2b3d032bd89f8 SHA512 6a6321955805eb1b80a7dc6baa528a9594f2d37a640e4166839fa9db9d0e2113a64dd33f08682c03a1a840836c76a4e62e384c9cfdd798442ee024ff88c1d8e6
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
+DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
 EBUILD libstrophe-0.9.2.ebuild 982 BLAKE2B d5069f4bd65399c4fb4bfeb3a393cdde866bb1220b90bef7e8049a2a18222eba8f5cee1188e2272a3d868adbc73cb9f5ab11e60f275fe89bafeb748403c74df8 SHA512 fa67f32a81ac19b5a00cc51c53eda54851125831206adbbb2ce9ca8a6ee8c92b12afe70b54aad4a4fb444783df00a66c7a65e01fde1a1f510a64bf65651039bb
+EBUILD libstrophe-0.9.3.ebuild 924 BLAKE2B d6b237fec388f2987de089ff5bf74f36fee76a76dc0387b21e9f771dea7e55c0e0dbb3193224fbae83c308e65c2432c181ca7e4603b465de65eae29cf98ff5e1 SHA512 8ed6bf67e275b2af4b151c3a3fd0a3732d44cacdd4a827173ff0b0d475e8eca7438c1e125820710bd94b90093674e1cba6c7e5ff477c4cb26c7d27b07c2bdce8
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
new file mode 100644
index 000000000000..5323315dc71e
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="|| ( MIT GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc expat libressl"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index f0cff058edc8..e6837bea32f7 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,3 +1,5 @@
 DIST libtsm-3.tar.xz 293264 BLAKE2B 51044f5e7be2269e1b3f40b04aa486f30a3a496d57d3aa64f25b148edb04d8e039dafbe0df32d0557f4c3a21da52bb53be146fe57d84d4e8201289c3bd347d95 SHA512 119834fd6a84489cc7904bf01905c29004901ddf73d6dc4a1f47f6b402ad76f65cb4226eaa718a73dc06694b1524647eff6046894fd9526a8588eed97f6f68b6
+DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
 EBUILD libtsm-3.ebuild 356 BLAKE2B 1c9e1a0808e2dbc01543b0258d1331be845381860775515add11a7b9def7da590ec0e96e2b1e44abdd49c1f722b4a1a239fae6366ba688ed766344fbaa615226 SHA512 b1f5eec9d9b0fcf1eb9e090b700e41d462db9f28ec7d005b22aed699ce1f494b09664b9223d715f4a571f401002337f700d041a529bd8c0b27ca04b48c790f38
+EBUILD libtsm-4.0.1.ebuild 390 BLAKE2B 75ab14ad474fd98720ac271556c0b993eed4852fb98d075798267597ad02ab4fa45f400a0748fa171af2b0805775917ef77736cbd6e39a481d87873fa8d73835 SHA512 f23fb108308c8656229b4391be99da98ece807679d743e8815f6e00806deb9646e610b2a3bd131c0bcdbcb6d112d64b631261ea66ce36136d5c6888bc5cb2b4d
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/dev-libs/libtsm/libtsm-4.0.1.ebuild b/dev-libs/libtsm/libtsm-4.0.1.ebuild
new file mode 100644
index 000000000000..f8bc7744f35c
--- /dev/null
+++ b/dev-libs/libtsm/libtsm-4.0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake-utils
+
+DESCRIPTION="Terminal Emulator State Machine"
+HOMEPAGE="https://github.com/Aetf/libtsm"
+SRC_URI="https://github.com/Aetf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 62bdef866fa7..eea4929a4ba5 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
-EBUILD libusb-1.0.19-r1.ebuild 1552 BLAKE2B 41072916887bb0c3fb6b5a72e25058a8cf590116424d8e7f19fe24163e6527db5e18d71fc73c3957d18b31258b1d4a69dcab5ca28af7e15db13e240c6c56a110 SHA512 7246c56dce55159d30147a83a54ce518531b1842a304bd0d4f6346d0ee4d8ed5d4fcc2f3ead77cc11be3d6e8f7e8f09aa1a4e88a3229b6b7327f0668a61cfb22
-EBUILD libusb-1.0.21.ebuild 1584 BLAKE2B 79b753df93d5814fdd182cb97c0af28ac4ecc43684943843c50649665b4fd653485c01d0c91373c0c951471d337498799730edf08e612e83d60a7977b788ae54 SHA512 f7fb6258b7ea46e15615c1c65068ad6927bfd9950c16b11b00497e3d51cd26ef95abd0eff2f2c03fbfd9f2c0e33a1f7ecbc1447e134d1375dfb52fa6c076e4a9
-EBUILD libusb-1.0.22.ebuild 1578 BLAKE2B 3d5859dafe30f2ae44375fedc3f66d4bd496facff86528029d7dc30276ba604e576ec5ffd80ae5d89968d7bb8007f657feeb19fdb00d438aae55a3e78af72990 SHA512 1b9f8355e8f7f8a63155cd4f816bf35b2eec8bd2b8111350c91ae032b063ceb34e882d72f2a1054aea87f3a47d9ee1857d5740be3e7879977138a2443f8bb391
-EBUILD libusb-1.0.23.ebuild 1639 BLAKE2B 25913d93ce8dbfc5cbde70f2ea079c410a7ee37dd36d22c2314dc0e68bcbed67eb78f08c77ac1a03bc2174ade67f9b60c5c60f3340d73f52010f554b000cf329 SHA512 bfdd7cc67b0bef33b2c7ad08674464f3aa974b2df0c2792ee26f53b8794405ec1502b12405c32ee5458486b91c25a5c5dcca26ec09769c125720646fda4ee307
+EBUILD libusb-1.0.19-r1.ebuild 1552 BLAKE2B a7388e27055699a7b4a0aecb45f7291f199bb547b3fa1a66eb992206dbf7c8c28ed57814dcd05895d328313b15b3ea3ef592bae84d8971558f7cd5152cce1e2f SHA512 f32e03f6be3f11ae09ebfb00ee22659681d3171bac1cc1f3435833549ac2b770076699cef16299e8babe59fc86164c619d467ab9ac2e7fc53eb10b7ba934e721
+EBUILD libusb-1.0.21-r1.ebuild 1584 BLAKE2B 40e84dcfa741edec89e9a2d2cd972dff3fde96e67fd4fd73ebb007cb1cb8448ce11aebc972bb2a8724e33007d34b450fc552663ccc7e52ebede7dee2ee6d9cca SHA512 19f9e050fdcb4c6f60a3467d67bacffc9c1b93a9eed3a26f728846a47bbe13576375e472177f804076fb035ebcf900600ad44938c22e4c9781c9712a39e8da46
+EBUILD libusb-1.0.22.ebuild 1578 BLAKE2B 075f7487044435ee609c1fa9795145660689747513eb2611db5b7cf49ce788aad57b54604ff95d03d521bf65adf275f5441500249298a1431cd5dbba280d0cb0 SHA512 2b95e4d08acd8f2912ba3d652f960b99b3fb3fe2d2a6bff35b9b3969035b07cc549afb6d6900bcc2d65103f5b9fc48daf82e5a1b5903513b24dd8f6e3586f6ad
+EBUILD libusb-1.0.23-r1.ebuild 1642 BLAKE2B 07722685e94e8db817a17acae48cbf52667dcd502108116b67478fdf05e06bf5b172ffb32d1691329f82c1da7d544bfedd33da1fa23f0a47da06fc2cfee11860 SHA512 4aeb66d1b3e6c5df76849450309938ceb10342e6da178dfd5a735c42ae5c3eecd31451ac8dd3beb92eaf04c83baf9725c5ee2e0079598c19012b66acab97b906
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index 730265b9abdf..e06279828041 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-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
@@ -14,7 +14,7 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
index 270363654069..5b4c6c5e4a70 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21-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
@@ -14,7 +14,7 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
index e5001ea40c8e..a005d09d3e5d 100644
--- a/dev-libs/libusb/libusb-1.0.22.ebuild
+++ b/dev-libs/libusb/libusb-1.0.22.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
@@ -13,7 +13,7 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
diff --git a/dev-libs/libusb/libusb-1.0.23.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index 11b5404949ec..8b719b6c3da8 100644
--- a/dev-libs/libusb/libusb-1.0.23.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index dfc50d84ab51..ffe62145f711 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,14 +1,10 @@
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
-DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
-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
+DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4e00a747cf23e7b9dbc2e4663ca71be2eef601b18c58e39f64cb3ad348684db4c683bcdd85a3fea4c28a578417 SHA512 0200aae2d38c26f537658955479cbc54fb69d5d8cbbccf3016cea319b2c46b1f311ca7a8fc289f14532acbbf2905cf96b17353b8b92bf09802424c372701d1d5
 EBUILD libuv-1.28.0.ebuild 1198 BLAKE2B e10d86b654ee8671e588dbcf0a509770c828d512a2c7476362c18518254946c52da758549fc20ffcc356349b758cfb518557249e1557211de670bba9cb1162d6 SHA512 cd2c514b8939ca68d0e2c7313dfa3878bce8b2b73e4ceadfe9f7e57024463ab08234e60be2451be1cb7b937e33614de70d91877da8b6001d374e37bd55c766ef
-EBUILD libuv-1.29.1.ebuild 1215 BLAKE2B 06309a530f67cb20f98cc41309219aba34d75cc44bcd873ee1415278fe509d258bbfbcfe766852318a0cc676cc0b4aac931c6eaddfcfe0eade9312061248db71 SHA512 e37f129b934044be101d4cc5bd9e7e40fbb5a0e67f8a85c945e7cb75d19d2073e40dc8f9c9debf373d39fcf9386f39eeb290a730846d8ad9fb816ab4e52b62a5
-EBUILD libuv-1.30.0.ebuild 1215 BLAKE2B 06309a530f67cb20f98cc41309219aba34d75cc44bcd873ee1415278fe509d258bbfbcfe766852318a0cc676cc0b4aac931c6eaddfcfe0eade9312061248db71 SHA512 e37f129b934044be101d4cc5bd9e7e40fbb5a0e67f8a85c945e7cb75d19d2073e40dc8f9c9debf373d39fcf9386f39eeb290a730846d8ad9fb816ab4e52b62a5
-EBUILD libuv-1.30.1.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
 EBUILD libuv-1.31.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
 EBUILD libuv-1.32.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
+EBUILD libuv-1.33.1.ebuild 1217 BLAKE2B 19c28f94ec1133567c3dbf27830ce5cdcab5c2e9f296fc63e131b70e5c113d76efbdb05e59fe07e5d123d28c5a8035b0feba43a36c8849b4e52245b21472d297 SHA512 7a025451d3a7cf50bcabed7dca36cfcdc3f815702eb40d4d4f1e575dd6145f7a7b733f85352be1596e57b70dfd16ab6dd464089079734727739a81045fe629a2
 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.30.0.ebuild b/dev-libs/libuv/libuv-1.30.0.ebuild
deleted file mode 100644
index dda90b40158e..000000000000
--- a/dev-libs/libuv/libuv-1.30.0.ebuild
+++ /dev/null
@@ -1,47 +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="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 ~sparc ~x86 ~x64-cygwin ~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/libuv/libuv-1.30.1.ebuild b/dev-libs/libuv/libuv-1.30.1.ebuild
deleted file mode 100644
index 7c0554f35244..000000000000
--- a/dev-libs/libuv/libuv-1.30.1.ebuild
+++ /dev/null
@@ -1,47 +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="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-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/libuv/libuv-1.29.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index dda90b40158e..37a077b4e010 100644
--- a/dev-libs/libuv/libuv-1.29.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.1.ebuild
@@ -10,7 +10,7 @@ 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 ~sparc ~x86 ~x64-cygwin ~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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 541259a7373c..7f04b59cdf0e 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,3 +1,5 @@
 DIST libvoikko-4.2.tar.gz 653769 BLAKE2B 6c0e665d7b5eca394b49dbebf38a0815b1fe1ea328efa305e9d1574b551c633be6b2326b5b402bbc454557a559a821a28c668a1845b21a71c378d0e97103ca53 SHA512 483d3c259a52ae772d52f708789c3df39a4857188c7b9035ce5db8b16bfa4ef144e2ffd557dd6a0655e4c9a6984529784e4098bc949a1bc8a0a50529fee49656
+DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
 EBUILD libvoikko-4.2.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
+EBUILD libvoikko-4.3.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
new file mode 100644
index 000000000000..7bdff963650d
--- /dev/null
+++ b/dev-libs/libvoikko/libvoikko-4.3.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/libwacom/Manifest b/dev-libs/libwacom/Manifest
index d234685d140f..4834eeb955ab 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,5 @@
 DIST libwacom-0.33.tar.bz2 503217 BLAKE2B 034b06495209cc88e9a3131a8a23b35fdadf8bc038ff9db62d4dc05b31657d1cfbe4856cf7b1a6112c97d47bb532b664e4e59c3b00a2aebf14dfacbcac141063 SHA512 de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d
 DIST libwacom-1.0.tar.bz2 502457 BLAKE2B c7de15e8e403a4778662c711a4318ffd46c65fcb895e50181b14f6f9c4169493fcd14a78bae62cfad8af0e4d762b5babb06df21ff257994b1890d5ec9078e6ef SHA512 43a8098ed06c86edc647d6a6b0ee0b465bcb6089df77fd361909271aaf5f18ae2fecfa34062fd4a9fdee6983ff1303b99636485ebde6a75a669307bd19c2b313
-EBUILD libwacom-0.33.ebuild 1174 BLAKE2B 5ac5ba76edb9a68fabee753bfe1a8f761165373c5357cfd0d77b1c180a8cd47ff7fde42af28d5bcbcda789d92e55635b541b82a1444641c7db908a20b9269f43 SHA512 4a3f318e98875cd3f29b92771a14b6ca510d580b236c016dea455c997ef44bfd4169cae4269ee51934f4f514fb4c669b06f3921291bfe5bae8b214aaee8c7bc2
-EBUILD libwacom-1.0.ebuild 1038 BLAKE2B 0c3d6e4b6a73f34f329c9700725c50267fe0810101c7c11cb8d827ea5ed9c77acf4a236c548c711b24447ed1e65645f9b833ccb1fef6dc2c8660a9206dd390e5 SHA512 e5cfe6ad9179cc1f0cbb137f70e477a5806f6d8a4363b10edb01292d6dd00899d613e3897bff0f6f08eff6290f0ad341b10d34aea45d9805bfbffcd181db37c5
+EBUILD libwacom-0.33.ebuild 1175 BLAKE2B cf9dcbb372671ba9e4f76508bca2eacac88a4c26b9ad4880e14fc5139bbb04af18cbe8c514fb644f1d91ccbb0f4164ab1399e07a8194d9be99fcb37b38d7c9c4 SHA512 fb7252999e9007c551f6acfdac650157832913b9d4942cdbed4d13134eeed0854cc43bfb8f1bb08adc02863cb89a9e2fa53a2258a27066c53116f28a3453512b
+EBUILD libwacom-1.0.ebuild 1039 BLAKE2B dbf80df3a60d3e3a670ec62e95bf65f75eaeaae944c449bccf61f6fa585374615e48e2d8ba3f2f29281351eb04c6426b6c1bc6da797b4bf6f2d5b48a5eb8d9fa SHA512 25b2de42c9a6aefc428d7350f5fa7da4dcef578104d3549d322582e875cf5c23b4dd46413fbe07d3e3776d226d1b0db743860461d7c3272d7ade0fc930d038d6
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.33.ebuild b/dev-libs/libwacom/libwacom-0.33.ebuild
index c6c4fbd1c4d4..cfdfa6692595 100644
--- a/dev-libs/libwacom/libwacom-0.33.ebuild
+++ b/dev-libs/libwacom/libwacom-0.33.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-libs/glib:2
-	virtual/libgudev:=
+	dev-libs/libgudev:=
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libwacom/libwacom-1.0.ebuild b/dev-libs/libwacom/libwacom-1.0.ebuild
index 90d6573af7a7..358cf66a884b 100644
--- a/dev-libs/libwacom/libwacom-1.0.ebuild
+++ b/dev-libs/libwacom/libwacom-1.0.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-libs/glib:2
-	virtual/libgudev:=
+	dev-libs/libgudev:=
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 0cb966631828..b2afad0616b4 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,9 +1,5 @@
-DIST libxmlb-0.1.10.tar.gz 86237 BLAKE2B 042898be9ff8bb6b253ce7194e774bf6a1d8f08316ba54647b3667b1969c035364c3ef25d179fab20cbf9ca83bbd7e4d6012ec1adf08849fe99e40ab9a294983 SHA512 81f5edf776241580c0e47f43f9b15ecbc695022007cf90070f95ca190f2a270f15a856a89246c772f52e93b8eed88d228c5f426cd4dc84e8e6fdf2556b8714b3
-DIST libxmlb-0.1.11.tar.gz 88848 BLAKE2B b8ae448f8ead51c884304c190c2b5535f864eb410f45adc4c1f548d6aedcba944b6e0418fbc781e2561e18b392f3a77df8512f6d3ec5e0831513a2dac520409d SHA512 734082c4c15d8b02eb3e526b59fb6be8a7a61758a059792fca567c9a647df0597561fb6967903fb44d566ccd6e8e6d99286d0cae495b9d8ec12a3cd257c24a16
 DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f1be57b08ccb1864587b7bf47f892a39d1f4f0df226d3fe7ca03ffcec471a4f28afb8e64ae841d6898a337b60f SHA512 aebd9f41421bb0d78954038b3221bed879d296ec2d3061e7e7747980974e01081e51ea36d4e94545af5006b3dc4714d535aeea1943e42a7f1661ba1177979b31
-DIST libxmlb-0.1.8.tar.gz 85945 BLAKE2B 4d17aaf4e5ed3001a4db24e7ca220cba3fc14ee446b127b65b545fab997c7c31835b57b0dd9d23da74200d774e3986558e7618789f42d1e95c0734fa5bb6e098 SHA512 4109f171da4622429d18afdb9ae183a64f89e0b92df285efae5736017970f877a92391876969c20894184c6d5df96390ccd46be1d1087882a5461476c39e433a
-EBUILD libxmlb-0.1.10.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
-EBUILD libxmlb-0.1.11.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f
-EBUILD libxmlb-0.1.12.ebuild 1212 BLAKE2B 01342990623c6a80680b5f0d778ed684a56488acd5b9dd66f96796dcec074117078a380e1cf5fa9666ec191974693a7bd12048df8e7099e4ddd6bd8f17a8821d SHA512 f67bb1e4cadc9291960cd995882370e2d85c66a49f65ee81c26d2b7b63427bb435d0a5f28856d46c198ff59bc7d86c2a5dc772833f16aab4108928106bf62bef
-EBUILD libxmlb-0.1.8.ebuild 901 BLAKE2B 62fa0a3128f0f46cf26ca2ad705f18bc528c9646db2021518ad62616b31a1103fec0fe4d71916c96751b630e392b34b7c70d1626d333f06f747f8ca3a3d2150d SHA512 533a364552f01625add7cf7cecfbf839c7aac8e93d6096ab94f2d3ca847cc6ed5cd15cf777c5ec9ce876c2016df33b1bf18733be67e39e05a8fa4596489adb51
+DIST libxmlb-0.1.13.tar.gz 91597 BLAKE2B f5b1cffba36f25260df44b85109df22aca9f76a47a71c82b99504ce6f072b5b01c32aa26ae36ee37ff717a25dcbf094def8c3b65c7e53883aad726d919181db1 SHA512 ae2c043db0c3a9719c1527933e087825068f970bde28bc7b507a6535b51133d463b1dce6c8b02148a555bb28868ab563f7bb01e6324661dac92fab556c9a39b0
+EBUILD libxmlb-0.1.12.ebuild 1200 BLAKE2B 5c4791e8a427a8d0147cf42bd6b094e12248796399d73468bc0d35696aa8e1d20358f8f0d9038e6211c21a71e8fa90b9f2a4245861b84a5ae8716fcaee7b74fb SHA512 40c95b03c9d96a82a8dc04e7c73cb27f687f35fcd724cdbb5f7abe9f60c897d1a870f35c784110d4b7cb96ae968dd5656be486b0a75a61d0a8f0f1acc6d94523
+EBUILD libxmlb-0.1.13.ebuild 1202 BLAKE2B e9a493d9862ae51aada12bd72c499a48bc9b54dd1d9125a3e0ebce1fae4fddf448128bf3d5f0f33d1bac31b0a961c7a2b41f392918c3c3efe6a5ad1c171e3500 SHA512 92a52f1ea079624a2680cf0f5f019abf35159f02fa830eb23e7ad2e82eb14890de7f5ca768f3ef47ae2915dc813592beeeeac240594c36266bd0a28003531c81
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.10.ebuild b/dev-libs/libxmlb/libxmlb-0.1.10.ebuild
deleted file mode 100644
index 487a34f0da43..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.1.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
index 203b7a1d9e50..10d2f6649053 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit meson python-any-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc introspection stemmer test"
 
 RDEPEND="
diff --git a/dev-libs/libxmlb/libxmlb-0.1.11.ebuild b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
index 51a1b304f84c..58eb76296fee 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.11.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/libxmlb/libxmlb-0.1.8.ebuild b/dev-libs/libxmlb/libxmlb-0.1.8.ebuild
deleted file mode 100644
index 01048bf0e9d5..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc introspection stemmer test"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 4c9023987c77..3160c6daf2bb 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.16.tar.gz 623606 BLAKE2B 48c5eb65890c87ed48bfaee60a6683f5320c561c8f6bf55268690675e388aefeb52e229c16430b9ff04b8ae29749e52beb71ac7d7f0642f4fa255e1bef85b452 SHA512 cbf0e678abadd670acde1778dcb137a49ad11f8e8d8d8465ebac542deb964e1c138b65ebf61404ea0219e17cdb336585545eee3f63d4e0ac41bffe0010f2c2fb
 DIST libzia-4.17.tar.gz 626840 BLAKE2B f63ba0712dedd53736ae297f253fa6fcb3ed5afe8f374c33a45cfcfb36e942192ae5a1f520deaca8745ea2a9d990307e984ce2b62894514332dbcd1ee78af977 SHA512 8375cfca8b61c78a8d355ac2d0e329ac0ed3f61ed3c902dd6c3ad202fcc9a1960ef55c4389f46a0d2e1423d060750639eda3d196dec94c9a53b7feba902d5378
+DIST libzia-4.18.tar.gz 623928 BLAKE2B ff7f4873f77c1782bc704ff11f0fcdc2a479404cf0719d9156fad2ad01634241f7f556699d778fbd6e3f4bfe108b1735c65def859d56cefcedd6a3c760200a14 SHA512 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489
 EBUILD libzia-4.16.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
 EBUILD libzia-4.17.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
+EBUILD libzia-4.18.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.18.ebuild b/dev-libs/libzia/libzia-4.18.ebuild
new file mode 100644
index 000000000000..89fcf6a119f7
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 1d8195de8109..bbc6f6fb29b3 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -4,5 +4,5 @@ DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.3-r2.ebuild 1045 BLAKE2B d633849f8800b5ceafa524fcb2f01dbaae5eb04898667f902303af6bd439da3f7acad1f95946e083e90b41bdf4c1d3095d9ad76ecd748a8fb9035fe7c6f8cd19 SHA512 2e3af6ce3b2c0cd2dc670bb689087ffa84eacb31b96f373e8e621b6a628e4fffa3ca9386e81c93b07c19343e9cb7f9806198ba7ad7265a3dae3f7c6cef10b7ca
 EBUILD mpc-1.0.3.ebuild 955 BLAKE2B b81c6d279157a3a47c6e78cf40b625d29226b79ef587c22cf1e25095bd1605823c94207cf75b8a0271dc988bd8bac1b6ebb2915080171322e0ba50f4b55aeead SHA512 aed001c22031eca558034bc9deac4d235c9aba28e9c9187a75b71bfcf91f65d7be18d722b29abebb781df72ef8442febe7e40ed5241c1ed3c768d2bf9d6e5509
-EBUILD mpc-1.1.0-r1.ebuild 924 BLAKE2B b4ff107bb85b74263e1ea0cf624d11c526171e7b0b77108215a1f034f5089204a069b8ffe60192b7952fb1114eb9335086e0fcb8746fb642a71c55f2744be734 SHA512 0fc6decdecb4b0f815f17baba4a3815859bc23db81e51cfc712252ce8bf704a7956227823ed2f6b6c45faa35f4fd9ceccf1fabca0a450ddd5872afaa3c6e4704
+EBUILD mpc-1.1.0-r1.ebuild 921 BLAKE2B 9b5ce8dde55c2dc56349401903ffa310672692b7bf7d03241b38b4bfa8a6025fcc89d185141d316615a29e3e9b22081eab15c6f46bc7bdc0907fc0503ca91d68 SHA512 56a5aee92077f5582b5679d3de9bf0c14f1a6ecf64ea24205b7c4d7b01b4a975f8a90970134c2fcac45acb05e154e6b02da65f7dbe144e71fd574b9d5f011aab
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 70d275e32d3e..7ef0ffad3077 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 2f6b49ade5a4..7afce2a93393 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -17,5 +17,5 @@ EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0
 EBUILD mpfr-3.1.6.ebuild 1591 BLAKE2B e83822443f4cefba6133397afadd04771cd4e5fb93598bf64fa9d94bde0bed823bc61114fe315488dd82a03c969ff78825d772a04e2fc643fd41f1d03a4f613b SHA512 3e2871fd594f7799f28e67e25223febdadbfec6fc96928d13ef1e0a394d69a88634a8ac490f22df9ec6827b0aab7926e377f10830d7bd74d87df163d64fd106e
 EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
 EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.2.ebuild 1702 BLAKE2B d1660a75c25c2c0461fbf9ffad12b9b09bedfea87fb40f141bb8aedb3a799a1a8d69584e36bcc7a0beca25e031a7da05596bde00c485789b83cc14e19647ba62 SHA512 471bdefc062a0633915b9ea3970bf409de4dcaf85bc8c27a5949793101d30bc33b29ccab1abf4c00ecae9930d3d6e47c88da89d82761403a703ba47aad81d6a4
+EBUILD mpfr-4.0.2.ebuild 1699 BLAKE2B b782b7e801f9aa0ab13cae133681f1ffb88b5cc1bff56cb07c610e4835b74cd7b67cd599096fde6d45114a107d31b3198eb4a886b758672c69381bf36ea5ce16 SHA512 d34c254190ef3443df8086c5962ac199294c8c3b466f0970f779f89bba37e916b27b372b1b363f958a7963060fe270b5826bd5b6b5d9ad790e74e4e0c2d166f6
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 95c70cb95cee..d8195afe3b1e 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 1b6250e7b682..05048bf19403 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,14 +1,15 @@
 AUX nspr-4.10.6-solaris.patch 973 BLAKE2B 8370bedb05c718d7b73d57b5ac5c720ca62499d6d7b7a039da608a9c514996c2d987ba0135b7dcac509d1b9363908f0c0cff6fe47e1f7ca94b7efbd8c19aeeca SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1
 AUX nspr-4.21-ipv6-musl-support.patch 1645 BLAKE2B 0b383804d5e66037041b91dcb7ddd52dd4533384ca5671ed1d36a71740b130863dd2b531867edab804fbb8cfab112282e17d607d7e298eb249ead620f99a55be SHA512 f241e607491d1192272221023d5f3e84b3e88957e7b66ce4d9ba1bcf2ab6639facc08eeb838a0e6753456f41dde4ced4fe99f923e0889030d844c23c62fad4e2
+AUX nspr-4.23-prtime.patch 814 BLAKE2B 2106a841b34445310cef07e15cb77ae4c9465cca9a7dc68acd68408a66383c90bee1fafeaaa144e1b8344d1edae27407714f193a452ffc3d425212e3b2c40fc5 SHA512 9f51a03852f0b3d4352c14ee849ec8af9b3dbef68eaa2755cb5a630018f91e3a2a4fce5742078b8be51e76995218a0cfc7ef8b0c013e8c47f746a61185795eae
 AUX nspr-4.7.0-prtime.patch 859 BLAKE2B d7869ee8e46f34e53546c28e7f9032497744d31b82d0fb47edb8c2ff5787392423698353e1374ebb5f9ed11470dff5ca62995e8f44f310756799bc9eae55ada5 SHA512 d8421bc11de5ec5e116c7eba3f31fcdde27796a64948d16aa1fb1822a29a92d8810056719ca60bcb96b1734b0e84c95250075c18acbcb631786249af7d679492
 AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2555b9f264f0da7432fb0e7d5d69e1bbbb7adc9a448d88ca269be41943f2ee60e1cc8e115542e300c1d7c61185 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
-DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
+DIST nspr-4.23.tar.gz 1078660 BLAKE2B 4599684e1bb80238e409472f41d0e9ba9bc731b48fb17578c99426b277bbfa9f3c8348570b58f679ad7fa94421a1c6b5972f9218e9d56fb5d1d49d45cf04363c SHA512 19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1
 EBUILD nspr-4.20.ebuild 3770 BLAKE2B d27554e938728d5dda0bbd6da5223b994bb106b2bf9af1631c4f0f66cfee3eea384f4f665356bffd5b1cb87c82f475c9099e767235cce02c06408e5987b9cd09 SHA512 cc0067760312e923bad46dd322ea193decb62f8deb6d50519f3373e837d1c0aaf8cc75f28b8b0439f9f89566ebcba1c15837713535446abef7b583b7b2680af1
-EBUILD nspr-4.21.ebuild 3875 BLAKE2B f6e53d9ad60e299bab2d1a20b228b0105c112702992d05047c6d3b8a41433278605b95a39676ac637082c4f0f4e29f6cad9f7acbb4a302684d6fa81a53808c61 SHA512 49c8721862e993070c9f55d6150a5273d70bbe9c1e6590198924bc1bdfaa434c4d44a0918db4985f92307cdde3e705c01f4031d29dcd54f4fe3f879637efa68a
 EBUILD nspr-4.22.ebuild 3865 BLAKE2B 69207a7090aac468f09ac874cf1070e33fef8338ad3c7900373ca39f29845cb3f0fef1c197c3fb90ab78c7d1efcdd25edc5185a9ef84df82cf2414c96c9fd69c SHA512 9877374a313c217c8c17c17434ae243446be9ef1beb20c58683207135f2a18c1085f4bff0d8b8ce20bc57cd730825fcd97f59813b91dcc081c15277dcd839826
+EBUILD nspr-4.23.ebuild 3943 BLAKE2B 425caf054f7b308e6c9a6a9b911bd7f594959f566fc691dd821e8d6fbdf3e98a5a0689dd3fcf0772da6989e1ed69b615fd86ec394ac963ab7cd58002371ffa13 SHA512 c01b2d44c50bdf750daaaf53647b0423865c8e72f80ca6e5feba4cf77f81b288421d1fe54f34ead168ccbf3aa87da82d64d02a4e2db3a1ded31b10bf9bc56ce0
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch b/dev-libs/nspr/files/nspr-4.23-prtime.patch
new file mode 100644
index 000000000000..087e427866f9
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.23-prtime.patch
@@ -0,0 +1,26 @@
+--- a/pr/src/misc/prtime.c
++++ b/pr/src/misc/prtime.c
+@@ -1621,7 +1621,7 @@
+             case TT_EET: zone_offset =  2 * 60; break;
+             case TT_JST: zone_offset =  9 * 60; break;
+             default:
+-                PR_ASSERT (0);
++                return PR_FAILURE;
+                 break;
+         }
+     }
+@@ -1677,11 +1677,12 @@
+         struct tm localTime;
+         time_t secs;
+ 
+-        PR_ASSERT(result->tm_month > -1 &&
++        if (!(result->tm_month > -1 &&
+                   result->tm_mday > 0 &&
+                   result->tm_hour > -1 &&
+                   result->tm_min > -1 &&
+-                  result->tm_sec > -1);
++                  result->tm_sec > -1))
++                 return PR_FAILURE;
+ 
+         /*
+          * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-4.21.ebuild b/dev-libs/nspr/nspr-4.23.ebuild
index 78e6c4476bef..1f11ed37ec18 100644
--- a/dev-libs/nspr/nspr-4.21.ebuild
+++ b/dev-libs/nspr/nspr-4.23.ebuild
@@ -21,7 +21,7 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	"${FILESDIR}"/${PN}-4.23-prtime.patch
 	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
 	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
 	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
@@ -41,6 +41,8 @@ src_prepare() {
 	if [[ -e "${S}"/nspr/configure.in ]] ; then
 		einfo "Renaming configure.in to configure.ac"
 		mv "${S}"/nspr/configure.{in,ac} || die
+	else
+		elog "configure.in rename logic can be removed from ebuild."
 	fi
 
 	# We must run eautoconf to regenerate configure
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index fc247fc7fb06..05c237da4841 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,12 +3,16 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
+AUX nss-3.47-enable-pem.patch 167 BLAKE2B 2b0b5e93ef43303008786280fe3b31d4ea5d92385134bf5574eef7a6fc3fb3e93b94b3a39857dd7ff5cb0f788af6b3c23a77164046b30a349666d0b050c715b2 SHA512 0fbcb0d2f0bce5fad6dadfe3d63288db98394384b901fbcabe98e86765bf029fac26eef96be5858113dd916fcf57595a3890904fe99573a652cfab4c13a112b7
+AUX nss-3.47-gentoo-fixups.patch 5365 BLAKE2B e439dbf10b560369fda15ce21ede20d243373f1d93e111af75ebec029816c2ddd1c41f209bfa9f86e9272ef3ec5116530a7653e774fc8a16906adf0c57d22daa SHA512 b9a984697f71cb263eb6955e20584689325f1eb99ca124494944194bb0a57f20184a4c11ea862edaf564930ecb2e0f2f9317245e1c782d88b598a5a0587cd66d
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
 DIST nss-3.46.1.tar.gz 76417797 BLAKE2B c65679a7eb50991958858afe2a20824dd9ff4c0f554f3c1964ccec269c2da9de1fa674a6ebf24fd3c8465315e491a9b50188382d1032b0cfe74c289d49049926 SHA512 f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
 DIST nss-3.46.tar.gz 76417155 BLAKE2B 18e22a60df185764f434779211289a78d05270d8493766100e378e2ecfdb3013feb73359088d53667fb3c57a5b29633c9f800d29739cff5aab2af81e7ddbe2d7 SHA512 de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
+DIST nss-3.47.tar.gz 76461837 BLAKE2B 8b11b5330cf134f2f94c2b4a07d52e153ff40006770e31cbba379ff623b822778bd8ae4510493912263299bbb8f6e0706f30d59633256a3141cbd8faedd1f257 SHA512 99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.40.1-r1.ebuild 9479 BLAKE2B e4f33cbe94edef476eafe96a25eb1a1000ff89a57f3854a7496c3dbec5c0f525d68a86db95d46265ab34743f244d1dd6c1b8cfc012f267d62221ed85bbdea42c SHA512 52e48ae06d22044a2321a40b8f73aac3056952c12f1221d988ad9bc72e0313fc9f891f8db51aa27eed6453414c5b67efa32b3c3dafa0920de209401bcb024388
 EBUILD nss-3.46.1.ebuild 9466 BLAKE2B 99b1726c838605322c530734cdcf3c5e15475df1a580c9eac8b6124a5e2670aa0ef31fb43442f5d7373ae756b19d342086086d13d10590a68df3d1f0de0ab94a SHA512 5142bbe118d58dcd8f394bb98d152bf9c0545b908f17a5e536daf6721d68229ef87dffed18abcd967cb5cf51a7d4d60f58ccfcf2147e70ee2ac3806e0ae071ee
 EBUILD nss-3.46.ebuild 9456 BLAKE2B 93216fbe0317bdd50bd4a3ff6606c1144363342c67215c0d28af4030d8a44dbb0f5654ba4280e901376c4cc2148492117b30bdb78fb4d6b72c6cdc564f3787e8 SHA512 9cd8a8dc99bf10caab8b4f93694c56e6d89d0e9965c1431d7ef0dc9bc06ee804d345a351e31e192eec8f3dd2ca44e0c96ae53af03b430874e8ca9b788991f08e
+EBUILD nss-3.47.ebuild 9466 BLAKE2B 466ff346c4ba7e6c320840f0b45bc85546853ba9f3fca49e6caa5c3da28e803c37926e5abe9005942e1c7a32c1b08c38f75c02a7ba585e3f8da26babaffe0ade SHA512 99d63942d0bb4207eba15fd7778f3773b6aed6b16fef3ecc381b76b1c46712107c1d208408eea9ff0fb803651b2390004f85b0ecc0483ce346ffd0d74c684c8e
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.47-enable-pem.patch b/dev-libs/nss/files/nss-3.47-enable-pem.patch
new file mode 100644
index 000000000000..47a01c322bb6
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.47-enable-pem.patch
@@ -0,0 +1,11 @@
+--- a/lib/ckfw/manifest.mn
++++ b/lib/ckfw/manifest.mn
+@@ -5,7 +5,7 @@
+ 
+ CORE_DEPTH = ../..
+ 
+-DIRS = builtins
++DIRS = builtins pem
+ 
+ PRIVATE_EXPORTS = \
+ 	ck.h		  \
diff --git a/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
new file mode 100644
index 000000000000..9bf9e0163570
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.47-gentoo-fixups.patch
@@ -0,0 +1,242 @@
+--- a/config/Makefile
++++ b/config/Makefile
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH      = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++	# Create the nss.pc file
++	mkdir -p $(DIST)/lib/pkgconfig
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@exec_prefix@,\$${prefix}," \
++	    -e "s,@libdir@,\$${prefix}/lib64," \
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss.pc.in > nss.pc
++	chmod 0644 nss.pc
++	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
++
++	# Create the nss-config script
++	mkdir -p $(DIST)/bin
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss-config.in > nss-config
++	chmod 0755 nss-config
++	ln -sf ../../../config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- a/config/nss-config.in
++++ b/config/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++	cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++	[--prefix[=DIR]]
++	[--exec-prefix[=DIR]]
++	[--includedir[=DIR]]
++	[--libdir[=DIR]]
++	[--version]
++	[--libs]
++	[--cflags]
++Dynamic Libraries:
++	nss
++	ssl
++	smime
++	nssutil
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++  case "$1" in
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  case $1 in
++    --prefix=*)
++      prefix=$optarg
++      ;;
++    --prefix)
++      echo_prefix=yes
++      ;;
++    --exec-prefix=*)
++      exec_prefix=$optarg
++      ;;
++    --exec-prefix)
++      echo_exec_prefix=yes
++      ;;
++    --includedir=*)
++      includedir=$optarg
++      ;;
++    --includedir)
++      echo_includedir=yes
++      ;;
++    --libdir=*)
++      libdir=$optarg
++      ;;
++    --libdir)
++      echo_libdir=yes
++      ;;
++    --version)
++      echo ${major_version}.${minor_version}.${patch_version}
++      ;;
++    --cflags)
++      echo_cflags=yes
++      ;;
++    --libs)
++      echo_libs=yes
++      ;;
++    ssl)
++      lib_ssl=yes
++      ;;
++    smime)
++      lib_smime=yes
++      ;;
++    nss)
++      lib_nss=yes
++      ;;
++    nssutil)                                                      
++      lib_nssutil=yes                                             
++      ;;
++    *)
++      usage 1 1>&2
++      ;;
++  esac
++  shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++    includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++    libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++    echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++    echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++    echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++    echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++    echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++      libdirs=""
++      if test -n "$lib_ssl"; then
++	libdirs="$libdirs -lssl${major_version}"
++      fi
++      if test -n "$lib_smime"; then
++	libdirs="$libdirs -lsmime${major_version}"
++      fi
++      if test -n "$lib_nss"; then
++	libdirs="$libdirs -lnss${major_version}"
++      fi
++      if test -n "$lib_nssutil"; then
++       libdirs="$libdirs -lnssutil${major_version}"
++      fi
++      echo $libdirs
++fi      
++
+--- a/config/nss.pc.in
++++ b/config/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
++Cflags: -I${includedir}
++
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+ #######################################################################
+ 
+-nss_build_all: build_nspr all latest
++nss_build_all: all latest
+ 
+ nss_clean_all: clobber_nspr clobber
+ 
+@@ -133,16 +133,6 @@
+ 	--prefix='$(NSS_GYP_PREFIX)'
+ endif
+ 
+-build_nspr: $(NSPR_CONFIG_STATUS)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
+-
+-install_nspr: build_nspr
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
+-
+ build_docs:
+ 	$(MAKE) -C $(CORE_DEPTH)/doc
+ 
+--- a/manifest.mn
++++ b/manifest.mn
+@@ -10,4 +10,4 @@
+ 
+ RELEASE = nss
+ 
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil config
diff --git a/dev-libs/nss/nss-3.47.ebuild b/dev-libs/nss/nss-3.47.ebuild
new file mode 100644
index 000000000000..3c41aeeeb56c
--- /dev/null
+++ b/dev-libs/nss/nss-3.47.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.22"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+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-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}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED%/}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 4dd6cfcb8ebd..62cc75bf962b 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,5 @@
 AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch 454 BLAKE2B 8ec384d21dd283cabd7b3a567bacc2375c489a78f71ccf4373a88b707c31bee0ca2f83c538e1d760e52314c6ecb168c2cf80a5049eb96d993ec08bb38136f641 SHA512 2fd3df7ad7c7bd75967250ec89153c0c6c6859f2833419e134c5aa6463cfd26bb9e7e2a1121cf59973bd6b3451476743b1fba79dbf61cb5cf45040ea13d67311
+AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch 777 BLAKE2B 06d47037678d7e6bf757f879e319545a434d9301ab31045132ca3ae112e8f86f2797c544533b031536d40646859a4a3bc5d66abafb963b931b32b2b3aa8ccbf9 SHA512 03ea9386547b7f7c19d1067b0ec4dede30c3656d2403ac60338d6aa3bf1ceca1a80eb19a08fa83bbc4766ffc63c4871bd91c37731b259f2395839e724f3314bf
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
-EBUILD oniguruma-6.9.3-r1.ebuild 1044 BLAKE2B 72cda1c817606528a2b81cc4333aa8df356761cc4781d645a48c42cdff72a1931ed30ab1aefe702c921d2a018abc66bdd4ecabbe56825cf937cd2003f3380580 SHA512 ba2751c367251fa344a4a7aef978d752d7158c4d6d240ce3eb167e2b1a7b838ca02ccb5b12d4f7f1eb2e1aff8e81072a1ccd02b0c2337b1d35adc74d49f2882c
+EBUILD oniguruma-6.9.3-r2.ebuild 1112 BLAKE2B fde34ed55491542010421c2b6510edb7ae7d00d88234202cc527de6ce8b73926d979a049577215f63975a7c02da48bea7fb832ba8d5821a9f23664ab21374c13 SHA512 ec78dc10570e912890d4cd08efa9adbf1e4a1586a005930d536faa71db67adad17621770c073c925594d70b6bc7b0e2c9a4435ea0b224b62d581fdde961bf193
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch b/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch
new file mode 100644
index 000000000000..e946a57d648f
--- /dev/null
+++ b/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch
@@ -0,0 +1,25 @@
+https://bugs.php.net/bug.php?id=78633
+https://github.com/kkos/oniguruma/commit/15c4228aa2ffa02140a99912dd3177df0b1841c6
+
+--- a/src/regcomp.c
++++ b/src/regcomp.c
+@@ -734,8 +734,8 @@ add_compile_string(UChar* s, int mb_len, int str_len,
+     COP(reg)->exact_n.s = p;
+   }
+   else {
++    xmemset(COP(reg)->exact.s, 0, sizeof(COP(reg)->exact.s));
+     xmemcpy(COP(reg)->exact.s, s, (size_t )byte_len);
+-    COP(reg)->exact.s[byte_len] = '\0';
+   }
+ 
+   return 0;
+--- a/src/regexec.c
++++ b/src/regexec.c
+@@ -2889,6 +2889,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
+           DATA_ENSURE(0);
+           q = lowbuf;
+           while (len-- > 0) {
++            if (ps >= endp) goto fail;
+             if (*ps != *q) goto fail;
+             ps++; q++;
+           }
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild
index b3b9800c1cb8..8a716c7a03eb 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.3-r2.ebuild
@@ -16,7 +16,10 @@ SLOT="0/5"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.9.3-fix-heap-buffer-overflow-php78559.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9.3-fix-heap-buffer-overflow-php78559.patch
+	"${FILESDIR}"/${PN}-6.9.3-fix-heap-buffer-overflow-php78633.patch
+)
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 6a1775ef4877..b0dd52106175 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -10,5 +10,5 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab86433795
 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 4959 BLAKE2B 0b188cd8b933cf5edbe4a35737a104a94cdb1dd79e39401d5561226394b90105b9ade4bd26026076d10d7cc64483586fc2920ec721b56fb0af643a8b718a9023 SHA512 4f87a3d45f94b399471664d2e2ece94b0fd15c4c83d8cd161b8e929f0a904d43725e4594a8d3628518e111bd95f6cd05183b20230f865a7350620af3a5395b8c
-EBUILD openssl-compat-1.0.2t-r1.ebuild 7570 BLAKE2B aba7ce7a20da61e28927096eee6c75cbb3aeaa0af6cdc4fa6eb268f11a4d0436130d9b0b23f837af6ad93d14156c1a8f908bd15af780df65b2422599fd95a9ff SHA512 8f97ec631758e1a938689eadff27eac3ec0349eb540398d4bbf6af15bbfd8981a17b590e0ba9f3239e4720a425a0e1caf88ddc7871325624cf223edc82cf98e5
+EBUILD openssl-compat-1.0.2t-r1.ebuild 7585 BLAKE2B 8e9b712a582e98f2f1bd03d503cb7c9d1b9658c5a2d4112c0c5ffb41838e77f94dc51d3cdc752b843eb09d0572f7d28c356fb7d17d3faf4c3702a455acbd4d00 SHA512 34058ec84602f4556a1a944eb59b87a2994de73c5c35b915c4923db38e9d1b9bb040f1c4a25e05bc7b271395da699a6dce8d081e0fccd97f8e6319b70ac07369
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
index d42cc5f4f5a9..b157a2495fce 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
@@ -39,12 +39,15 @@ LICENSE="openssl"
 SLOT="1.0.0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~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 )"
+
+RESTRICT="!bindist? ( bindist )
+	test"
 
 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"
+	!=dev-libs/openssl-1.0.2*:0
+	!dev-libs/openssl:1.0.0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-lang/perl-5
@@ -54,8 +57,6 @@ BDEPEND="
 		sys-devel/bc
 	)"
 
-RESTRICT="test"
-
 # Do not install any docs
 DOCS=()
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 4b6e32ed8821..50d01fbb06c6 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,5 +15,5 @@ DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2t-r1.ebuild 9848 BLAKE2B 27e23ff21c452778cf65563c571fd89837ba5c60fd783f9b55da5b40bfc1981492e172bc2757fa4dbcef553cc848ad378d37e3bb79583a850239be3e0e5fc008 SHA512 53c3a31e3dd8226ef8c24a11b6a82c97dba4251d8b09986d5d48547f0d53e93c05cb30d9591ecd945f670a4d142fc3595b1c2c44034fca4e53eccd29c4d26caf
 EBUILD openssl-1.1.0l.ebuild 9579 BLAKE2B c60a96f76591ac3e913d28e86bcfd53cabe5428707d1ce0f713908ae7c88b0624f34b6334b2745f1817b4f173d581c11eff1b4ef7a22b7a5c660523b54b8c9ab SHA512 70222a86f55a87e7811c17af0f6d642290024b7635dc3f3c6f5bebb27394c797ed021f9390b33a3fc303ef9b6c600a69e63ecf6d0713c68f0710d72bef8cb4a8
-EBUILD openssl-1.1.1d-r2.ebuild 10310 BLAKE2B af5bd0449f7755f342ad611f07bf804674f27acd6170e7e75d4e294deb951368745868c7afd4ecafa6d7e9f4591be8643b18b3589fd6acc6751c7862655c0536 SHA512 e1e0908a41faadef4d8cf6b44dd84dc184dcca88daef1a3a0b4f8ad8180781cd054faa6ef3114f99c9fead2b330ecaf40fc18e745866ce5394b6f8ca53f2ccbd
+EBUILD openssl-1.1.1d-r2.ebuild 10306 BLAKE2B 7104748f994d7a1d8933c4da08a94a90cbd01594517ef5ccadf2e04477ef7b85e6ede4af0e43fe8b13c5d33dc4c2e5c3db2eaf133bbd26a8e2c2b373638226c3 SHA512 8d5d81e4913242dc7e69b6d890480a8138e679aff1cf57fb02ba8f18176e01b92d4e564d080c5d456e8c94cbf24af70b93f91d434be4b3d19fddd6b97f52c8b5
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
index 2130482bcb98..68fb0b3b5ad9 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 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 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index c15fbedd8d4c..7facbb84d18a 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,3 +1,7 @@
+AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
+AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
+DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.14.1-r2.ebuild 1331 BLAKE2B d275c6df8aa46588a6019fbe5c0a02cf52cb50a04ef58e0f581fc3c2c47d91e4feea2654e8d735d50d39722f19115436e033caebc3bde73c9f04477877d53c0b SHA512 a05fc7daa0b42aade87680e5fdf4705da2efaadcc5b20d283839cca038e5e45e3f81520f210b8559f311ef5442c23655ad95efdd58d68c11cba3a41d253bf3d6
+EBUILD redland-bindings-1.0.17.1.ebuild 2489 BLAKE2B f93016c80dc1c2b07f80d3b63210f20a00c91059b89fd929e319d09def1483648b7f277f5b6e5c4dd82784d8020b0e3ebf01a2a655ed449f592818ccd448ad0c SHA512 5bdb893ca819a9557ef25a93d0e40e4a5be5dad9ebb98e9fb7b5bf25dee4bd77a820a78cb4aa8083d1ede74701a08a74edc9bc46a704a4efa18af60d60a8d049
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch
new file mode 100644
index 000000000000..35594515c793
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
+Date: Wed, 22 Jun 2016 10:28:48 +0200
+Subject: Don't undef bool, it's needed
+
+---
+ perl/CORE_wrap.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/perl/CORE_wrap.c b/perl/CORE_wrap.c
+index 46c2a46..4eb3785 100644
+--- a/perl/CORE_wrap.c
++++ b/perl/CORE_wrap.c
+@@ -1432,9 +1432,6 @@ SWIG_Perl_SetModule(swig_module_info *module) {
+ #ifdef eof
+   #undef eof
+ #endif
+-#ifdef bool
+-  #undef bool
+-#endif
+ #ifdef close
+   #undef close
+ #endif
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
new file mode 100644
index 000000000000..1ca8ded91e9f
--- /dev/null
+++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
@@ -0,0 +1,34 @@
+diff -aurN a/configure.ac b/configure.ac
+--- a/configure.ac	2014-05-10 18:38:09.000000000 -0400
++++ b/configure.ac	2016-10-12 14:27:04.635849601 -0400
+@@ -153,13 +153,17 @@
+   fi
+ fi
+ 
++AC_ARG_WITH([php-config],
++    AS_HELP_STRING([--with-php-config=path], [Custom path to php-config]))
++AS_IF([test "x$with_php_config" != "x"],
++  [AC_CHECK_PROG(PHP_CONFIG, php-config, ["$with_php_config/php-config"], [], [$with_php_config])],
++  [AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)])
+ 
+-AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
+ if test "X$PHP_CONFIG" != X ; then
+ 
+-  PHP_VERSION=`$PHP_CONFIG --version`
+-  PHP_INCLUDES=`$PHP_CONFIG --includes`
+-  PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
++  PHP_VERSION=`${PHP_CONFIG} --version`
++  PHP_INCLUDES=`${PHP_CONFIG} --includes`
++  PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir`
+ 
+   if test $PHP_VERSION '>' 5.0.0; then
+     PHP_SWIG="-php5"
+@@ -445,7 +449,7 @@
+   with_php=yes
+ fi
+ 
+-PHP_VERSION=`php-config --version 2>/dev/null`
++PHP_VERSION=`${PHP_CONFIG} --version 2>/dev/null`
+ if test "X$PHP_VERSION" != X; then
+   languages_available="$languages_available php($PHP_VERSION)"
+   if test $with_php = yes; then
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
new file mode 100644
index 000000000000..b03e9531a939
--- /dev/null
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+USE_PHP="php7-2"
+PHP_EXT_NAME="redland"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PHPIZE="yes"
+
+inherit php-ext-source-r3 python-single-r1 autotools
+
+DESCRIPTION="Language bindings for Redland"
+HOMEPAGE="http://librdf.org/bindings/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE="lua perl python php ruby"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/redland-1.0.14
+	lua? ( >=dev-lang/lua-5.1 )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby dev-ruby/log4r )
+"
+#	php? ( php_targets_php5-6? ( dev-lang/php:5.6[-threads] ) )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-lang/swig-2
+	sys-apps/sed"
+
+PATCHES=( "${FILESDIR}/${P}-bool.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			eapply "${FILESDIR}/${P}-php-config.patch"
+			eautoreconf
+		done
+	fi
+}
+
+src_configure() {
+	if use lua || use perl || use python || use ruby ; then
+		econf \
+			$(use_with lua) \
+			$(use_with perl) \
+			$(use_with python) \
+			--without-php \
+			$(use_with ruby)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			econf --with-php="${PHP_CURRENTSLOT}" \
+				--with-php-config="${PHPPREFIX}/bin" \
+				--without-lua --without-perl \
+				--without-python --without-ruby
+		done
+	fi
+}
+
+src_compile() {
+	if use lua || use perl || use python || use ruby ; then
+		default
+	fi
+	use php && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	if use lua || use perl || use python || use ruby ; then
+		emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
+	fi
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+	use python && python_optimize
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			doexe "php/${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+	fi
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
+	einstalldocs
+}
diff --git a/dev-libs/rlottie/Manifest b/dev-libs/rlottie/Manifest
deleted file mode 100644
index 20a03f5052b4..000000000000
--- a/dev-libs/rlottie/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
-DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed
-EBUILD rlottie-0.0.1_pre20190920.ebuild 880 BLAKE2B bd576d345fe17ffdf201b25a1f10dcc1bbcb9c4eb821f619e5d4c770b5a78505a224e34cf82e83dc1dcde2d82263697d0804306d2338ecd506957d2bceb41ff4 SHA512 409b2f0314d061550124f8952dba66594c2291c3c232803acf46fba765d8a01a79ce2d8b19da65c297f27692b7b4108c3e272170a0e02d8ae9537d153ea77f5a
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch b/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
deleted file mode 100644
index 60676f7f8e32..000000000000
--- a/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/meson.build b/meson.build
---- a/meson.build	2019-09-28 08:38:12.810010842 +0300
-+++ b/meson.build	2019-09-28 08:38:47.812649483 +0300
-@@ -1,6 +1,6 @@
- project('rlottie',
-         'cpp',
--        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
-+        default_options : ['cpp_std=c++14', 'optimization=s'],
-         version : '0.0.1',
-         license : 'Apache')
- 
diff --git a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
deleted file mode 100644
index 24a7d66d956d..000000000000
--- a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-MY_COMMIT="93dd5305d9f5d2270a873c9c565b6931439fd11f"
-
-DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
-HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
-SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD FTL LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/rlottie-${MY_COMMIT}"
-
-PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
-	eninja test
-}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index cd0a6a991557..190381846a79 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -12,6 +12,6 @@ EBUILD roct-thunk-interface-2.0.0.ebuild 893 BLAKE2B 1b3d076a1042d862427afdd98d1
 EBUILD roct-thunk-interface-2.6.0.ebuild 1162 BLAKE2B 625d067629a44d62e9f9b874bb74098226c6fd4bcc0afe520edcd6c815403137d28274d42b42bcce7ae1e2db6b8e5410cc8b03dde505377ffce4b2e285629279 SHA512 c04811fe533d4b06770ff1e19d0e9572d8f45f932aab8f60052a86d0749bbc082f39401e3fef701cdd7857c85754f8f57e49dedcde2b4974492612eb93ef8fdf
 EBUILD roct-thunk-interface-2.7.0.ebuild 1190 BLAKE2B 68654588a3a2a3bfbe5d50536c518e5be81fcd9edf69db25e8b7e4ecab42d8538c7575b770a5c359ca41955384ebf11e5841773d140af851deadcf21f821d877 SHA512 dc0e98aacaba2e3f24f86a7241224536021a9569fd8923a164af41b17b28e146c1bc9e4e40f65ee88f107b7ba8cc8210bbc129cec7958bc245ab1e3501afaa8b
 EBUILD roct-thunk-interface-2.8.0.ebuild 1196 BLAKE2B e76798567c890f59faa5964ca734ebdd3235bffbe950802797dfe7ee46e635aef32cf69563f455c5fa33a4034608eea55f952085decd84f7b5efb35323b256f8 SHA512 eaab8c6baa03d56bbf4486eb71b65c71f69e1df21ac05ed825092598b942468183dd0dc360ca941240459bfe4bf3f8a686766ec9d9222b60ea9a9e51ac1cd1c8
-EBUILD roct-thunk-interface-2.9.0-r1.ebuild 1142 BLAKE2B 288362340dd65cc262e7eaa46e66b9d76bd6dcc5529fbcaf6be5a5628360a6574bdf34350c79cce310dddb2d3b683161c66bbbb43aacff12d2c0b8ded42190ad SHA512 8afe5bc83827816481b7f196e64412a3697608286a423e2d7fb9e4227625aac9b4f639c04ece126499ed696cbb732f169ecfcacd0cf0ac3dbdf95b0b084d3742
-EBUILD roct-thunk-interface-9999.ebuild 1142 BLAKE2B 288362340dd65cc262e7eaa46e66b9d76bd6dcc5529fbcaf6be5a5628360a6574bdf34350c79cce310dddb2d3b683161c66bbbb43aacff12d2c0b8ded42190ad SHA512 8afe5bc83827816481b7f196e64412a3697608286a423e2d7fb9e4227625aac9b4f639c04ece126499ed696cbb732f169ecfcacd0cf0ac3dbdf95b0b084d3742
+EBUILD roct-thunk-interface-2.9.0-r1.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
+EBUILD roct-thunk-interface-9999.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
index 84d01d8e830e..8309cffdc300 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
@@ -16,7 +16,7 @@ fi
 
 DESCRIPTION="Radeon Open Compute Thunk Interface"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
index 84d01d8e830e..8309cffdc300 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 DESCRIPTION="Radeon Open Compute Thunk Interface"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
diff --git a/dev-libs/stp/Manifest b/dev-libs/stp/Manifest
new file mode 100644
index 000000000000..7b40427ab190
--- /dev/null
+++ b/dev-libs/stp/Manifest
@@ -0,0 +1,3 @@
+DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
+EBUILD stp-2.3.3.ebuild 975 BLAKE2B 0cef0581142eaccdc0df77e7ece8dc0528e8390583b86e70dd263495a12f9234fd1806d721bca8168531d2902610b2ae5bd9f52ed02207266a9fc017becdb55e SHA512 a96b98f8afb1293fba8865b509cb0f04595ebc435e699d55075df3756843c0316629021347c73d954f579dc6ca487e620eb1964953a3d8820b292706c52df259
+MISC metadata.xml 881 BLAKE2B bb604f1cf823b06a4d7bff96ec805bc2418dfcdeeaa17ca88f98c509b687b7467f7c6864d25294d8f1f1e4cbaf0e7d99b82edd27fcdc552353fe5510d1fbe375 SHA512 4b3e243ae419cb974f49b6d37e3e807f5ff0676cd989dc145fcd716c23bd2292177935658ea899afd9fc37a18dffc8c0949dee4a25b2e493db0f3713703ad2cb
diff --git a/dev-libs/stp/metadata.xml b/dev-libs/stp/metadata.xml
new file mode 100644
index 000000000000..2b1417586ce7
--- /dev/null
+++ b/dev-libs/stp/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		STP is a constraint solver (or SMT solver) aimed at solving
+		constraints of bitvectors and arrays. These types of
+		constraints can be generated by program analysis tools, theorem
+		provers, automated bug finders, cryptographic attack tools,
+		intelligent fuzzers, model checkers, and by many other
+		applications.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">stp/stp</remote-id>
+	</upstream>
+	<use>
+		<flag name="python">Enable building the Python interface</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/stp/stp-2.3.3.ebuild b/dev-libs/stp/stp-2.3.3.ebuild
new file mode 100644
index 000000000000..df1fb807e5e4
--- /dev/null
+++ b/dev-libs/stp/stp-2.3.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
+HOMEPAGE="https://stp.github.io/"
+SRC_URI="https://github.com/stp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static test"
+
+DEPEND="
+	sci-mathematics/minisat
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# replace static lib with $(get_libdir)
+	sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ASSERTIONS="$(usex test)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PYTHON_INTERFACE="$(usex python)"
+		-DSTATICCOMPILE="$(usex static)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# don't install to /usr/man
+	doman "${D}/usr/man/man1/stp.1"
+	rm -r "${D}/usr/man" || die
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 76311f3b14d6..e3e0fd70b5f6 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,6 +2,7 @@ DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd48
 DIST xapian-bindings-1.4.10.tar.xz 1125168 BLAKE2B cb864021362098243993560724a66964532cd4ff47ce7a746876f1102113d136676b0feb70fa6515a9c9b31627e5363c76f4d65d9928b21822f05fe41b92401c SHA512 e993c33820f7606e17ee6ff5a13bdcb91beceec6a8443298ff06a3160052e96caff3aca30908c68a8a695429ec51189a86404b69c5525e5770741637cc63bbc1
 DIST xapian-bindings-1.4.11.tar.xz 1125716 BLAKE2B 0fd4204b4d18c04e017385f5eb116df68daa2f76f528f2b1770e61e5ab5062498aed6ccb57f51ac26ced58912d41c5f5a6f076e0f721a7eb1c3f83e01f2b9523 SHA512 326b08b9959143b92e6c10bd9b6b107ce2779e6ef1a3b5570abd07802a5988dd7df4e890d820f7da355f9f9e64df9a3ae08a0664d70d10ba6f876fca3dc44ecd
 DIST xapian-bindings-1.4.12.tar.xz 1132048 BLAKE2B 56ab098a4d2da4de7e8be2a07581f57957d03cb84b31878c5f449d267060aa620a887f79c968f0ec28cb3a2c9f1f77f8e9e8d29e052c228109b71b0c137d7b71 SHA512 08190a70fe2548be50d82192f94158fd5d6839534b5ba7e0fdbcec7e99df29f0be6517603e7a66a474dffef94ea6bd2e6b7a3315717056687c6a205c25908b45
+DIST xapian-bindings-1.4.13.tar.xz 1132592 BLAKE2B f9498f67da907fba6f58209000bd8056c6654ea53d79806a53d8b17bfedbcb2afb1b91da189feab2bdfd39a3749d4ac20a21ed17c09b99345f575e705f125968 SHA512 20f5f8842e401ba1c1407f336d1a03fa8bc6faa1fcc9533bad1772644ad3ae878a51f10c2f7810f89e3f14683a73c0c089601af548cdf3fbe7feeead4d2d21d9
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
@@ -10,6 +11,7 @@ EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B e28415e8afd6011e49d94dfb66880b
 EBUILD xapian-bindings-1.4.10.ebuild 6533 BLAKE2B aca3605ecf7afbfcd5ac80ced0aefcf75c2b42b9561361116db0779f5650f0e114dfcc610f961c74829faecbd4ef3a867f4c2638929db620fb3b44f7f1b72583 SHA512 e6f6aee19f83d0473afef1a15acfa760d98f21469d4ad6ca02dbd50e41e2db310b7a19d1883823c526da69828b5ecd43ff81379d11d4b815a8ae1dd15b9405c8
 EBUILD xapian-bindings-1.4.11.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
 EBUILD xapian-bindings-1.4.12.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
+EBUILD xapian-bindings-1.4.13.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
 EBUILD xapian-bindings-1.4.5.ebuild 6491 BLAKE2B 29b71eec911c53f3377c1b1ed6bbfc6fda2357b5311f50b28eea850fca465a39e8131e44db9ae72ab040c0d1938e43f987922a6555edc0bf52b3b2f0180505b3 SHA512 f5a8731bbde8be861dcef0c544c4e2b8c12863aa4c4378c055fab2f4b2d4b7b30e63a54bb4490c0379ead90360e60cc5bdc101ca46186a43f573d3436d6184a9
 EBUILD xapian-bindings-1.4.7.ebuild 6493 BLAKE2B a48e6fa3bda13e2d0b43bf3cccbdc3dc23ebd53d00a2462351d11cac50003c15f3f409fd8514bca1fc8631ba6f61cffc0dd62fe1cb1e19f5cc6fbc82cd492249 SHA512 e04b3df07efa3a2fad53ebea36d05ca1f488e05b712f2c785d2b9ed37e9334a05207363a0d8dd260b0050d50bd37fbc9e57ad3d295e2bbc697b7c5cbebb6c296
 EBUILD xapian-bindings-1.4.8.ebuild 6498 BLAKE2B 1f69dae02f5e48291349b97022797062d2bc46783ff4cad3f82e87ac4c5e330ba391beaf44ccdf7360fb23349c4dcf51fab261fb279b9336db9644af7777e685 SHA512 35ca5ee0609d4c11d93418f2bb8dbabda6fe99909bd6d78cfb134868ca6d2b0047065b1b1beb2ea8e4a421ee32345ed361e389b152b10db8e968ee113ac9b248
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild
new file mode 100644
index 000000000000..ec1fbcb8679d
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.13.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-1 php7-2 php7-3"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.9:0/30
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 141852404e0f..ec9e16f6d157 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -3,17 +3,19 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf
 DIST xapian-core-1.4.10.tar.xz 2973780 BLAKE2B 6ef86a4c02e6721f434e33ea27a37ddac9cee62f0c9eed8c6334cadb62dd544be66405dd359dd944cf1ab12742c10e786b7300c4987e33ce33da9d9df4e428d4 SHA512 fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9
 DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
 DIST xapian-core-1.4.12.tar.xz 2979052 BLAKE2B 26b20b22105493679052827a5e6b2890da922cdaa97fca1266b26f6ddb3de6b76d491c37ca10210ef5119ce4250700d87fdd22553456958f6869bc3af51b78ae SHA512 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430
+DIST xapian-core-1.4.13.tar.xz 2985532 BLAKE2B ffe40998f62625eb9b2ee0ebfecbbccaa1838d27229ff16e88a545a6ba514cb61d647c60560c5fcb425588511d1c03836eeda3dfd61a063e96e4bc88b9ca8692 SHA512 aa7b2262dd9d631339131e814f7c96acd85e386a4c4b6331eff86fc7227663589132779bd6b8c340a2b6f19bd66f8b53acbbe5bc985c74f9bdbe3ce3ccf4c1e7
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
 EBUILD xapian-1.2.24.ebuild 1580 BLAKE2B 381e09ce792274d6142ee236e0f1422a7bcb4947cb9efffb3b2e65bb44f5f879d554f871551b02e5482549eebff8b094f242b0399482eed984db6d8aa6b87ed1 SHA512 b9db357b0eeb6d2bfedd9641df740aeba2d435d1618aa6f46dbb2801cf69136d308b5c0c5a41bcfcbdc10fdd09dafa15af1dfac4543ee22de19908b21bb24cb8
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575f0464ea22612543ea0fbdf2024aed6c24c4e741f9f97d9f70f1f4cc83607f1a1a549da056f77c4a271f86fa28 SHA512 abd485682ed6071849ce5b28e9235acf2bf7cb017cda6668ec1409581ca1e6dc528c516087d3ccc6b2757dd2cae700c474e6e65e9fc74e7fe40c634eb94abf81
-EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 796deca4b4bbb01743dc5327fe45b1371a96cbeadf4be2acde95782c576f77587e71339f2d3045e6170bde4f9cd47878a0574ab436a31188e96deaa8e547a51e SHA512 73e54166ded4dd3fafdf78fb7ba6a879539fbbf6a287232c3b18a5c7b49f792d4c607232623f6581a51de5a7b8f39e9fa3fae7af326ed580f26a2019aaa4d53d
-EBUILD xapian-1.4.11.ebuild 1908 BLAKE2B f50d8b8086109ccfc7f108623d024076cf4e8592023bd6d554f55a013be04075eb64de42e85ed18681c2600a7c112e1874ee2dd3b6cc0ea2640c34116ff02a06 SHA512 e09b9b3760512916c32b20466a680d340e7909bfe075b1364ba17e3c9efe0b28a235b3897f18787dd46f12024539964a9e479d85ddba688e192dabcb7a3e0aba
-EBUILD xapian-1.4.12.ebuild 1910 BLAKE2B f0d166cbb01cff61d032e7e9774b6f3ea3395a0ca6cf337f171d4ff053551c9a89cfbdfe502e22d4b9ea74324ddbaf93268069d36452966eec123f8d48f3d041 SHA512 92ff3c91acc80fed730bd920c38649de050d17797251a8a9ba001c7631e28aeb93d7105d51651be5450eb9ba3c6072c4e7b89b088de414eb82b8d4a997dce0d0
-EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
-EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
-EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
-EBUILD xapian-1.4.9.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
+EBUILD xapian-1.4.10.ebuild 1880 BLAKE2B 0bec305e70baf1405b213aa35fb2be9dea8dbe364168484bacfe507d167777be73fc4897a8fdeb9b7e5443f53a31069d11ea2a11e7139607d2c7d0a196c32e69 SHA512 a007af7c24801e6f3c928e0a50224b0fbb6503c343d6fe6a71cafdd255dbfd9c2ce79370a0ee65d95a790b9db06a38ab07e92531f9273fa32dc718e02bc8ce2d
+EBUILD xapian-1.4.11.ebuild 1844 BLAKE2B 0ef54276319620157c37d20dd624ec50245d04f46d480e54fc1306491ff7b9989f426ae0659095efc0278e3114f19ab96630896e0ca6ac0f4c1059b1c915f33b SHA512 58d8597e88cb312251661f469c3ee5711e19ad39b6c7de0e0ca6756b2d1105dd3894229c854d8f59dcd39d61c58b17294d90b0904abbd18b7f60a85834f6ad61
+EBUILD xapian-1.4.12.ebuild 1846 BLAKE2B d4a59440e986bfeb590a7176d829f74bfdf6778046e9a5a9274f29cdc320125283aa0f78febbddc18a45312a37be86182b69d8ad660e1e3d9bba050aeab26b18 SHA512 559b4ed1ac024a7cf3095382a245cc1b21aa40e57c0559a3bdfbb19a4678af6b6d3b8881e3c0bc874545b9bf056fc57cb85776c6ca476f1c636332d1fe9a7c7f
+EBUILD xapian-1.4.13.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
+EBUILD xapian-1.4.5.ebuild 1852 BLAKE2B ba4dc37a4fcbfd32bd26a02c38dce4fe10667335c54b06184128b2fa9d062ddca7550f9e655b487f66c49c3ea9990353c7998e632de5d851499268e29388bfa5 SHA512 d7375562ddee64ea9b414eafffe3dbb168497000aa6b13613dfd2163a6bb1c05658afa85d4c5dd1177edd2be8af7f82e6ea289542a4e90896fabaaf37d9e7a92
+EBUILD xapian-1.4.7.ebuild 1853 BLAKE2B 1463f8d478722ac2dbf314df8bfbd66fcc6d15dcf9c27ed417afaa415c9bd780b7902c916145b213b67f7aaba59823b197943f4ff1aa35c1e619f618364d86e4 SHA512 cd76e9a9306d5dc9e34cfc5aca0d7f90c90da32b9bd48495cd16531af43e4f1c8cfb3f3048514589a36a51b6c79b54ac092408d0709d2a501ad56802abd15b08
+EBUILD xapian-1.4.8.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
+EBUILD xapian-1.4.9.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
 MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
diff --git a/dev-libs/xapian/xapian-1.4.10.ebuild b/dev-libs/xapian/xapian-1.4.10.ebuild
index 0e1129a1b5bb..465bd9228b1b 100644
--- a/dev-libs/xapian/xapian-1.4.10.ebuild
+++ b/dev-libs/xapian/xapian-1.4.10.ebuild
@@ -67,9 +67,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	dosym xapian-config /usr/bin/xapian-config-1.3
-
 	if use doc; then
 		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
 	fi
diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
index 917f435049f5..4d2f6ddf80e8 100644
--- a/dev-libs/xapian/xapian-1.4.11.ebuild
+++ b/dev-libs/xapian/xapian-1.4.11.ebuild
@@ -65,9 +65,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	dosym xapian-config /usr/bin/xapian-config-1.3
-
 	if use doc; then
 		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
 	fi
diff --git a/dev-libs/xapian/xapian-1.4.12.ebuild b/dev-libs/xapian/xapian-1.4.12.ebuild
index fb4146bacb4b..2ea176e5a4b2 100644
--- a/dev-libs/xapian/xapian-1.4.12.ebuild
+++ b/dev-libs/xapian/xapian-1.4.12.ebuild
@@ -65,9 +65,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	dosym xapian-config /usr/bin/xapian-config-1.3
-
 	if use doc; then
 		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
 	fi
diff --git a/dev-libs/xapian/xapian-1.4.13.ebuild b/dev-libs/xapian/xapian-1.4.13.ebuild
new file mode 100644
index 000000000000..26a3827b326f
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.13.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
index 0389bacb3c81..7012501539ad 100644
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ b/dev-libs/xapian/xapian-1.4.5.ebuild
@@ -63,9 +63,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
 	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 799618ef9132..38b6434685fd 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -63,9 +63,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
 	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
diff --git a/dev-libs/xapian/xapian-1.4.8.ebuild b/dev-libs/xapian/xapian-1.4.8.ebuild
index 045ecc97575d..0987e4b4f164 100644
--- a/dev-libs/xapian/xapian-1.4.8.ebuild
+++ b/dev-libs/xapian/xapian-1.4.8.ebuild
@@ -63,9 +63,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
 	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
diff --git a/dev-libs/xapian/xapian-1.4.9.ebuild b/dev-libs/xapian/xapian-1.4.9.ebuild
index 045ecc97575d..0987e4b4f164 100644
--- a/dev-libs/xapian/xapian-1.4.9.ebuild
+++ b/dev-libs/xapian/xapian-1.4.9.ebuild
@@ -63,9 +63,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
 	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index d4bf735560ca..74ca4c019bf6 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,4 +1,6 @@
 AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46
 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
+DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
 EBUILD xmlsec-1.2.28.ebuild 1371 BLAKE2B fc6c926519bf9172d3bc4e868e2b97cde93a63cd170495d95141d4270ed7df1763196e3cf9d5f78204939c5470a4b93a0bdb944401da650432eca4c71c2d6c09 SHA512 b6f80d712fb05f116b8c62cfd65a4332360149031428e62a96b830af149c18769a427e20203efde0004c56220269a696ecc0597dde03a17b13e6cdba0c9874fc
+EBUILD xmlsec-1.2.29.ebuild 1332 BLAKE2B 3e447bf61a7a446f9c4ac70060070d5d29bacf089ae37d43ab2d6a43883a403e55e1c5034e19eefa448588e5018930fc34fcbfbdf421d61f9688898156d3b2d4 SHA512 716f2b2d210cd8e672d52d2bf78cbf3ea4e74cb93b18034258b0019f96b5605c07d50903b2d86c7498c81ff1e0a55357117e4ed3c5bfff84004b3f6a3cbfd501
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
new file mode 100644
index 000000000000..1785b858fc66
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+	>=dev-libs/libxslt-1.0.20:=
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
+	nss? (
+		>=dev-libs/nspr-4.4.1:=
+		>=dev-libs/nss-3.9:=
+	)
+	openssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)"
+
+S="${WORKDIR}/${PN}1-${PV}"
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
+}
+
+src_test() {
+	emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-libs
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)