gentoo resync : 10.11.2019

36 files changed, 542 insertions, 1377 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4674fc73731d..bc91d41e01d1 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 327f65925a40..9a1f990c2c76 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,5 +1,9 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 AUX libetpan-1.9.3-missing-stddev_h.patch 989 BLAKE2B 49918148deeacc128bb33e8cf56c9f3a56de92fd7206becd5c6e6054979691e17fd1de008f42c0db64c0f72def07bd5fb10178b0eec9ee64c6d6b0f8749bdd56 SHA512 cc9ea9b4c641cbb3b2446252b8ab8b520814ad8584f7fccd3174e31726a59a8445a5af21b6086034891a883887cb69b1d2c38a07e7f8667c0fea518b40a0e058
+AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
+AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
+DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
 EBUILD libetpan-1.9.3.ebuild 2094 BLAKE2B a0fc87cc47d14953ad09b935d74169664a107fb1cf926e107e9c4054aec6f0b65d6ad2f418e86e8e85a2c3cfc6190c0f93c9d9af961a823f5fb41ef20963d5e5 SHA512 033699e03bc14f272cab0f96ca5ca7a1fcfce8eebe830720f069df4f47b7f7cb091065ced9b153841d80432d57c95458c8b9935700ea18e4d761a3c68be48001
-MISC metadata.xml 744 BLAKE2B 8d47251742439a710cc6c6a2130a001a1a66ceb7f358d8ff138b9d9a508a7d2ddf14a3879537f129b755bca1a6548187f15a62f2183c5297e4245fd5cd8ccf3c SHA512 5b732d7d205ade686cb11042918d81b6959549836743a582701f05e161adbf8416beaaf33cbe03b4ec4ffe38d35699803583cd2bddf9e333dd8c93cd7f9a1db3
+EBUILD libetpan-1.9.4.ebuild 2198 BLAKE2B dffcda40ca003f71ccef117150da920bd3c0b0f498af9219d4192ff12e33614c91eef9b0129c1d7083f70264e6f8088fd1770e467c4ec2b159228b91a5cd6437 SHA512 f10e83dc9b8ec6961be171901e1238af7c8286f417125c7800e8407754d162be488197fd8d734dac681f43a1577846d3bb8200f5cfa9094c45151ae7d1fd1c5d
+MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch b/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch
new file mode 100644
index 000000000000..cfe0e8b5dc8c
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch
@@ -0,0 +1,28 @@
+From 1978a0d16bf7f14b863b208d55699b9f46918b7c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 5 Nov 2019 16:31:53 +0100
+Subject: [PATCH] configure.ac: Only check reasonable berkdb versions
+
+https://bugs.gentoo.org/519846
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 542f3bb..8f1edba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -414,7 +414,7 @@ dnl Look for db3 or superior with db_create call
+   case "$DBVERS" in
+     3)
+     AC_MSG_RESULT([version 3.x or above])
+-    for lib in db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db-6.2 db-6.1 db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db; do
+       if test "x$DBLINKED" = "x0"; then
+ dnl        AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
+ dnl installations of libdb4 function names are defined in db.h
+-- 
+2.24.0
+
diff --git a/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch b/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch
new file mode 100644
index 000000000000..8dcb7fd1dc5c
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch
@@ -0,0 +1,24 @@
+From 92bbf41fee9b88bd76377bbeed98fdb848f4af09 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 5 Nov 2019 16:37:14 +0100
+Subject: [PATCH] libetpan.pc.in: Don't put user LDFLAGS into Libs
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ libetpan.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libetpan.pc.in b/libetpan.pc.in
+index cbc1d2c..e0dc774 100644
+--- a/libetpan.pc.in
++++ b/libetpan.pc.in
+@@ -6,5 +6,5 @@ libdir=@libdir@
+ Name: libetpan
+ Description: Libetpan C library.
+ Version: @VERSION@
+-Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
++Libs: -L${libdir} -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+ Cflags: -I${includedir}
+-- 
+2.24.0
+
diff --git a/net-libs/libetpan/libetpan-1.9.4.ebuild b/net-libs/libetpan/libetpan-1.9.4.ebuild
new file mode 100644
index 000000000000..373a43129b37
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	!lmdb? ( berkdb? ( sys-libs/db:= ) )
+	lmdb? ( dev-db/lmdb )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+	"${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
+	"${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
+)
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+
+	if use berkdb && use lmdb ; then
+		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
+		ewarn "Using lmdb as cache DB!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb")
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index 9a31c81aef66..0d6cd4698938 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription lang="en">
 		libEtPan ! is a mail purpose library. It will be used for low-level mail
 		handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 4ecc4f594d91..6c43009aa020 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -2,5 +2,5 @@ AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c7
 DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
 DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
 EBUILD libktorrent-2.1-r2.ebuild 1355 BLAKE2B 6b8e1600b6c8eeb8d447166aeac2310cfc3de7b3ec50df02a087bc8306ed53ef6cb21a9dfb453a136c86ff85d87794db6ac06f17b87edceb6cb731f08f58ab64 SHA512 e11dd93dd788c50b93871d3c1bc8c34fd13bbc3db041933b31a0ab29c3b22f412e31186b977e5347e23b65f04620954e425edfda08302bc09b1122f07b3a2771
-EBUILD libktorrent-2.1.1.ebuild 1373 BLAKE2B 56d5d05762fd9c691fdcaa91e9cbd6fe5aee41209f9ff59d72bdc25e03771fbb6783e8ddb9b2edb79a4e985eab6649b5c3d7b397fc9a968d23bb576c680ed844 SHA512 309addb6a6fa35912c1ce737c1cbd3e263d970f087c9e764bfd53be051aa697b4f9a74d7ef5a68e8ef74b53fd2bb24e494dd4f0ef1d8be8cc468f8695ffdaebf
+EBUILD libktorrent-2.1.1.ebuild 1372 BLAKE2B 70433d1715e5e0d1a77033e5d3405ae50b36b79cb9c02abb75a4553608e89332152d8adbd84ec1bfc04ec5c218d7473b2faca2ca5b7c80f7302e837e0aff87c1 SHA512 142cb7a539e5248e0e679c85a2d7996819f3f8efcfa6a2a6401f718164c3cf410c56c337fe4987988cf39f280e71107500b764a6b55843d063eac8f0cf530e23
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index 4c1d065c3ba0..34a552aa1dc0 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
 SRC_URI="mirror://kde/stable/ktorrent/5.1.2/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index c98a8059a3c0..d0ca77110c1a 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,13 +1,11 @@
 AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815a33f6d5cd21fc3bebe1e31a26ac3b17be27c4e3a5bd7b379bcc42705438b657576e28b597eaae786aa2319972f587b07e790 SHA512 6335e63cdf537700a60f8eeae940d963d582e9373e1ea6a14b7960a52e1c61464785134ec14bbe49ededf7554f0715fdb4d59565d1c9870f8a0bc5524538286e
-AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
 AUX libtrace-4.0.9_p1-SIOCGSTAMP.patch 339 BLAKE2B 6faa812fa2c70eb6144e0750d937196c1e252ae5d3f04751fef3f5198d662b89920823af554007c88600ade0b735bf8caaafa636ca810cacaae51e9d7a7da010 SHA512 208a64062828757737f43cff85e8468df6816fb747aadfcc3d6747efe43a9846b737a0a416ce70d91e74e9ecdec7217f094740803942a809206ccf1c29d0484d
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
-DIST libtrace-4.0.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
+DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
 DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57
-EBUILD libtrace-4.0.8.ebuild 1147 BLAKE2B 6671032674a7a22903830ecc9f2ed9ae8092db6d930a00ac5dc9b57f0f44a42e488997909a5d05ad9b2ecf7f001ec913a6f193e384455707e68b7c2863801349 SHA512 7e7c141d9b4529568401dbc8789ca489ff94390dbc31ec19e9cf3eb633d3ad279400e62279626468141f0c98a1295a265f204622fd7cb1aea363fa0da3237a33
-EBUILD libtrace-4.0.9_p1-r1.ebuild 1231 BLAKE2B b546dddbdeb5fa16e9e463f1bc17742269a66e481871d675ada0e780cf325dff48e09cc3888a29dfd323fc29af4ce755c7043bd8e69300a372bf88fc5a0330da SHA512 3cb7d81477146295aeb8ad0ad9902163eb13151318c1879e18cf7138d3573af93376034c560674c1751a1f2e0068b92c0c9ef1c535a15ad376055a34005bd92f
-EBUILD libtrace-4.0.9_p1.ebuild 1183 BLAKE2B 335894903da0d4c3f7e1d7e22a9f35219aef687f831fa17d5ba752334b0fd73308f92198280a3e86e0802e68ad3c7a20ca32f3c20feaab648ad0595164d8a5c0 SHA512 e42d78f87636f6686e50933698870b508b3d54d5bc4704932b1e0e60de5ab6915965622878c7712b2ac0092daa04a0a57bf637ce0ef939d3586fe2fc7008d89a
-EBUILD libtrace-99999.ebuild 1132 BLAKE2B 8bf7a1a7a87b930c3e5f5da6fe426ed6662a2ec702f7479946cc769901d989e7ecfe4553472b2b96da356ff8c6c9aa5425056629c26a599e17d57be6dd793ff2 SHA512 3dffc3729ecf8222019684d3e3a599e411944bb3597eabea4fa9067d43d98eee0fee681d676e4d6e0b6ae48ffef99d04cda32fda87df3ec6b2ebd2654f279cc6
+EBUILD libtrace-4.0.10_p1.ebuild 1188 BLAKE2B 86e71cf293e917c642cd7cab5dc84d313d59523e4c39d4cf0dc631379425567d5a1a3473b5141e580c79fe9d2142d986d50f70b2d1f4a415cf5c2fe2f54363d4 SHA512 2306fcaf9c073c5fc1efd2ba65f53a9a1cff8422219ebdd4e7cac417f1f054a34012227a36c6276677855ef326435ced8010f681b10981f134b8b493a6bd62be
+EBUILD libtrace-4.0.9_p1-r1.ebuild 1236 BLAKE2B 9c3de6e6ed4995e5c6416a45aa736de57d1f59718e8f2a7b0a11b31ab78d603ab4724e8b20571bab824127dcf251a26aa3f1cce12e1cb8ae5bba601d51b26bf1 SHA512 dfa06db00e1f91edef9a85e7676c037909fe6284048960e6eb00b13a4b1e30e78044d3fe62c330b5dcd6ea9f26ac2dd6656a55f64a901289f0baa6904875fef4
+EBUILD libtrace-99999.ebuild 1137 BLAKE2B 5cac4a82cfce786feb793d812c6b2fea914059dc4b71e040d311a2179519997b92aa923cd59ffaaa7aa1e2b2fbb1ecd687a52a89c448da8811e08612a83d4300 SHA512 efc7190c30c9eecdea3efa4dbafcfcf0082a79d37aeae13f7e0b937c4ea8a48df821961c78dc871955712a129239c23149eae56acb9b7380a0cdf832eb87b9c8
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
deleted file mode 100644
index 9bda8a43b6b2..000000000000
--- a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/tools/tracetop/Makefile.am
-+++ b/tools/tracetop/Makefile.am
-@@ -6,6 +6,6 @@
- include ../Makefile.tools
- 
- tracetop_SOURCES = tracetop.cc
--tracetop_LDADD = -lncurses 
-+tracetop_LDADD = @ncurses_LIBS@ 
- tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
- endif
---- a/configure.in
-+++ b/configure.in
-@@ -492,6 +492,8 @@
- 	fi
- fi
- 
-+PKG_CHECK_MODULES(ncurses,ncurses)
-+
- AC_ARG_WITH([ncurses],
- 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
- 
diff --git a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
index 4b4153bf1f2e..3aa5b658572d 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.10_p1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig
diff --git a/net-libs/libtrace/libtrace-4.0.8.ebuild b/net-libs/libtrace/libtrace-4.0.8.ebuild
deleted file mode 100644
index 907621355b7f..000000000000
--- a/net-libs/libtrace/libtrace-4.0.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A library and tools for trace processing"
-HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses numa static-libs"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-	dev-libs/openssl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	net-libs/wandio
-	numa? ( sys-process/numactl )
-"
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-3.0.20-tinfo.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-)
-S=${WORKDIR}/${P/_beta/}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ncurses) \
-		$(use_with numa) \
-		--with-man
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r docs/doxygen/html
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
index 84bdf221362d..0055faaec1ad 100644
--- a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
index ab6f21285b87..f9a910c5b3a0 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-99999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-doc/doxygen
+	app-doc/doxygen[dot]
 	sys-devel/flex
 	virtual/os-headers
 	virtual/pkgconfig
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 96ebdefb5d2c..9f2491af7d72 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,12 +3,14 @@ AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5
 DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc
 DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8
 DIST node-v13.0.1.tar.xz 31986844 BLAKE2B f30937878ef68fe94b69912b994b84c03d75fd92e243d77453cfa7d335e9e1a37ce4f18eb1cbba141ff9a017a777e31ae64261f46dbf17d1f6ff0d6d5c263a2a SHA512 a39a64761ef3867379f3a2ef230f65ddeb91fb93d8833c1ada7312588fd75d060f4d73df1a106f7d7cc08886ac7c5335d453e4d882c8cdde28a25a0a8cbcbfa6
+DIST node-v13.1.0.tar.xz 31981260 BLAKE2B a7c9a8d851b22f3cb24132adad0c0e971401c1555951fffc2bd69b3b8bcfc295fdebde6918a467203c30bd62f883f5997f6ec57c7197854187ef78a56e52a8e8 SHA512 fa05064980c47f58b6f3e3590ca94b45850184c86d79cc2f1e489222685cb38ca7c8e0e7bc7b9dceec1148256c2ae7bcf3ddc6468c6b366a4281d77c1c20b699
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
-EBUILD nodejs-10.17.0.ebuild 6279 BLAKE2B 8eb86a20ee7b128cf6f367e6d1e0c4e3f59fa2920304b4715c98f2b93c2b3ef65df529f3be5dab0c84e41eb9197f42ef0931a832e6b2d8781f417c02af4ca572 SHA512 ee699e5805e2295ad1f06a022d7696b184d1e9ec504e4f7f468fcf04b8f003700f13cad2a1b6cda9be46debd4cc07c98379b7aec6cbb1f4a74be0cae37d98fcc
+EBUILD nodejs-10.17.0.ebuild 6278 BLAKE2B df926c7b35183086ec1a51690071f91aa2790d9c85923a7d090067b7b572ca14c6f9458b213a4da0c977cc1e57c81cc4cc5cb8460958b136d4b9ec15ccdcb0e5 SHA512 96cf76a295ad2de4ec003d103cb484889ca1ab4efe829fa069424cf2dbcd9ce2e85c5e817fb188b00d7290f2a7bad388f3d21e91134dcdb8413ccc9715fbd982
 EBUILD nodejs-12.13.0.ebuild 6402 BLAKE2B 2f90c426ffd9373534fb9ff5963b7a52735758695cb52e290affcddc95dd5963ad48c2cee68569976fe072ccfd2196fde6a7a6308c2bba231da2e46c3e6c99c8 SHA512 4192e1501436e59849ecd9ca126e351c2bcbc662f41aa8e2aa639e325f5c201ad41bc5128d7132d488c82a6506144b548ad03a0fcab9fa2375a92e50e90c8794
 EBUILD nodejs-13.0.1.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
+EBUILD nodejs-13.1.0.ebuild 6140 BLAKE2B 53b80f89d2189a92c455cfbd7f4652378feddaf693f9c33da0388b6e548214567e6c1a6ed494cb99d44b74c58ba508da194d266191eae670e7a3d53cfef990c5 SHA512 e3193d01c1c1b8c11b9b1245dd97c925b04eea96e46d61c44c6f1f624cda2b9ab4d1d0d4dc8e509a71c968fb121b25e7b5a63ca0ba9bfd8f326f227cfc1081ab
 EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
 EBUILD nodejs-8.16.2.ebuild 6476 BLAKE2B 62c1c56423c4673f9eb40717c3636cd8262d8972a9ea8cc83d24bc3b7d6bf9a62c4273ff5e6103eae53def7079b3b46ef4c25fc0a6b920de1d8b5ec6c0732dbf SHA512 723231c6e64f60c9643358769fa0f6d55f1ec5405272f89a1ab7fbb1d9e8cafc7fc388505040395c2f040a8b344b0eff1a704454a459365d25a4e855f897983b
-EBUILD nodejs-99999999.ebuild 6261 BLAKE2B 993b25d35bef4f54655c6bc9c8679b1ef667c2130add32a2bbff2c3a521bfe1ddde903b021fbec291af1fc205b1226fa1062fb722f57a39b34faf58211831f43 SHA512 cae49616d8151ab0cfa590080cfe0263666900a2bbf7b0cc278192b096cdd24b365943ead6aeb8b894a91b2dacc3377a82de9ec47bc1a5b94495f05b446731ca
+EBUILD nodejs-99999999.ebuild 6029 BLAKE2B 0be5bdafa6ad7978d491f618d27d59e1b6b8c2a4ce02a6240d522707c0d1d744a1dc743fefa646639afb2cc31aafc7e0fa7fd5c47d54e4fb9220e42d6f032397 SHA512 ef9aa58e872621f77875a4b22bc1e33d599729c4c0fbb20d5f9d2076f32091506191d0277485f6e816ef756bb606fd9d479dbab8c253b7b0bda348ca2cbf8499
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.17.0.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild
index 1b63a38abb43..e9ac2965862f 100644
--- a/net-libs/nodejs/nodejs-10.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-13.1.0.ebuild b/net-libs/nodejs/nodejs-13.1.0.ebuild
new file mode 100644
index 000000000000..64dd1ca4d151
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.1.0.ebuild
@@ -0,0 +1,205 @@
+# 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}} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.33.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 1b6515a23d40..e5e6f8a9d81c 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads"
+PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
@@ -22,7 +22,6 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
@@ -93,8 +92,7 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
-		--shared-zlib
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -144,11 +142,6 @@ src_install() {
 	done
 
 	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
 		docinto html
 		dodoc -r "${S}"/doc/*
 	fi
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
deleted file mode 100644
index 82bf735bea6d..000000000000
--- a/net-libs/openslp/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX openslp-1.2.1-cflags.patch 400 BLAKE2B c75bc95462bed807a7be89ff021546e6a5449825af13ace3cb2a47158446dbdbf69e946183a8001ec13a1d4dd9fbb2f94979e4c6c9f7fe29490049cc6dc3e304 SHA512 cb3c5a71ce9eb23daa2c25829549942b18e75472cda8d76d99bcae1371615f48f8de5bc126b266b51f4cc009049ccbbdb7958e0c09fe34d887da5af6c117c5ec
-AUX openslp-1.2.1-fbsd.patch 346 BLAKE2B 0d956ce244599bb05d20c9e044e9b5e7f34fe84f86e4b30df49de78ae78e509ff6e12226ef1adac20fd965369e8474b2e18d307fff3af63de8bf466f50c93df5 SHA512 7e8aeb152791d004fddd45c4ac8152f0df849f73b8428357476cfaf2a67c3418581dd05da439a9c856dcef0c6e231da13050ac8bc93d0f186dff2c644f407457
-AUX openslp-1.2.1-fixoverflow.patch 506 BLAKE2B 9c81856d9d6cbabda57aef94966409ebd90a2db63c9f363b94e028a9e3df1806de81f1132cd27613bfbeff4da4b6fd1529a166e8b4dbc9415976e667fb2cba1c SHA512 a0f4dd64513a481fa6fff9fd7b5efc7b2b8ffcd6df0463cba6ae1508897af7269bdd061ee28c7868dfe9d9cbc61bb880791629ce7bcd51272a1df50460a7e20f
-AUX openslp-2.0.0-CVE-2012-4428.patch 1714 BLAKE2B af7d4b8f550eacbddffcf63577bd300b2b3e95f6b2899659d123d281b0f8a442afacc3de1cdda713f42b03d0f1b1cf5eff4009a24d26f904c637a530c804c4ea SHA512 f83e0e4d0ea0b5ef01ca7eb94089d48a68b113cd51aa3234aa2b02e8733ae5eab33ea171fce11d6e0ee28996bb270ec2b0615ca3cc04ac6df6e3519f6d93c802
-AUX openslp-2.0.0-CVE-2016-4912.patch 677 BLAKE2B e1e66752fc5019933a03a5d868cdc90ea94ea44f45179d654d2c9a4e00dd8c3270f477d564656b18705f8ec4ebedf52c65f7d28231e12410f848bebd826ec4fd SHA512 ff577e831c31f16f37fc4d6268e8876364125fcbc92afa4e7e9371353a0a409bd98a764dd2b1553aa8fbc921b9fcb8a3369ca20c2612db217a6be7979efbe1ec
-AUX openslp-2.0.0-CVE-2016-7567.patch 2994 BLAKE2B 8a4e8c7f2a8200ab3014968da3082992435205532242cd83be376726599ad863cc54ad0d8bdc44c0051abf16d6d46a6091d565470b0ef2598e346f7ff7df7159 SHA512 44651a49bc43f1fb23b2621f39a6eb7f6329a76436460ef68a41b213f3037229e3a97006cec9b4206c461237532cbd04f3bd9d1a1bb59c96e0c37f5af0ae9e7e
-AUX openslp-2.0.0-cflags.patch 814 BLAKE2B 1060269370c3b7fd26980fc1371913d77572baaed645cdd9fcafbc69f78f0c8911b10f3a2becb818464efe78bb9b05e0e7524de35720baa89a3cc424bbc8b7e8 SHA512 d21b2c839d34e22c46ffc67e7011564ea99f39d5f2a1dc45a5d925944187942f82069177462fe6a04d139d90188dfc354ca12229698ea84f891b4b58a4083a55
-AUX openslp-2.0.0-namespace.patch 29475 BLAKE2B 22243ab35f2e975ae78ebcdbaa4f9eb7ed34338db77047efe1247f00148c901ef82b42c051b4c8101fc7aa1a3f4b13f97e4270ca857de7837fa01ae094867a70 SHA512 1fb64ac5990356e5f98e4fd76038c6c51f9632163b68850d44cecc136fafdf4639ee187f9e879aba08f99c8fc79ca8f4e735b4253ab59af7b7120d1f119f20f2
-AUX slpd-init 2206 BLAKE2B 4a78fdc11f5df523d0adddb57aac17550cde275585fa692779d9c72d4844894c09efe2550551f3c1ab239b509beb43bec2a0744e1e2ec90ab9798cf8bc2e667f SHA512 f76e98cfd48303d3095f2c9af0e81da7fd2def6d62fcadb881e64dd565af354cff65325d678c6d78cb62fffab67723513c1818a5f5c7606f21aa3a651bd8722b
-AUX slpd.service 203 BLAKE2B 9cb80f3eecf7fe569ec37ae7730668fd232b7803fb1e66a4d38d94f28c9ff5248225b86772e2271b77c99931c6e61cfa587745f41bdf36e18658829fea9e86b5 SHA512 189bc5ffe034ab4effdf4187f28110f028452fc9f6e27ff6c44681410b205eba4fb0412b5dd112d27596cef5e2143be6c722a2d5592d803d29dd25e4722ab6ce
-DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e85a7e0f3b24c2a29195d39465807f967845958baaa567a7dd2d2bc8cff55eb1d910f43a6e54276673719596c9e SHA512 34742d88e772d7dba5c6fab1ccb7bf27d6174c5ca429aec406472994bcd806bfaf16dd86fce2ae4c51659587e99cced2436cf36772f6e086f7b87275fb1b19b6
-DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
-EBUILD openslp-1.2.1-r3.ebuild 1001 BLAKE2B aa0dd2d21e1edbb95d732571a8886700dd247d045060b899ddb055a5e2b517d7e8368d1c5bdaf3fdd35644210eb50468d82ba7647eab169ad41c84db83669d24 SHA512 539dc488e2c4f71a798ead2603bfcd1899ec5322ff5701ae726519e9acad8ceec5ad079d44961fc0f524ff62daafb4cf5c72657ad8127e73eae7835b35bd0898
-EBUILD openslp-2.0.0-r4.ebuild 1050 BLAKE2B c3409f971baaf611f3de85a8e62c07122593a2c90954d5069b90a90793ac6bae82c1a142409292d9eeaef81679c108b506fff441d0d4b41a77b291dbae770995 SHA512 28f441d530c28a82cfe273fceb9b8b336814469bb421e024613744866242b0599bfd154d2003f32c27ae66d983a7fc786165085a89c06dd1f2fde3f4f2650aee
-EBUILD openslp-2.0.0-r5.ebuild 1113 BLAKE2B a932170bd9e0cb664863ef50f168fe31dcbfd401db7eb68dd26970e17d26746725e94925cd524b6fac27c991f9be725c40435be03ff27c63a544c22d173c57fb SHA512 13427668a080e170b1004eace6c5195fde325552889c62f9d83d6d1dda230490559e7bdae25d9008ee0670b5fe29a7b2f0ef7eac54625fc889bbd05c3f5f98ee
-MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/files/openslp-1.2.1-cflags.patch b/net-libs/openslp/files/openslp-1.2.1-cflags.patch
deleted file mode 100644
index a9a1d2634e7f..000000000000
--- a/net-libs/openslp/files/openslp-1.2.1-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN openslp-1.2.1.orig/configure.in openslp-1.2.1/configure.in
---- openslp-1.2.1.orig/configure.in	2005-02-15 21:06:02.000000000 +0100
-+++ openslp-1.2.1/configure.in	2012-01-24 23:49:13.000000000 +0100
-@@ -153,7 +153,6 @@
-         OPTFLAGS="-O"
-     fi
- fi
--CFLAGS="$CFLAGS $OPTFLAGS"
- 
- dnl ***********************************************************************
- dnl Checks for header files.
diff --git a/net-libs/openslp/files/openslp-1.2.1-fbsd.patch b/net-libs/openslp/files/openslp-1.2.1-fbsd.patch
deleted file mode 100644
index dac041516f23..000000000000
--- a/net-libs/openslp/files/openslp-1.2.1-fbsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: openslp-1.2.1/common/Makefile.am
-===================================================================
---- openslp-1.2.1.orig/common/Makefile.am
-+++ openslp-1.2.1/common/Makefile.am
-@@ -24,6 +24,7 @@ libcommonlibslp_la_SOURCES = \
- 	slp_parse.c \
- 	slp_pid.c \
- 	slp_dhcp.c \
-+	slp_net.c \
- 	$(slp_v1message_SRCS) \
- 	$(slp_security_SRCS)
- 
diff --git a/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
deleted file mode 100644
index c02d8407fb3b..000000000000
--- a/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openslp-1.2.1/slpd/slpd_socket.c	2010-09-11 16:31:47.325871093 -0500
-+++ b/openslp-1.2.1/slpd/slpd_socket.c	2010-09-11 16:31:55.706851189 -0500
-@@ -183,7 +183,7 @@
-     memcpy(&mreq.imr_multiaddr, maddr, sizeof(struct in_addr));
- 
-     /* drop for the specified interface */
--    memcpy(&mreq.imr_interface,addr,sizeof(addr));
-+    memcpy(&mreq.imr_interface,addr,sizeof(struct in_addr));
- 
-     return setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char*)&mreq,sizeof(mreq));               
- }
diff --git a/net-libs/openslp/files/openslp-2.0.0-CVE-2012-4428.patch b/net-libs/openslp/files/openslp-2.0.0-CVE-2012-4428.patch
deleted file mode 100644
index 28564c007cf3..000000000000
--- a/net-libs/openslp/files/openslp-2.0.0-CVE-2012-4428.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Description: Fix out-of-bounds buffer access (CVE-2012-4428)
- Fix handling of string-list in common/slp_common.c by not increasing
- the item pointer past the string-list pointer, and letting '\\' only
- escape the item separator ','.
-Author: Guillem Jover <guillem@debian.org>
-Origin: vendor
-Bug: http://sourceforge.net/p/openslp/bugs/122/
-Bug-Debian: https://bugs.debian.org/687597
-Last-Update: 2014-07-25
-
-Strangely nobody seems to have fixed this in openslp-2.0.0 ever. 
-Patch forward-ported; one chunk isn't needed anymore as the code has been
-independently rewritten. Andreas K. Hüttel <dilfridge@gentoo.org>
-
-
-diff -ruN openslp-2.0.0.orig/common/slp_compare.c openslp-2.0.0/common/slp_compare.c
---- openslp-2.0.0.orig/common/slp_compare.c	2012-12-12 20:12:43.000000000 +0100
-+++ openslp-2.0.0/common/slp_compare.c	2017-02-18 19:59:55.296473698 +0100
-@@ -587,13 +587,10 @@
-         /* seek to the end of the next list item */
-         while(1)
-         {
--            if(itemend == listend || *itemend == ',')
--            {
--                if(*(itemend - 1) != '\\')
--                {
--                    break;
--                }
--            }
-+            if(itemend == listend)
-+                break;
-+            if(*itemend == ',' && *(itemend - 1) != '\\')
-+                break;
- 
-             itemend++;
-         }
-@@ -683,9 +680,10 @@
-       /* seek to the end of the next list item */
-       while (1)
-       {
--         if (itemend == listend || *itemend == ',')
--            if (*(itemend - 1) != '\\')
--               break;
-+         if(itemend == listend)
-+             break;
-+         if(*itemend == ',' && *(itemend - 1) != '\\')
-+             break;
-          itemend++;
-       }
- 
diff --git a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch
deleted file mode 100644
index d8a0eca0d3d3..000000000000
--- a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-null-pointer-deref.patch
-See also https://bugs.gentoo.org/show_bug.cgi?id=583396
-
-diff -up openslp-2.0.0/common/slp_xmalloc.c.orig openslp-2.0.0/common/slp_xmalloc.c
---- openslp-2.0.0/common/slp_xmalloc.c.orig	2012-12-07 01:52:08.000000000 +0100
-+++ openslp-2.0.0/common/slp_xmalloc.c	2016-05-23 12:58:57.953532979 +0200
-@@ -203,6 +203,8 @@ void * _xrealloc(const char * file, int
-       if (x->size != size)
-       {
-          newptr = _xmalloc(file, line, size);
-+         if (newptr == 0)
-+            return 0;
-          memcpy(newptr, ptr, x->size);
-          _xfree(file, line, x);
-       }
diff --git a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch
deleted file mode 100644
index 2d54fa04bfce..000000000000
--- a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-See
-http://www.openwall.com/lists/oss-security/2016/09/27/4
-https://bugs.gentoo.org/show_bug.cgi?id=595542
-
-diff -r 598821da69f2 -r 34fb3aa5e6b4 openslp/common/slp_compare.c
---- a/common/slp_compare.c	Sat Jun 08 15:14:45 2013 -0600
-+++ b/common/slp_compare.c	Mon Nov 30 20:50:12 2015 -0700
-@@ -194,7 +194,8 @@
-  * @return The new (shorter) length of @p str.
-  *
-  * @note This routine assumes that leading and trailing white space have
-- *    already been removed from @p str.
-+ *    already been removed from @p str. It also assumes that @p str may
-+ *    not be null-terminated.
-  */
- static int SLPFoldWhiteSpace(size_t len, char * str)
- {
-@@ -203,11 +204,11 @@
-    {
-       if (isspace(*p))
-       {
--         char * ws2p = ++p;         /* Point ws2p to the second ws char. */
--         while (isspace(*p))        /* Scan till we hit a non-ws char. */
-+         char * ws2p = ++p;            /* Point ws2p to the second ws char. */
-+         while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
-             p++;
--         len -= p - ws2p;           /* Reduce the length by extra ws. */
--         memmove(ws2p, p, ep - p);  /* Overwrite the extra white space. */
-+         len -= p - ws2p;              /* Reduce the length by extra ws. */
-+         memmove(ws2p, p, ep - p);     /* Overwrite the extra white space. */
-       }
-       p++;
-    }
-@@ -821,6 +822,50 @@
- 
- #ifdef SLP_COMPARE_TEST
- 
-+/* Test boundary conditions of SLPFoldWhiteSpace. */
-+static int test_SLPFoldWhiteSpace(void)
-+{
-+   static char test_str0[] = "    ";
-+   static char test_str1[] = "Blah";
-+   static char test_str3[] = "Blah  blah";
-+   static char test_str4[] = "Blah   blah";
-+   static char test_str5[] = "Blah blah  blah";
-+   static char test_str8[] = " Blah blah";
-+   static char test_str9[] = "  Blah blah";
-+   static char test_strC[] = "Blah blah      ";
-+   static char test_strD[] = "Blah blah  xxxx";
-+
-+   static char * test_strs[] =
-+   {
-+      test_str0, test_str0, test_str0, test_str1, test_strC,
-+      test_str3, test_str4, test_str5, test_strC, test_strC,
-+      test_str8, test_str9, test_strC, test_strD,
-+   };
-+
-+   static int test_lens[] =
-+   {
-+      0, 1, 2, 4, 9, 10, 11, 15, 10, 11, 10, 11, 11, 11,
-+   };
-+
-+   static int test_fins[] =
-+   {
-+      0, 1, 1, 4, 9, 9, 9, 14, 10, 10, 10, 10, 10, 10,
-+   };
-+
-+#define MAX_BUFSZ 32
-+
-+   int i;
-+   for (i = 0; i < sizeof(test_strs) / sizeof(*test_strs); ++i)
-+   {
-+      char test_buf[MAX_BUFSZ];
-+      memmove(test_buf, test_strs[i], test_lens[i]);
-+      int len = SLPFoldWhiteSpace(test_lens[i], test_buf);
-+      if (len != test_fins[i])
-+         return -1;
-+   }
-+   return 0;
-+}
-+
- /* ---------------- Test main for the slp_compare.c module ----------------
-  *
-  * Compile with:
-@@ -840,6 +885,9 @@
- 
-    int count;
- 
-+   if (test_SLPFoldWhiteSpace() != 0)
-+      return -1;
-+
-    /* *** SLPContainsStringList ***
-     */
-    count = SLPContainsStringList(sizeof lst1 - 1, lst1, sizeof str1 - 1, str1);
diff --git a/net-libs/openslp/files/openslp-2.0.0-cflags.patch b/net-libs/openslp/files/openslp-2.0.0-cflags.patch
deleted file mode 100644
index b77261ee1f6d..000000000000
--- a/net-libs/openslp/files/openslp-2.0.0-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN openslp-2.0.0.orig/configure.ac openslp-2.0.0/configure.ac
---- openslp-2.0.0.orig/configure.ac	2013-06-08 06:58:54.000000000 +0200
-+++ openslp-2.0.0/configure.ac	2013-07-12 22:17:15.000000000 +0200
-@@ -240,7 +240,6 @@
-     OPTFLAGS="-O"
-   fi
- fi
--CFLAGS="$CFLAGS $OPTFLAGS"
- 
- #
- # Configuration and output
-diff -ruN openslp-2.0.0.orig/etc/Makefile.am openslp-2.0.0/etc/Makefile.am
---- openslp-2.0.0.orig/etc/Makefile.am	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/etc/Makefile.am	2013-07-12 22:28:20.000000000 +0200
-@@ -3,8 +3,8 @@
- dist_sysconf_DATA = slp.conf slp.reg slp.spi
- 
- #make sure the slpd log directory is there
--install-data-hook:
--	mkdir -p $(localstatedir)/log
-+#install-data-hook:
-+#	mkdir -p $(localstatedir)/log
- 
- ##install-data-local:
- ##	mkdir -p $(DESTDIR)$(sysconfdir)
diff --git a/net-libs/openslp/files/openslp-2.0.0-namespace.patch b/net-libs/openslp/files/openslp-2.0.0-namespace.patch
deleted file mode 100644
index b5e817877406..000000000000
--- a/net-libs/openslp/files/openslp-2.0.0-namespace.patch
+++ /dev/null
@@ -1,773 +0,0 @@
-# HG changeset patch
-# User John Calcote <john.calcote@gmail.com>
-# Date 1491588156 21600
-#      Fri Apr 07 12:02:36 2017 -0600
-# Node ID 51ed69107d096c5b9886954d89e0709975d5aa15
-# Parent  c1c294ce953e35f757020b01314cfc49556ccc0c
-BUG#149: cleanup libslp namespace; fix ctype function calls throughout.
-
-diff -ruN openslp-2.0.0.orig/common/slp_compare.c openslp-2.0.0/common/slp_compare.c
---- openslp-2.0.0.orig/common/slp_compare.c	2017-06-10 01:15:33.214875294 +0200
-+++ openslp-2.0.0/common/slp_compare.c	2017-06-10 01:16:39.072878034 +0200
-@@ -83,9 +83,10 @@
-  *
-  * @internal
-  */
--int strncasecmp(const char * s1, const char * s2, size_t len)
-+int slp_strncasecmp(const char * s1, const char * s2, size_t len)
- {
--   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
-+   while (*s1 && (*s1 == *s2
-+         || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
-    {
-       len--;
-       if (len == 0)
-@@ -93,7 +94,7 @@
-       s1++;
-       s2++;
-    }
--   return len? (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2): 0;
-+   return len? (unsigned char)*s1 - (unsigned char)*s2: 0;
- }
- # endif
- 
-@@ -113,11 +114,12 @@
-  *
-  * @internal
-  */
--int strcasecmp(const char * s1, const char * s2)
-+int slp_strcasecmp(const char * s1, const char * s2)
- {
--   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
-+   while (*s1 && (*s1 == *s2 
-+         || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
-       s1++, s2++;
--   return (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2);
-+   return (unsigned char)*s1 - (unsigned char)*s2;
- }
- # endif
- #endif
-@@ -202,13 +204,13 @@
-    char * p = str, * ep = str + len;
-    while (p < ep)
-    {
--      if (isspace(*p))
-+      if (isspace((unsigned char)*p))
-       {
--         char * ws2p = ++p;            /* Point ws2p to the second ws char. */
--         while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
-+         char * ws2p = ++p;                           /* Point ws2p to the second ws char. */
-+         while (p < ep && isspace((unsigned char)*p)) /* Scan till we hit a non-ws char. */
-             p++;
--         len -= p - ws2p;              /* Reduce the length by extra ws. */
--         memmove(ws2p, p, ep - p);     /* Overwrite the extra white space. */
-+         len -= p - ws2p;                             /* Reduce the length by extra ws. */
-+         memmove(ws2p, p, ep - p);                    /* Overwrite the extra white space. */
-       }
-       p++;
-    }
-@@ -276,9 +278,9 @@
-    char *upd = dststr;
-    while (len > 0 && *srcstr)
-    {
--      if (isspace(*srcstr))
-+      if (isspace((unsigned char)*srcstr))
-       {
--         while (isspace(*srcstr) && len > 0)
-+         while (isspace((unsigned char)*srcstr) && len > 0)
-          {
-             ++srcstr, --len;
-          }
-@@ -311,7 +313,7 @@
-       }
-       else
-       {
--         *upd++ = (char)tolower(*srcstr++);
-+         *upd++ = (char)tolower((unsigned char)*srcstr++);
-          --len;
-       }
-    }
-@@ -340,15 +342,15 @@
-    char * cpy1, * cpy2;
- 
-    /* Remove leading white space. */
--   while (str1len && isspace(*str1))
-+   while (str1len && isspace((unsigned char)*str1))
-       str1++, str1len--;
--   while (str2len && isspace(*str2))
-+   while (str2len && isspace((unsigned char)*str2))
-       str2++, str2len--;
- 
-    /* Remove trailing white space. */
--   while (str1len && isspace(str1[str1len - 1]))
-+   while (str1len && isspace((unsigned char)str1[str1len - 1]))
-       str1len--;
--   while (str2len && isspace(str2[str2len - 1]))
-+   while (str2len && isspace((unsigned char)str2[str2len - 1]))
-       str2len--;
- 
-    /*A quick check for empty strings before we start xmemduping and xfreeing*/
-diff -ruN openslp-2.0.0.orig/common/slp_compare.h openslp-2.0.0/common/slp_compare.h
---- openslp-2.0.0.orig/common/slp_compare.h	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/common/slp_compare.h	2017-06-10 01:16:39.072878034 +0200
-@@ -52,10 +52,12 @@
- 
- #ifndef _WIN32
- # ifndef HAVE_STRNCASECMP
--int strncasecmp(const char * s1, const char * s2, size_t len);
-+int slp_strncasecmp(const char * s1, const char * s2, size_t len);
-+# define strncasecmp slp_strncasecmp
- # endif
- # ifndef HAVE_STRCASECMP
--int strcasecmp(const char * s1, const char * s2);
-+int slp_strcasecmp(const char * s1, const char * s2);
-+# define strcasecmp slp_strcasecmp
- # endif
- #endif
- 
-diff -ruN openslp-2.0.0.orig/common/slp_dhcp.c openslp-2.0.0/common/slp_dhcp.c
---- openslp-2.0.0.orig/common/slp_dhcp.c	2012-12-07 01:52:08.000000000 +0100
-+++ openslp-2.0.0/common/slp_dhcp.c	2017-06-10 01:16:39.073878034 +0200
-@@ -405,7 +405,7 @@
-  *    ENOTCONN (read error), ETIMEDOUT (read timeout), ENOMEM (out of
-  *    memory), or EINVAL (on parse error).
-  */
--int DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
-+int slp_DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
-       DHCPInfoCallBack * dhcpInfoCB, void * context)
- {
-    uint32_t xid;
-@@ -539,7 +539,7 @@
-  * @return Zero on success, or a non-zero value to stop the caller from 
-  *    continuing to parse the buffer and call this routine.
-  */
--int DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
-+int slp_DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
-       void * context)
- {
-    size_t cpysz, bufsz, dasize;
-@@ -707,8 +707,8 @@
-    ctx.scopelistlen = 0;
-    ctx.addrlistlen = 0;
- 
--   if ((err = DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), 
--         DHCPParseSLPTags, &ctx)) != 0)
-+   if ((err = slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), 
-+         slp_DHCPParseSLPTags, &ctx)) != 0)
-       return FAIL;
- 
-    printf("ScopeList: [%.*s]\n", ctx.scopelistlen, ctx.scopelist);
-diff -ruN openslp-2.0.0.orig/common/slp_dhcp.h openslp-2.0.0/common/slp_dhcp.h
---- openslp-2.0.0.orig/common/slp_dhcp.h	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/common/slp_dhcp.h	2017-06-10 01:16:39.073878034 +0200
-@@ -131,10 +131,10 @@
- typedef int DHCPInfoCallBack(int tag, void * optdata, 
-       size_t optdatasz, void * context);
- 
--int DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
-+int slp_DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
-       DHCPInfoCallBack * dhcpInfoCB, void * context);
- 
--int DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
-+int slp_DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
-       void * context);
- 
- /** DHCP interface context structure */
-diff -ruN openslp-2.0.0.orig/common/slp_iface.c openslp-2.0.0/common/slp_iface.c
---- openslp-2.0.0.orig/common/slp_iface.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/common/slp_iface.c	2017-06-10 01:16:39.073878034 +0200
-@@ -645,7 +645,7 @@
-  *
-  * @internal
-  */
--int sizeof_ifreq(struct ifreq* ifr)
-+static int sizeof_ifreq(struct ifreq* ifr)
- {
- #ifdef HAVE_SOCKADDR_STORAGE_SS_LEN
-   int len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
-diff -ruN openslp-2.0.0.orig/common/slp_message.c openslp-2.0.0/common/slp_message.c
---- openslp-2.0.0.orig/common/slp_message.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/common/slp_message.c	2017-06-10 01:16:39.073878034 +0200
-@@ -58,7 +58,7 @@
-  * @return A 16-bit unsigned value in native format; the buffer pointer
-  *    is moved ahead by 2 bytes on return.
-  */
--uint16_t GetUINT16(uint8_t ** cpp)
-+uint16_t slp_GetUINT16(uint8_t ** cpp)
- {
-    uint16_t rv = AS_UINT16(*cpp);
-    *cpp += 2;
-@@ -72,7 +72,7 @@
-  * @return A 32-bit unsigned value in native format; the buffer pointer
-  *    is moved ahead by 3 bytes on return.
-  */
--uint32_t GetUINT24(uint8_t ** cpp)
-+uint32_t slp_GetUINT24(uint8_t ** cpp)
- {
-    uint32_t rv = AS_UINT24(*cpp);
-    *cpp += 3;
-@@ -86,7 +86,7 @@
-  * @return A 32-bit unsigned value in native format; the buffer pointer
-  *    is moved ahead by 4 bytes on return.
-  */
--uint32_t GetUINT32(uint8_t ** cpp)
-+uint32_t slp_GetUINT32(uint8_t ** cpp)
- {
-    uint32_t rv = AS_UINT32(*cpp);
-    *cpp += 4;
-@@ -106,7 +106,7 @@
-  *    @p cppstring pointer; the buffer pointer is moved ahead by @p len bytes
-  *    on return.
-  */
--char * GetStrPtr(uint8_t ** cpp, size_t len)
-+char * slp_GetStrPtr(uint8_t ** cpp, size_t len)
- {
-    char * sp = (char *)*cpp;
-    *cpp += len;
-@@ -120,7 +120,7 @@
-  *
-  * @note The buffer address is moved ahead by 2 bytes on return.
-  */
--void PutUINT16(uint8_t ** cpp, size_t val)
-+void slp_PutUINT16(uint8_t ** cpp, size_t val)
- {
-    TO_UINT16(*cpp, val);
-    *cpp += 2;
-@@ -133,7 +133,7 @@
-  *
-  * @note The buffer address is moved ahead by 3 bytes on return.
-  */
--void PutUINT24(uint8_t ** cpp, size_t val)
-+void slp_PutUINT24(uint8_t ** cpp, size_t val)
- {
-    TO_UINT24(*cpp, val);
-    *cpp += 3;
-@@ -146,7 +146,7 @@
-  *
-  * @note The buffer address is moved ahead by 4 bytes on return.
-  */
--void PutUINT32(uint8_t ** cpp, size_t val)
-+void slp_PutUINT32(uint8_t ** cpp, size_t val)
- {
-    TO_UINT32(*cpp, val);
-    *cpp += 4;
-diff -ruN openslp-2.0.0.orig/common/slp_message.h openslp-2.0.0/common/slp_message.h
---- openslp-2.0.0.orig/common/slp_message.h	2012-12-07 21:13:28.000000000 +0100
-+++ openslp-2.0.0/common/slp_message.h	2017-06-10 01:16:39.073878034 +0200
-@@ -188,14 +188,23 @@
- #define PEEK_LENGTH(p) ((*p == 2) ? AS_UINT24(p + 2) : (*p == 1) ? AS_UINT16(p + 2) : 1)
- 
- /* buffer-based wire routines */
--uint16_t GetUINT16(uint8_t ** cpp);
--uint32_t GetUINT24(uint8_t ** cpp);
--uint32_t GetUINT32(uint8_t ** cpp);
--char * GetStrPtr(uint8_t ** cpp, size_t length);
-+uint16_t slp_GetUINT16(uint8_t ** cpp);
-+uint32_t slp_GetUINT24(uint8_t ** cpp);
-+uint32_t slp_GetUINT32(uint8_t ** cpp);
-+char * slp_GetStrPtr(uint8_t ** cpp, size_t length);
- 
--void PutUINT16(uint8_t ** cpp, size_t val);
--void PutUINT24(uint8_t ** cpp, size_t val);
--void PutUINT32(uint8_t ** cpp, size_t val);
-+void slp_PutUINT16(uint8_t ** cpp, size_t val);
-+void slp_PutUINT24(uint8_t ** cpp, size_t val);
-+void slp_PutUINT32(uint8_t ** cpp, size_t val);
-+
-+#define GetUINT16 slp_GetUINT16
-+#define GetUINT24 slp_GetUINT24
-+#define GetUINT32 slp_GetUINT32
-+#define GetStrPtr slp_GetStrPtr
-+
-+#define PutUINT16 slp_PutUINT16
-+#define PutUINT24 slp_PutUINT24
-+#define PutUINT32 slp_PutUINT32
- 
- /** SLPHeader structure and associated functions */
- typedef struct _SLPHeader
-diff -ruN openslp-2.0.0.orig/common/slp_net.c openslp-2.0.0/common/slp_net.c
---- openslp-2.0.0.orig/common/slp_net.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/common/slp_net.c	2017-06-10 01:16:39.073878034 +0200
-@@ -76,18 +76,20 @@
- #endif
- 
- /** IPv6 SLP address constants */
--const struct in6_addr in6addr_srvloc_node       = IN6ADDR_SRVLOC_NODE_INIT;
--const struct in6_addr in6addr_srvloc_link       = IN6ADDR_SRVLOC_LINK_INIT;
--const struct in6_addr in6addr_srvloc_site       = IN6ADDR_SRVLOC_SITE_INIT;
--const struct in6_addr in6addr_srvlocda_node     = IN6ADDR_SRVLDA_NODE_INIT;
--const struct in6_addr in6addr_srvlocda_link     = IN6ADDR_SRVLDA_LINK_INIT;
--const struct in6_addr in6addr_srvlocda_site     = IN6ADDR_SRVLDA_SITE_INIT;
--const struct in6_addr in6addr_service_node_mask = IN6ADDR_SVCNOD_MASK_INIT;
--const struct in6_addr in6addr_service_link_mask = IN6ADDR_SVCLNK_MASK_INIT;
--const struct in6_addr in6addr_service_site_mask = IN6ADDR_SVCSIT_MASK_INIT;
--const struct in6_addr slp_in6addr_any           = SLP_IN6ADDR_ANY_INIT;
--const struct in6_addr slp_in6addr_loopback      = SLP_IN6ADDR_LOOPBACK_INIT;
-+const struct in6_addr in6addr_srvloc_node   = IN6ADDR_SRVLOC_NODE_INIT;
-+const struct in6_addr in6addr_srvloc_link   = IN6ADDR_SRVLOC_LINK_INIT;
-+const struct in6_addr in6addr_srvloc_site   = IN6ADDR_SRVLOC_SITE_INIT;
- 
-+const struct in6_addr in6addr_srvlocda_node = IN6ADDR_SRVLDA_NODE_INIT;
-+const struct in6_addr in6addr_srvlocda_link = IN6ADDR_SRVLDA_LINK_INIT;
-+const struct in6_addr in6addr_srvlocda_site = IN6ADDR_SRVLDA_SITE_INIT;
-+
-+const struct in6_addr slp_in6addr_any      = SLP_IN6ADDR_ANY_INIT;
-+const struct in6_addr slp_in6addr_loopback = SLP_IN6ADDR_LOOPBACK_INIT;
-+
-+static const struct in6_addr in6addr_service_node_mask = IN6ADDR_SVCNOD_MASK_INIT;
-+static const struct in6_addr in6addr_service_link_mask = IN6ADDR_SVCLNK_MASK_INIT;
-+static const struct in6_addr in6addr_service_site_mask = IN6ADDR_SVCSIT_MASK_INIT;
- 
- /** Returns the scope embedded in the IPv6 multicast address.
-  *
-diff -ruN openslp-2.0.0.orig/common/slp_net.h openslp-2.0.0/common/slp_net.h
---- openslp-2.0.0.orig/common/slp_net.h	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/common/slp_net.h	2017-06-10 01:16:39.073878034 +0200
-@@ -65,9 +65,6 @@
- extern const struct in6_addr in6addr_srvlocda_node;
- extern const struct in6_addr in6addr_srvlocda_link;
- extern const struct in6_addr in6addr_srvlocda_site;
--extern const struct in6_addr in6addr_service_node_mask;
--extern const struct in6_addr in6addr_service_link_mask;
--/* extern const struct in6_addr in6addr_service_site_mask; */
- 
- /** IN6 "Any" and "Loopback" address initializer macros */
- #ifdef _AIX
-diff -ruN openslp-2.0.0.orig/common/slp_network.c openslp-2.0.0/common/slp_network.c
---- openslp-2.0.0.orig/common/slp_network.c	2013-06-08 04:50:38.000000000 +0200
-+++ openslp-2.0.0/common/slp_network.c	2017-06-10 01:16:39.073878034 +0200
-@@ -364,7 +364,7 @@
-  * @returns A const pointer to @p dst on success; or NULL on failure, 
-  *    and sets @a errno to EAFNOSUPPORT.
-  */ 
--const char * saddr_ntop(const void * src, char * dst, size_t dstsz)
-+const char * slp_saddr_ntop(const void * src, char * dst, size_t dstsz)
- {
-    switch (((const struct sockaddr *)src)->sa_family)
-    {
-diff -ruN openslp-2.0.0.orig/common/slp_network.h openslp-2.0.0/common/slp_network.h
---- openslp-2.0.0.orig/common/slp_network.h	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/common/slp_network.h	2017-06-10 01:16:39.073878034 +0200
-@@ -62,7 +62,7 @@
-       size_t bufsz, void * peeraddr, struct timeval * timeout);  
- int SLPNetworkRecvMessage(sockfd_t sockfd, int socktype, SLPBuffer * buf,
-       void * peeraddr, struct timeval * timeout); 
--const char * saddr_ntop(const void * src, char * dst, size_t dstsz);
-+const char * slp_saddr_ntop(const void * src, char * dst, size_t dstsz);
- 
- void SLPNetworkSetSndRcvBuf(sockfd_t sock);
- /*! @} */
-diff -ruN openslp-2.0.0.orig/common/slp_v1message.c openslp-2.0.0/common/slp_v1message.c
---- openslp-2.0.0.orig/common/slp_v1message.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/common/slp_v1message.c	2017-06-10 01:16:39.073878034 +0200
-@@ -275,10 +275,10 @@
-          || (tmp = strstr(srvreg->attrlist, "scope")) != 0)
-    {
-       tmp += 5;
--      while (*tmp && (isspace(*tmp) || *tmp == '='))
-+      while (*tmp && (isspace((unsigned char)*tmp) || *tmp == '='))
-          tmp++;      /* Find start of scope string. */
-       srvreg->scopelist = tmp;
--      while (*tmp && !isspace(*tmp) && *tmp != ')')
-+      while (*tmp && !isspace((unsigned char)*tmp) && *tmp != ')')
-          tmp++;      /* Find end of scope string. */
-       srvreg->scopelistlen = tmp - srvreg->scopelist;
-       /** @todo Should we convert to UTF-8 here? */
-diff -ruN openslp-2.0.0.orig/common/slp_xmalloc.c openslp-2.0.0/common/slp_xmalloc.c
---- openslp-2.0.0.orig/common/slp_xmalloc.c	2017-06-10 01:15:33.209875294 +0200
-+++ openslp-2.0.0/common/slp_xmalloc.c	2017-06-10 01:18:31.228882700 +0200
-@@ -106,7 +106,7 @@
-  *
-  * @return A pointer to the newly allocated memory block.
-  */
--void * _xmalloc(const char * file, int line, size_t size)
-+void * slp_xmalloc(const char * file, int line, size_t size)
- {
-    xallocation_t * x;
- 
-@@ -161,10 +161,10 @@
-  *
-  * @return A pointer to the newly allocated and cleared memory block.
-  */
--void * _xcalloc(const char * file, int line, int numblks, size_t size)
-+void * slp_xcalloc(const char * file, int line, int numblks, size_t size)
- {
-    size_t blksz = numblks * size;
--   void * ptr = _xmalloc(file, line, blksz);
-+   void * ptr = slp_xmalloc(file, line, blksz);
-    if (ptr)
-       memset(ptr, 0, blksz);
-    return ptr;
-@@ -183,16 +183,16 @@
-  *    NULL for @p buf actually allocates a new buffer, passing 0 
-  *    for @p size actually allocates a new buffer.
-  */
--void * _xrealloc(const char * file, int line, void * ptr, size_t size)
-+void * slp_xrealloc(const char * file, int line, void * ptr, size_t size)
- {
-    xallocation_t * x;
- 
-    if (!ptr)
--      return _xmalloc(file, line, size);
-+      return slp_xmalloc(file, line, size);
- 
-    if (!size)
-    {
--      _xfree(file, line, ptr);
-+      slp_xfree(file, line, ptr);
-       return 0;
-    }
- 
-@@ -202,11 +202,11 @@
-       void * newptr = ptr;
-       if (x->size != size)
-       {
--         newptr = _xmalloc(file, line, size);
-+         newptr = slp_xmalloc(file, line, size);
-          if (newptr == 0)
-             return 0;
-          memcpy(newptr, ptr, x->size);
--         _xfree(file, line, x);
-+         slp_xfree(file, line, x);
-       }
-       return newptr;
-    }
-@@ -227,10 +227,10 @@
-  * @return A pointer to the duplicated string, or NULL on memory
-  *    allocation failure.
-  */
--char * _xstrdup(const char * file, int line, const char * str)
-+char * slp_xstrdup(const char * file, int line, const char * str)
- {
-    size_t strsz = strlen(str) + 1;
--   char * ptr = _xmalloc(file, line, strsz);
-+   char * ptr = slp_xmalloc(file, line, strsz);
-    if (ptr)
-       memcpy(ptr, str, strsz);
-    return ptr;
-@@ -246,9 +246,9 @@
-  * @return A pointer to the duplicated memory block, or NULL on memory
-  *    allocation failure.
-  */
--void * _xmemdup(const char * file, int line, const void * ptr, size_t size)
-+void * slp_xmemdup(const char * file, int line, const void * ptr, size_t size)
- {
--   void * cpy = _xmalloc(file, line, size);
-+   void * cpy = slp_xmalloc(file, line, size);
-    if (cpy)
-       memcpy(cpy, ptr, size);
-    return cpy;
-@@ -260,7 +260,7 @@
-  * @param[in] line - The line number where @e xfree was called.
-  * @param[in] ptr - The address of the block to be free'd.
-  */
--void _xfree(const char * file, int line, void * ptr)
-+void slp_xfree(const char * file, int line, void * ptr)
- {
-    xallocation_t * x;
- 
-@@ -292,7 +292,7 @@
-  * @return A boolean true (1) on success, or false (0) the log file 
-  *    fails to open.
- */
--int xmalloc_init(const char * filename, size_t freemem)
-+int slp_xmalloc_init(const char * filename, size_t freemem)
- {
-    G_xmalloc_fh = fopen(filename, "w");
-    if (G_xmalloc_fh == 0)
-@@ -305,7 +305,7 @@
-  *
-  * @return 0
-  */
--int xmalloc_report(void)
-+int slp_xmalloc_report(void)
- {
-    xallocation_t * x;
- 
-@@ -327,7 +327,7 @@
- 
- /** Deinitialize the debug memory allocator.
-  */
--void xmalloc_deinit(void)
-+void slp_xmalloc_deinit(void)
- {
-    xmalloc_report();
- 
-@@ -352,7 +352,7 @@
-  * @return A pointer to the duplicated memory block, or NULL on memory
-  *    allocation failure.
-  */
--void * _xmemdup(const void * ptr, size_t size)
-+void * slp_xmemdup(const void * ptr, size_t size)
- {
-    void * cpy = malloc(size);
-    if (cpy)
-diff -ruN openslp-2.0.0.orig/common/slp_xmalloc.h openslp-2.0.0/common/slp_xmalloc.h
---- openslp-2.0.0.orig/common/slp_xmalloc.h	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/common/slp_xmalloc.h	2017-06-10 01:16:39.073878034 +0200
-@@ -63,34 +63,38 @@
-    size_t size;
- } xallocation_t;
- 
--void * _xmalloc(const char * file, int line, size_t size);
--void * _xcalloc(const char * file, int line, int numblks, size_t size);
--void * _xrealloc(const char * file, int line, void * ptr, size_t size);
--char * _xstrdup(const char * file, int line, const char * str);
--void * _xmemdup(const char * file, int line, const void * ptr, size_t size);
--void   _xfree(const char * file, int line, void * ptr);
--
--int xmalloc_init(const char * filename, size_t freemem);
--int xmalloc_report(void);
--void xmalloc_deinit(void);
--
--#define xmalloc(s)      _xmalloc(__FILE__,__LINE__,(s))
--#define xcalloc(n,s)    _xcalloc(__FILE__,__LINE__,(n),(s))
--#define xrealloc(p,s)   _xrealloc(__FILE__,__LINE__,(p),(s))
--#define xfree(p)        _xfree(__FILE__,__LINE__,(p))
--#define xstrdup(p)      _xstrdup(__FILE__,__LINE__,(p))
--#define xmemdup(p,s)    _xmemdup(__FILE__,__LINE__,(p),(s))
-+void * slp_xmalloc(const char * file, int line, size_t size);
-+void * slp_xcalloc(const char * file, int line, int numblks, size_t size);
-+void * slp_xrealloc(const char * file, int line, void * ptr, size_t size);
-+char * slp_xstrdup(const char * file, int line, const char * str);
-+void * slp_xmemdup(const char * file, int line, const void * ptr, size_t size);
-+void   slp_xfree(const char * file, int line, void * ptr);
-+
-+int slp_xmalloc_init(const char * filename, size_t freemem);
-+int slp_xmalloc_report(void);
-+void slp_xmalloc_deinit(void);
-+
-+#define xmalloc(s)      slp_xmalloc(__FILE__,__LINE__,(s))
-+#define xcalloc(n,s)    slp_xcalloc(__FILE__,__LINE__,(n),(s))
-+#define xrealloc(p,s)   slp_xrealloc(__FILE__,__LINE__,(p),(s))
-+#define xfree(p)        slp_xfree(__FILE__,__LINE__,(p))
-+#define xstrdup(p)      slp_xstrdup(__FILE__,__LINE__,(p))
-+#define xmemdup(p,s)    slp_xmemdup(__FILE__,__LINE__,(p),(s))
-+
-+#define xmalloc_init    slp_xmalloc_init
-+#define xmalloc_report  slp_xmalloc_report
-+#define xmalloc_deinit  slp_xmalloc_deinit
- 
- #else    /* ?DEBUG */
- 
--void * _xmemdup(const void * ptr, size_t srclen);
-+void * slp_xmemdup(const void * ptr, size_t srclen);
- 
- #define xmalloc   malloc
- #define xcalloc   calloc
- #define xrealloc  realloc
- #define xfree     free
- #define xstrdup   strdup
--#define xmemdup   _xmemdup
-+#define xmemdup   slp_xmemdup
- 
- #endif   /* ?DEBUG */
- 
-diff -ruN openslp-2.0.0.orig/libslp/libslp.h openslp-2.0.0/libslp/libslp.h
---- openslp-2.0.0.orig/libslp/libslp.h	2012-11-28 18:07:04.000000000 +0100
-+++ openslp-2.0.0/libslp/libslp.h	2017-06-10 01:16:39.073878034 +0200
-@@ -263,11 +263,15 @@
- 
- void KnownDAFreeAll(void);
- 
--void PutL16String(uint8_t ** cpp, const char * str, size_t strsz);
--size_t SizeofURLEntry(size_t urllen, size_t urlauthlen);
--void PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
-+void slp_PutL16String(uint8_t ** cpp, const char * str, size_t strsz);
-+size_t slp_SizeofURLEntry(size_t urllen, size_t urlauthlen);
-+void slp_PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
-       size_t urllen, const uint8_t * urlauth, size_t urlauthlen);
- 
-+#define PutL16String   slp_PutL16String
-+#define SizeofURLEntry slp_SizeofURLEntry
-+#define PutURLEntry    slp_PutURLEntry
-+
- int LIBSLPPropertyInit(char const * gconffile);
- void LIBSLPPropertyCleanup();
- 
-diff -ruN openslp-2.0.0.orig/libslp/libslp_knownda.c openslp-2.0.0/libslp/libslp_knownda.c
---- openslp-2.0.0.orig/libslp/libslp_knownda.c	2012-12-12 18:38:52.000000000 +0100
-+++ openslp-2.0.0/libslp/libslp_knownda.c	2017-06-10 01:16:39.074878034 +0200
-@@ -520,7 +520,7 @@
-    *ctx.scopelist = 0;
-    ctx.addrlistlen = 0;
- 
--   DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), DHCPParseSLPTags, &ctx);
-+   slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), slp_DHCPParseSLPTags, &ctx);
- 
-    if (!*ctx.scopelist)
-    {
-diff -ruN openslp-2.0.0.orig/libslp/libslp_network.c openslp-2.0.0/libslp/libslp_network.c
---- openslp-2.0.0.orig/libslp/libslp_network.c	2013-06-08 04:50:38.000000000 +0200
-+++ openslp-2.0.0/libslp/libslp_network.c	2017-06-10 01:16:39.074878034 +0200
-@@ -142,7 +142,7 @@
-  *
-  * @internal
-  */
--void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
-+static void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
- {
-     lhs->tv_sec -= rhs->tv_sec;
-     lhs->tv_usec -= rhs->tv_usec;
-@@ -162,7 +162,7 @@
-  *
-  * @internal
-  */
--void timeval_add(struct timeval *lhs, struct timeval *rhs)
-+static void timeval_add(struct timeval *lhs, struct timeval *rhs)
- {
-     lhs->tv_sec += rhs->tv_sec;
-     lhs->tv_usec += rhs->tv_usec;
-@@ -183,7 +183,7 @@
-  *
-  * @return the size
-  */
--size_t CalcBufferSize(int v1, char buftype, size_t langsize, size_t prlistlen, size_t bufsize)
-+static size_t CalcBufferSize(int v1, char buftype, size_t langsize, size_t prlistlen, size_t bufsize)
- {
-    size_t size = 0;
- 
-diff -ruN openslp-2.0.0.orig/libslp/libslp_parse.c openslp-2.0.0/libslp/libslp_parse.c
---- openslp-2.0.0.orig/libslp/libslp_parse.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/libslp/libslp_parse.c	2017-06-10 01:16:39.074878034 +0200
-@@ -102,10 +102,10 @@
-  *    next buffer position after the URL Entry written on exit.
-  *
-  * @remarks Currently OpenSLP only handles a single authentication
-- *    block. To handle more than this, PutURLEntry would have to take
-+ *    block. To handle more than this, slp_PutURLEntry would have to take
-  *    arrays of @p urlauth and @p urlauthlen values.
-  */
--void PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
-+void slp_PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
-       size_t urllen, const uint8_t * urlauth, size_t urlauthlen)
- {
-    uint8_t * curpos = *cpp;
-diff -ruN openslp-2.0.0.orig/libslpattr/libslpattr.c openslp-2.0.0/libslpattr/libslpattr.c
---- openslp-2.0.0.orig/libslpattr/libslpattr.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/libslpattr/libslpattr.c	2017-06-10 01:16:39.074878034 +0200
-@@ -134,8 +134,8 @@
-  */
- static char unescape(char d1, char d2)
- {
--   SLP_ASSERT(isxdigit((int) d1));
--   SLP_ASSERT(isxdigit((int) d2));
-+   SLP_ASSERT(isxdigit((unsigned char)d1));
-+   SLP_ASSERT(isxdigit((unsigned char)d2));
- 
-    if ((d1 >= 'A') && (d1 <= 'F'))
-       d1 = d1 - 'A' + 0x0A;
-@@ -184,8 +184,8 @@
-          /*** Check that the characters are legal, and that the value has
-           * not been truncated.
-           ***/
--         if ((i + 2 < len) && isxdigit((int) src[i + 1]) && isxdigit((int)
--                                                                  src[i + 2]))
-+         if ((i + 2 < len) && isxdigit((unsigned char)src[i + 1]) 
-+               && isxdigit((unsigned char)src[i + 2]))
-          {
-             *write = unescape(src[i + 1], src[i + 2]);
-             i += 2;
-@@ -2049,14 +2049,14 @@
- 
- 
-    /***** Check integer *****/
--   if (*val == '-' || isdigit((int) * val))
-+   if (*val == '-' || isdigit((unsigned char)*val))
-    {
-       /*** Verify. ***/
-       SLPBoolean is_int = SLP_TRUE; /* Flag true if the attr is an int. */
-       for (i = 1; i < len; i++)
-       {
-          /* We start at 1 since first char has already been checked. */
--         if (!isdigit((int) val[i]))
-+         if (!isdigit((unsigned char)val[i]))
-          {
-             is_int = SLP_FALSE;
-             break;
-diff -ruN openslp-2.0.0.orig/slpd/slpd_knownda.c openslp-2.0.0/slpd/slpd_knownda.c
---- openslp-2.0.0.orig/slpd/slpd_knownda.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/slpd/slpd_knownda.c	2017-06-10 01:16:39.074878034 +0200
-@@ -488,7 +488,7 @@
-    *ctx.scopelist = 0;
-    ctx.addrlistlen = 0;
- 
--   DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), DHCPParseSLPTags, &ctx);
-+   slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), slp_DHCPParseSLPTags, &ctx);
- 
-    alp = ctx.addrlist;
-    while (ctx.addrlistlen >= 4)
-diff -ruN openslp-2.0.0.orig/slpd/slpd_main.c openslp-2.0.0/slpd/slpd_main.c
---- openslp-2.0.0.orig/slpd/slpd_main.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/slpd/slpd_main.c	2017-06-10 01:16:39.074878034 +0200
-@@ -358,10 +358,11 @@
-    if (fd)
-    {
-       memset(pidstr,0,14);
--      (void)fread(pidstr,13,1,fd);
--      pid = atoi(pidstr);
--      if (pid && kill(pid, 0) == 0)
--         return -1;  /* we are already running */
-+      if (fread(pidstr,13,1,fd) > 0) {
-+         pid = atoi(pidstr);
-+         if (pid && kill(pid, 0) == 0)
-+            return -1;  /* we are already running */
-+      }
-       fclose(fd);
-    }
-    return 0;
-@@ -449,7 +450,8 @@
-       int i;
- 
-       /* change directory to root */
--      (void)chdir("/");
-+      if (chdir("/") != 0)
-+         ; /* TODO: ... */
- 
-       /* close all open file handles */
-       for (i = 0; i < 8192; i++)
-diff -ruN openslp-2.0.0.orig/slpd/slpd_predicate.c openslp-2.0.0/slpd/slpd_predicate.c
---- openslp-2.0.0.orig/slpd/slpd_predicate.c	2012-12-11 00:31:53.000000000 +0100
-+++ openslp-2.0.0/slpd/slpd_predicate.c	2017-06-10 01:16:39.075878034 +0200
-@@ -161,7 +161,7 @@
-       /* Verify escape sequences. */
-       if (seq_pos == 1 || seq_pos == 2)
-       {
--         if (!isxdigit((int) escaped[i]))
-+         if (!isxdigit((unsigned char)escaped[i]))
-             return 0;
- 
-          if (seq_pos == 2)
-@@ -198,7 +198,7 @@
-  */
- static int unescape_check(char d1, char d2, char * val) 
- {
--   if (!isxdigit((int) d1) || !isxdigit((int) d2))
-+   if (!isxdigit((unsigned char)d1) || !isxdigit((unsigned char)d2))
-       return 0;
- 
-    if ((d1 >= 'A') && (d1 <= 'F'))
-@@ -285,10 +285,10 @@
- 
-       if (unesc != verbatim[ver_i])        /* quick check for equality*/
-       {
--         if (!isascii(unesc)         /* case insensitive check */
--               || !isalpha(unesc)
--               || !isalpha(verbatim[ver_i])
--               || tolower(unesc) != tolower(verbatim[ver_i]))
-+         if (!isascii((unsigned char)unesc)         /* case insensitive check */
-+               || !isalpha((unsigned char)unesc)
-+               || !isalpha((unsigned char)verbatim[ver_i])
-+               || tolower((unsigned char)unesc) != tolower((unsigned char)verbatim[ver_i]))
-             return FR_EVAL_FALSE;
-       }
- 
-@@ -866,7 +866,7 @@
-    int i;
- 
-    for (i = 0; str[i] != 0; i++)
--      if (!((!isdigit((int) str[i])) || str[i] == '-'))
-+      if (!((!isdigit((unsigned char)str[i])) || str[i] == '-'))
-          return 0;
- 
-    return 1;
diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init
deleted file mode 100644
index de7f5af3131e..000000000000
--- a/net-libs/openslp/files/slpd-init
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-#
-# Does nothing if a route exists that supports multicast traffic.
-# If no routes supporting multicast traffic exists, the function
-# tries to add one.  A 0 is returned on success and a 1 on failure.
-# One parameter must be passed in.  This variable determins verbosity.
-# If parameter is non-zero debugging will appear.
-#
-multicast_route_set() {
-	PING_OPTIONS_1='-c1 -w1'
-	PING_OPTIONS_2='-c1 -i1'
-	MULTICAST_ADDRESS='239.255.255.253'
-	TMP_FILE=/tmp/route.check
-	PING_ERROR_NO_ROUTE='unreachable'
-
-	MSG_FAILED_TO_FIND='Failed to Detect Multicast Route'
-	MSG_SUCCESS_ON_FIND='Multicast Route Enabled'
-	MSG_ADDING_ROUTE='Attempting to Add Multicast Route ...'
-	MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.'
-	MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.'
-
-	CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'"
-	CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0"
-
-	ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
-	if [ $? = 2 ]; then
-		ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
-	fi
-
-	grep $PING_ERROR_NO_ROUTE $TMP_FILE > /dev/null 2>&1
-	err_unreachable_found=$?
-
-	#If errors, add route. Otherwise, do nothing
-	if [ -s $TMP_FILE ] && [ $err_unreachable_found = 0 ]; then 
-
-		if [ $1 != 0 ]; then
-			echo $MSG_FAILED_TO_FIND 
-			echo $MSG_ADDING_ROUTE 
-		fi
-
-		$CMD_ADD_ROUTE `eval $CMD_GET_INTERFACE` > /dev/null 2>&1
-		retval=$?
-		if [ $1 != 0 ]; then
-
-			if [ $retval = 0 ]; then
-				echo $MSG_SUCCES_ON_ADD
-			else
-				echo $MSG_FAILED_TO_ADD
-			fi
-		fi
-	else
-		if [ $1 != 0 ]; then
-			echo -n $MSG_SUCCESS_ON_FIND
-		fi
-		retval=0
-	fi
-
-	rm -f $TMP_FILE # Clean up
-	return $retval
-}
-
-checkconfig() {
-	multicast_route_set 0
-	if [ $? -ne 0 ]; then
-		eerror "No route available for multicast traffic!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting slpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/slpd --pidfile /var/run/slpd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping slpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/slpd.pid
-	eend $?
-}
diff --git a/net-libs/openslp/files/slpd.service b/net-libs/openslp/files/slpd.service
deleted file mode 100644
index ab5c02f3b773..000000000000
--- a/net-libs/openslp/files/slpd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Service Location Protocol
-After=network-online.target
-
-[Service]
-ExecStart=/usr/sbin/slpd -l /var/log/slpd.log -d
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=network.target
diff --git a/net-libs/openslp/metadata.xml b/net-libs/openslp/metadata.xml
deleted file mode 100644
index c01f3945d893..000000000000
--- a/net-libs/openslp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>printing@gentoo.org</email>
-		<name>Gentoo Printing Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">openslp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
deleted file mode 100644
index db091b2a3ce6..000000000000
--- a/net-libs/openslp/openslp-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/"
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-fbsd.patch
-	epatch "${FILESDIR}"/${P}-fixoverflow.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf || die
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rf "${D}"/usr/doc
-	dohtml -r .
-	newinitd "${FILESDIR}"/slpd-init slpd
-	systemd_dounit "${FILESDIR}"/slpd.service
-}
diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
deleted file mode 100644
index cadea63285dd..000000000000
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/"
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2012-4428.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-7567.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rfv "${D}"/usr/doc
-	dohtml -r .
-	newinitd "${FILESDIR}"/slpd-init slpd
-	systemd_dounit "${FILESDIR}"/slpd.service
-}
diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
deleted file mode 100644
index c9a5e673bd4c..000000000000
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/"
-SRC_URI="mirror://sourceforge/openslp/${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"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2012-4428.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-7567.patch
-	"${FILESDIR}"/${PN}-2.0.0-namespace.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rfv "${D}"/usr/doc
-	dohtml -r .
-	newinitd "${FILESDIR}"/slpd-init slpd
-	systemd_dounit "${FILESDIR}"/slpd.service
-}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 364851b77b47..e1e273b081ab 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,10 +2,12 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1677b7cc1f5f69205f4a9ae3db7a668887537d52281c7738f95506ab06088188c3b665e SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56
 AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
+DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
 DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
+EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71
 EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
 EBUILD tox-0.2.9-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27
 EBUILD tox-0.2.9.ebuild 2695 BLAKE2B d377d87f4e678929521072e5aba6652b11bfe8722dea5a9d6d2c57a81a8519f76f6d7e1f138049de3adab94db04cfee82ba5d493c509f456eb3f6957201a6dd3 SHA512 7f114ea6bcab068aa456212765ee3a3b573a1607482aa60fa149a1c0af3c250ec4a8351a622e05f151fad5d78b4ada1e8cc300a5135e63b112603afc4d187718
-EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
+EBUILD tox-9999.ebuild 3057 BLAKE2B 0bbfe93cdeae91f28f13d633b81a84776e84de6f1bc91e07e95d7a1079adb7c591b23308b41b1979e761938c48e09b77636ae738ad3b533963f8b6a8bfd0d13d SHA512 f40093e691b821e687e441807246210b062eac1fbc8fb8b25c2cb38d5935966385513d558148f38c9ef0cadd2298cc26f78fb2150c7d98b2e828c954b9712bd4
 MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild
new file mode 100644
index 000000000000..11d676ea6137
--- /dev/null
+++ b/net-libs/tox/tox-0.2.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd
+
+MY_P="c-toxcore-${PV}"
+DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
+HOMEPAGE="https://tox.chat"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
+		daemon? ( dht-node )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="
+	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? (
+		media-libs/libvpx
+		media-libs/opus
+	)
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	#remove faulty tests
+	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOTEST=$(usex test)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
+		-DBUILD_TOXAV=$(usex av)
+		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DENABLE_SHARED=ON
+		-DENABLE_STATIC=$(usex static-libs)
+		-DMUST_BUILD_TOXAV=$(usex av))
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=$(usex av)
+			-DTEST_TIMEOUT_SECONDS=120
+			-DUSE_IPV6=$(usex ipv6))
+	else
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=OFF
+			-DUSE_IPV6=OFF)
+	fi
+
+	if use log-trace; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
+	elif use log-debug; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
+	elif use log-info; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
+	elif use log-warn; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
+	elif use log-error; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
+	else
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
+		einfo "Logging disabled"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/initd tox-dht-daemon
+		newconfd "${FILESDIR}"/confd tox-dht-daemon
+		insinto /etc
+		doins "${FILESDIR}"/tox-bootstrapd.conf
+		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
+	fi
+}
+
+pkg_postinst() {
+	if use dht-node; then
+		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node that causes the program to be"
+		ewarn "built with a null library reference. This causes an infinite loop for certain revdep-rebuild"
+		ewarn "commands. If you aren't running a node, please consider disabling the dht-node use flag."
+	fi
+	if use daemon; then
+		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
+			ewarn "Backwards compatability with the bootstrap daemon might have been"
+			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
+			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
+			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
+			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
+			ewarn "Then just re-emerge net-libs/tox"
+		fi
+	fi
+}
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index 3c267ef0e1e2..501b16dc7266 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3 systemd user
+inherit cmake-utils git-r3 systemd
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
@@ -13,29 +13,66 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon log-debug log-trace +no-log static-libs test"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
 
-REQUIRED_USE="^^ ( no-log log-trace log-debug )"
+REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn )
+		daemon? ( dht-node )"
 
-RDEPEND="
-	av? ( media-libs/libvpx:=
+COMMON_DEPEND="
+	av? ( media-libs/libvpx
 		media-libs/opus )
-	daemon? ( dev-libs/libconfig )
+	daemon? ( acct-group/tox
+		acct-user/tox
+		dev-libs/libconfig )
 	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	#remove faulty tests
+	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
 
 src_configure() {
 	local mycmakeargs=(
-		-DTRACE=$(usex log-trace)
-		-DDEBUG=$(usex log-debug)
-		-DBUILD_TOXAV=$(usex av)
-		-DMUST_BUILD_TOXAV=$(usex av)
-		-DBUILD_AV_TEST=$(usex av)
+		-DAUTOTEST=$(usex test)
 		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_TOXAV=$(usex av)
+		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=$(usex static-libs)
-	)
+		-DMUST_BUILD_TOXAV=$(usex av))
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=$(usex av)
+			-DTEST_TIMEOUT_SECONDS=120
+			-DUSE_IPV6=$(usex ipv6))
+	else
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=OFF
+			-DUSE_IPV6=OFF)
+	fi
 
+	if use log-trace; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
+	elif use log-debug; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
+	elif use log-info; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
+	elif use log-warn; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
+	elif use log-error; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
+	else
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
+		einfo "Logging Disabled"
+	fi
 	cmake-utils_src_configure
 }
 
@@ -49,20 +86,24 @@ src_install() {
 		doins "${FILESDIR}"/tox-bootstrapd.conf
 		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
 	fi
-
-	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
+	if use dht-node; then
+		ewarn "There is currently an unresolved issue with tox"
+		ewarn "DHT Bootstrap node that causes the program to be"
+		ewarn "built with a null library reference. This"
+		ewarn "causes an infinite loop for certain rev-dep-rebuild"
+		ewarn "commands. If you aren't running a node, please"
+		ewarn "consider disabling the dht-node flag"
+	fi
 	if use daemon; then
-		enewgroup tox
-		enewuser tox -1 -1 -1 tox
-		if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then
+		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
 			ewarn "Backwards compatability with the bootstrap daemon might have been"
 			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT%/}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT%/}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
+			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
+			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
+			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
 			ewarn "Then just re-emerge net-libs/tox"
 		fi
 	fi