Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

17 files changed, 48 insertions, 134 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a27e32dbff81..0f902ddf2edb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 3f02634b632a..e9365851d042 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,5 +1,5 @@
+DIST gloox-1.0.20.tar.bz2 701114 BLAKE2B d86b4de05a040b4f7fe1200d5863514778197e7e13ee08ebe983a85255065045c47b322ba20fa4ea051049ce609f122c00374cc3188f46c8729ec904da7778eb SHA512 b94269487875ae32631b5b15eeebe3293c6b8ab4080a6e15926c575305841a609a5e4da25bff266806ef4b65c1db14e9a9e5dabf8af8b174773cbdc37cfa12f8
 DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
-DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
+EBUILD gloox-1.0.20.ebuild 1063 BLAKE2B 5208eac42c29956090260acef6296431d5b11cb97bb228d8226b43d1d79d86a69265a46f68cf8e3db3ad45525f8812dcdd7e4a421cb765c4e08dfeb73dc6de12 SHA512 730a79015e801d6db8fc8cf8a3317fc3c173150afce50d240f9e619d601fa50682e193a4e9ea3c577c303c490a2dc3d355ed22fdf4d51ff4789c7874d9f36fa7
 EBUILD gloox-1.0.21.ebuild 1137 BLAKE2B 4dc96a2de96d178ce47a50557a87d9315bf7c300916d46bbf9d5944e62e4d80098e0b42c624f80970b5397725012de83c519146858ef2bce95dc3b7684392eb1 SHA512 26c80a4ac50faddbd2ec15bfcc45bb217441be6ae16c0d25428f283f82303fd0412cc3f6ec847fbd7caeba2e1dc6a1fea45c82e354c87b69651a5ac264a62a8d
-EBUILD gloox-1.0.22.ebuild 1113 BLAKE2B 14f3bcabe9c03b3047c97202cb7dc9a22f2fd936c414004086e4d3e32f964e206c227fe7a15ea1cc393ce14886bc8873917d743403cae1a792a0714158a1cf25 SHA512 75e0f22dafc9199ad527a2ebaa304f70ee41c07a5b5cb8fceaa31bc83787fdeb0a4e9be4946c17cb0c14bc727360f7750579a90352291316505577854e16f9b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.20.ebuild
index 9b02001ae84f..96432182bb70 100644
--- a/net-libs/gloox/gloox-1.0.22.ebuild
+++ b/net-libs/gloox/gloox-1.0.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 MY_P="${P/_/-}"
 DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
@@ -23,27 +23,22 @@ DEPEND="idn? ( net-dns/libidn:= )
 
 RDEPEND="${DEPEND}"
 
-# GnuTLS checks hang forever
-RESTRICT="test"
-
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
+	econf \
+		--without-examples \
+		$(usex debug "--enable-debug" '') \
+		$(use_enable static-libs static) \
+		$(use_with idn libidn) \
+		$(use_with gnutls) \
+		$(use_with ssl openssl) \
+		$(use_with test tests) \
 		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index e20f3e7debeb..bd0b7ab195ae 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,5 +7,5 @@ DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3
 EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
 EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
-EBUILD gnutls-3.6.6.ebuild 4112 BLAKE2B 6080ebea54c42ed35e91c14095ca880bc577211dc088c95939f9e5d3ee92a7e4714b06378252d669d052dd2bb8996e878c85054e4c1be8c75d8dd2d76470b0a0 SHA512 030fbaa2f9ab17a33689ccf132f9a4a6fbde13e92783695d026e45d441ecfb18a16a7096dbe692520bade70b93cabee69b706b568697bdd0007656ed6c38f052
+EBUILD gnutls-3.6.6.ebuild 4113 BLAKE2B 30c7b3cc09376d34ebcc1c289cb9662b7ae2dec25d4b27e74dd6c93195e4c3d10fb9c61e9c6f34aadd5693137b368924783d3771e77c0bfb7faa0ddf3c336041 SHA512 60a1c024db2ca1cf9760caecb9861d31a9ed32219560e78f784c9214064705466e6d5c7cb473906256562fca8ea4d04c25cd020f9429017eba2fda3dc38c6dfb
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild
index d2050ce4418e..bef3b6871633 100644
--- a/net-libs/gnutls/gnutls-3.6.6.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index bab14638fe32..bbf64a369d45 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,6 +1,4 @@
 DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
-DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
 EBUILD gtk-vnc-0.8.0-r1.ebuild 1701 BLAKE2B 9e04a4d20d36bf14f9494cd84dcfeb841a0b3e5e911d2f610db87e63527fa078a0d0f4ee8369179d2b5641315bd23fd4626c17719a10a3d6ae9014b49e27a2b4 SHA512 45e50f0fac67504a6f573b38f1f40a791b60e14a01bd010e66fd6ef3dea3b1acdc49b0c866df2e44e95cfb4e1ad0f200672c33783b93f6186fc0193fc0b07ed1
 EBUILD gtk-vnc-0.8.0.ebuild 1668 BLAKE2B 2e86531f529ae179dc07cf1a4b71975422fe3abcc06ef3acabeda89fc287d77b73df1ebc238509c806a3d4da62fbc51854622e28532e64d86452ab94af7a2cb0 SHA512 b618a30a9c9503787a819e113457f33978ec85d90e21c7fc41df55fa20c9db88cc64047ca487156e5c353880c5be86bbe92d06d80b87e9d4c5a1a11a928c25c6
-EBUILD gtk-vnc-0.9.0.ebuild 1702 BLAKE2B e98816a1f811bd70ffa1efc76d85ca19ccdd49fb47fbc47db3dae4fcc19d57de072c7cc05a9ccfcb7bd79054a1bc22af8ce4aadd2cd758fdfe9fe0b58b89800c SHA512 2c9b8a9c3378a06f5ebd0079a9ece56136fcb73944edd28450dd491b0342e5a52c13dbdaa24b5b3b0f289bf85788268c0d790cc71ad9116961436176949b6fb9
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
deleted file mode 100644
index c2931f94f27f..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit vala gnome2 python-any-r1
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples +introspection pulseaudio sasl +vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=dev-libs/libgcrypt-1.5.0:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.1.18:0=
-	>=x11-libs/cairo-1.2
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		$(use_enable vala)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--with-gtk=3.0
-	)
-
-	gnome2_src_configure ${myconf[@]}
-}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 76ff4d6d0e51..55d7dedca0c6 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,4 +1,4 @@
 AUX kdav2-0.2.0-qt-5.11.patch 209 BLAKE2B eb03b7877db105894d19d0a597c112f760b68a4d556762b8101f10cb8203a1fd0d417f124065cf0d9dfc1c3f40f5201c8e86bc083073acb3e65bc1ce21f863e0 SHA512 1e7ad2451b709b9c8fc301f4f7975dd725b02ae3f8640b1e172a8ff3fc21e91c62ea892ff42ae298331b20a01f967cfcf047955f87b38082a02553e6314a01d1
 DIST kdav2-0.2.0.tar.xz 49440 BLAKE2B 965f38b854f8aa95b907fbde136fbffdfdf47690e7816cc6a5e3d8014b97a57bad991a0a1aa488a855065eeba50bd7bb73f25ac05ccc9dedee563044da293519 SHA512 ef2510ae36a8e5be0903eb7e576c0f62c5e17d36cb42a9e6f07bb8d06f2e2a46354cf10256509f7c252e58f281f5e32e1c9dae682c421ac96941b7785df6a6a3
-EBUILD kdav2-0.2.0.ebuild 691 BLAKE2B 46079bb8b37b50aad9b9b757bd7cd0f8f9174ba7dd033a931324be8e0fe92e9a53ff19778f5098db98a8a8fac861d54035d10e2b1fe9996d6dadfe95cc92dc84 SHA512 8cb6e46289ac8640b03c6270994cd5c885eabb66a5e6628ebc6797391e7195308bd3b33806bef35f375f974bc006331f0a9890bf4aa396a37ea3789101a1c225
+EBUILD kdav2-0.2.0.ebuild 518 BLAKE2B 8124867db55fdeac5ac251850fe8c351377c9bb569657928b97785d475fe3b66e2cd33c831eb52e7cb9867e8a6869b16e182492356d87c060be041fcdbab710a SHA512 09a3152d2febd5b90863859dc0dd0f8aa70c4b59cb971c32106be0a0e79cff681cdfc27eb712568fef878244dfff4e476e4a78bfaa817739f9096a6b1d4facc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdav2/kdav2-0.2.0.ebuild b/net-libs/kdav2/kdav2-0.2.0.ebuild
index 73115f33bb10..1652b2375aeb 100644
--- a/net-libs/kdav2/kdav2-0.2.0.ebuild
+++ b/net-libs/kdav2/kdav2-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,12 +23,3 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_test() {
-	# disable tests requiring net access, bug #680952
-	local myctestargs=(
-		-E "(kdav2-davcollectionfetchjob|kdav2-davcollectioncreatejob)"
-	)
-
-	kde5_src_test
-}
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 236e3b5fcb2c..7e9b5d76d250 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,6 +1,6 @@
+DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
-DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
-EBUILD libbtbb-2018.08.1.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
-EBUILD libbtbb-2018.12.1.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
-EBUILD libbtbb-9999.ebuild 3637 BLAKE2B 6a71d9abb11b79757b958d9da338af298271d46fee540e6f2e793f211580d942aa8edccda5d1cab78b184800d7a89daca3b010602fa66a220d2e0ae58f419417 SHA512 fa80765d544761e8a9c0d972cbc899f747fc9d9a179b298c49dad0dc9aee3a66492ae345d538814cbaeae6bdd8f8f9490da82427e3f692f84b503e939d586a42
+EBUILD libbtbb-2017.03.2.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
+EBUILD libbtbb-2018.08.1.ebuild 3653 BLAKE2B 3051f5e34d3c75805df4d8b3d3022e096e3c48b0d9a1c170fddd2776af094931c1d4f9081a8f1c14164cda9f11aca5e991fc0f80e40bc79c2e52a9734ac67d2e SHA512 be843fadcc02138fed0f8f7d6ada75a9540e1faa27a6d2eba208d87c8a7af36ac7f099f44d9410201c8ce0967c31b63311df1a938caa5ecdaed00a5e6b29f474
+EBUILD libbtbb-9999.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
 MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2017.03.2.ebuild
index 0fa2d6551dd8..b29bdf569323 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2017.03.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ HOMEPAGE="http://libbtbb.sourceforge.net/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
 	inherit git-r3
+	KEYWORDS=""
 else
 	MY_PV=${PV/\./-}
 	MY_PV=${MY_PV/./-R}
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index 0fa2d6551dd8..998113cc4029 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ HOMEPAGE="http://libbtbb.sourceforge.net/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
 	inherit git-r3
+	KEYWORDS=""
 else
 	MY_PV=${PV/\./-}
 	MY_PV=${MY_PV/./-R}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 0fa2d6551dd8..b29bdf569323 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ HOMEPAGE="http://libbtbb.sourceforge.net/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
 	inherit git-r3
+	KEYWORDS=""
 else
 	MY_PV=${PV/\./-}
 	MY_PV=${MY_PV/./-R}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 22d81fb926d4..1d401e12ea9c 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,3 +1,3 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
-EBUILD libpsl-0.20.2.ebuild 1374 BLAKE2B 26d1fe5f640fef99d3bf2d9cc67da609076bf83fba413bfd8a4b2ee76882bafb04de47e186009f989765414dc668df058dbba42fe925afd3afcfd5a524c05cbb SHA512 256a9fb9313caaf221ac102e1f9a6cc1ca6790e3c1e34460ddc94b4f5b74ad76ba4a484a5c6be0271ed616c7c877699fd4d3547c83e8181def201d381d881a52
+EBUILD libpsl-0.20.2.ebuild 1255 BLAKE2B 12acd8586de06566ec80715e192d1de1f13e0607157926a31bec2a926e1ddd776a0ff54d330f469f7f58d040c856862b754829500ddd1d0a993e2c84fc727d89 SHA512 f572e03390841e4a3e0a0664d23e275b9e00ca973ea509147fa8ff35d504f25b04a458e4fb068ec96d194f8004221d278a446600ace4c75c1afe5e5d1b08846b
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index a395bc9b9de5..58adc0c67916 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="icu +idn +man"
 
+REQUIRED_USE="^^ ( icu idn )"
+
 RDEPEND="
-	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
 	idn? (
 		dev-libs/libunistring[${MULTILIB_USEDEP}]
 		net-dns/libidn2:=[${MULTILIB_USEDEP}]
@@ -32,32 +34,27 @@ BDEPEND="
 	man? ( dev-libs/libxslt )
 "
 
-pkg_pretend() {
-	if use icu && use idn ; then
-		ewarn "\"icu\" and \"idn\" USE flags are enabled."
-		ewarn "Using \"idn\"."
-	fi
-}
-
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-asan
 		--disable-cfi
-		--disable-ubsan
+		--didable-ubsan
 		$(use_enable man)
 	)
 
-	# Prefer idn even if icu is in USE as well
-	if use idn ; then
-		myeconfargs+=(
-			--enable-builtin=libidn2
-			--enable-runtime=libidn2
-		)
-	elif use icu ; then
-		myeconfargs+=(
-			--enable-builtin=libicu
-			--enable-runtime=libicu
-		)
+	if use icu || use idn ; then
+		if use icu ; then
+			myeconfargs+=(
+				--enable-builtin=libicu
+				--enable-runtime=libicu
+			)
+		fi
+		if use idn ; then
+			myeconfargs+=(
+				--enable-builtin=libidn2
+				--enable-runtime=libidn2
+			)
+		fi
 	else
 		myeconfargs+=( --disable-runtime )
 	fi
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index a90834e4c053..0c81ca10ddaf 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,5 +4,5 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3019 BLAKE2B 927adec018c8e02235c0cc6390d1ff4c1c2fd9fe96757e3424389fa53a4310887364d6e4c1c2a375d8fe625cea1f0490b734e5dc6ffcb20a0fc821638344211a SHA512 d07cc7c0c4228f262a43c04edaf39260ec7f95a269969115f8efd3b7357f35054cec7913e46f3bf86837ed792301d0f6b47c96c84ac8eb802d1bea6b11350315
 EBUILD libsoup-2.62.3.ebuild 2930 BLAKE2B 29db8ff029eef9df452555f5a7e3371f48fa2f38212ceb10aed792d95cf069f4fd947eecb52619dc451fee87cb24fd82f3f1f192e654941631d28ad5c3bd323b SHA512 652aa6e4355ad2855cf7f16482754b15c95c14ac4bb7bf4bc0e7b7d2bb5ee6a8793bf2686b179d9d152884f98b511dd53c8cc042e2725710871dd228338873c9
-EBUILD libsoup-2.64.2.ebuild 2786 BLAKE2B d5b7c5ab22b8396ab5d1bd7a60cb19310d656911822958750a88ea21c9b999bc7ad0cf013974362616e39ab1e282582e120417e3e95ee2b7ea35621bfa8ebd59 SHA512 0945f6534c1c7c073cf52191be1fe727e82045e22272364ed87bf4e370f45db8f83014c656508f58a433f3ee1b5a306055654505f793a98877898b144bf6c4f5
+EBUILD libsoup-2.64.2.ebuild 2773 BLAKE2B a00097a031304404192308755c586686bef456c3a885ef7e3e0135b35077b3a380ec5939a70712a5618bee50c036b50a78bbe9d2551c3667409c9419911112aa SHA512 ba5255214e453475cf25aba98ce9b1e52d3bb3edc039545962c5ac7e209f7ba35407558c847a2d83190fad8d4c0463288e1a1e0c701e62f75f6a11d0f64e6844
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index b87a7a92fdbd..be2bc815aed0 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]