gentoo resync : 13.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
commit: a1392efe64137262023d92492396ca9156d22396 (patch)
tree: de438b2711c7697c4597fb04f07e988586f34233 /net-libs
parent: e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)
48 files changed, 136 insertions, 449 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 35ad8e0b2170..66721042efa5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
index 2376736eba13..4a82cc7aa7f7 100644
--- a/net-libs/ccnet/Manifest
+++ b/net-libs/ccnet/Manifest
@@ -1,5 +1,3 @@
-DIST ccnet-6.1.7.tar.gz 179364 BLAKE2B 214284a5b04ee2c8a51f8479bee5bcc3d5b044ed0cd622b56ae5caf4fb2757bf28191ffedca9f76fce80b5c6da5a489207e1bdef3436e44dbe1841a69a82c448 SHA512 bac93c9987f434915f9d5b5f0cfc44d88471ae27896e89059f3c924182255d938fb6c87dec31354f256807d5e4274b6af2e3325e753d06cd8a5ea91caba9490d
 DIST ccnet-6.1.8.tar.gz 179374 BLAKE2B 8eb05a9d2c8830c501b63f939df56cb72a6b03f7dbdf511adf1a89eff86bdc85ad804de04a2ed57f235f76e95fe1a4ab317f415be0051024bfcd7d099e9e2cad SHA512 5eb3765969edd471a43575545f92f6317741a2099bb7af82851bfe726b0715420e5b946c63435c334c4447888f1454d7cd0703f29818571eaabc2250046c45f3
-EBUILD ccnet-6.1.7.ebuild 995 BLAKE2B 259e0ff75a805902d29bfe659510ebeb801c77894b3d863cecb3650312818c3fb4bf17c067f9ea1ddffb1bacb212022698420dda075ae42632402311621e59e1 SHA512 ed7642aa5269055f57612d853412a7ca99b808fc72bdb424a2b75e1c63caba7c5c744f09ea4bb0d47f22b82bfbb73641947a0be6b43d2c473fb71d0de93f0029
 EBUILD ccnet-6.1.8.ebuild 992 BLAKE2B 4793324c0cb4f581cb598fac1a13a5394a69990df05a16220b65110c1081a6d9f4cc511463d32e4b4b5bee7f065eedde9b2999ebb61e68ea30b17ea5961680a1 SHA512 34f4afe88309f9331ae8a5a8fd48a108f22ba956af0de0ef51a40112a280be1541fa311c486dca9b2aa1295a8e27a7e0978b2a00447cbd70ed94f0ea4084c1d2
 MISC metadata.xml 244 BLAKE2B 1493b7ed9db33a79674a643ebdf17ecaa25eb1ae07cd66eed506e5be57dc1ab624708a96e48e93746e967b0b9b36b58a1fb498e30a6823adaa74400aa8ff1d34 SHA512 79803b3a138023e170943c1446e54f3d310f91d16568c6a235627e456958a1531b8b236da8d3e961feefd75fc51837011904f8f3172c5cd520cb0136b9f9f660
diff --git a/net-libs/ccnet/ccnet-6.1.7.ebuild b/net-libs/ccnet/ccnet-6.1.7.ebuild
deleted file mode 100644
index 76149b4a86fe..000000000000
--- a/net-libs/ccnet/ccnet-6.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index ccc8f49406c5..9d567eea4c7b 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -3,7 +3,9 @@ AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7e
 DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
 DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
+DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
 EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
 EBUILD davix-0.7.3.ebuild 1595 BLAKE2B d4522abac211e65960947ada16a381768b26e5825a2b8f41fec90a5ae67406450e0e2a50e7876b0ca0d45e3b062280e1162c25580ebe224cd94d0f29452457a4 SHA512 673ec1fdedacb7006c90e8483031e89020032a94870a0f7e3d5c9a9c6c9fc4a48ff45d2c9712f6c0f4d5a34f0d736259da218377ea782df1e9849baf0dae55d1
 EBUILD davix-0.7.4.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
+EBUILD davix-0.7.5.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
new file mode 100644
index 000000000000..448dc89c144a
--- /dev/null
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="High-performance file management over WebDAV/HTTP"
+HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
+SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 kernel_linux test tools"
+
+CDEPEND="
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+		kernel_linux? ( sys-apps/util-linux )
+"
+
+DEPEND="${CDEPEND}
+		doc? (
+			app-doc/doxygen[dot]
+			dev-python/sphinx
+		)
+		virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="test? ( tools )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	for x in doc test; do
+		if ! use $x; then
+			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DENABLE_HTML_DOCS=$(usex doc)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_TOOLS=$(usex tools)
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
+		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
+		-DSTATIC_LIBRARY=OFF
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use tools; then
+		rm -rf "${ED}/usr/share/man/man1"
+	fi
+
+	if use test; then
+		rm -rf "${ED}/usr/bin/davix-unit-tests"
+	fi
+}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 771bbf4bc7fb..9a8f5b124270 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,5 +2,5 @@ AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff8
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
-EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B e2d645fcd5ef3baf61253a4b1663ae2c0b6f5516391cb179f1219c2a166d00fca3a1ea5e1ee30e50bf85c5a8d4e3ef6906caa653edfeec916b10c9b422eb2fc9 SHA512 89a79ddd49eeebd6adb9b09e0706ac39c77f079c847a9311039c50290f1c60e0c47f2e3c6e8f186874a9d875dc18cb0ddd2ca471ba51d9e9350e88fdd485e874
+EBUILD glib-networking-2.60.3.ebuild 1768 BLAKE2B 95e22a8901007fd229abff9bbd9c3bf5247b3a3213e923458ad06aec9da91b2266a4c82b322bece5762746a72291c6cc3cca29bcf2c89b6284313a7063d6e5de SHA512 da68e2b8608e60b6567788bcd534d8ec244c9c1fa1a9516472f9487c3bf53262edd7424e2c78c1856ddb48d55da507fef951d33716855f5dba72d0ea077a2c22
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 3840bd352f93..304bde51dc78 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index a96c40a43d67..3e16a4d508b9 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,5 +1,3 @@
-DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
-EBUILD gloox-1.0.21.ebuild 1134 BLAKE2B 65f284fc562483195e09f8412d88876c602cc6ea25750eda6e32a3abc183e522c8427b1e5e62099aeb2d038f3bb60998f9cf249bfd879aab85c73168c6b64f04 SHA512 4a9d5d47ac2a3ec2ad0e103183b8d64f665100859bfa556c55adc659401141c6d84f84014e77a603858ce5b6cc876663f97494e0b1bde3595a642a9c26824d82
 EBUILD gloox-1.0.22.ebuild 1117 BLAKE2B cfe30d6bac3e249c88e6825390c504405eaaea78442359d4297c6a0a3cc4f167dd5c1eae12c6d34856a833b4a83247c16123e740b637dd2e7bc6b6c546c16492 SHA512 37ee7375502d50d168b2f79b4d8656424094741fe11c6c9b8d50ea8512fdd0218516c2644d57bbfe6aef4cfdd2f635539bae2c9add09a3cf0f2a0addb279893e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.21.ebuild b/net-libs/gloox/gloox-1.0.21.ebuild
deleted file mode 100644
index 3598babc2d2b..000000000000
--- a/net-libs/gloox/gloox-1.0.21.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="https://camaya.net/gloox/"
-SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn:= )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-# GnuTLS checks hang forever
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2dd99e40d363..1da89605f067 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,4 +2,4 @@ DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81e
 DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
 EBUILD gnutls-3.6.7.ebuild 3908 BLAKE2B 4dbb2c896f38322dabb73e14629612fc1b3f2652db58461c0444380e24b5bb1a050b5d62d58e17e583bf17875ff58124d74fb392fe6b3b31cdf81128ba596a92 SHA512 e1aefd74b5a3bc2da84b1dbd7ef3315706ad6dfff6b5a20015c00a92458918645e6791163b03d8f1ed92dc525875c42f6646c40de5121650a0ef235822b70bfa
 EBUILD gnutls-3.6.9.ebuild 3928 BLAKE2B fac7d7e13b3ac5c53d600d9db5c5202d7296ecfa3a9e64e6d22eb8b723699256336374e5d365aed08c3b066957bef80e077cc74cf9fadfd0dd11ef3225c132f7 SHA512 baf3f6f4812963bc6e373d877c3a576c016588f986451084077a16a9fde8228549ae72e0219dcd4a60ae121f0d67a56dc2d0ba5bcacf40569d4d3aaaefb8c1e2
-MISC metadata.xml 1194 BLAKE2B 2f5c69b9b4ed31a5bf470451931963cac503fa11a8d3d575279d2b8002ed5b7d5bfdb4ca2f141b1f2d7c8f802d2d51ea9de0875d4f9dcdd7febcef200cb8a932 SHA512 fefa4338d539e248747ef69447b20b7d5b70fd814bd9daee6a659f09888c7ff90dfa6bfa1d8778383cf14fbd3b0bd919bdccac2f5adc9b2d2decb00211325b0d
+MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index d90b1d71c770..20e6efaa6651 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -38,4 +38,7 @@
   <slots>
    <subslots>Reflect ABI compatibility of libgnutls.so</subslots>
   </slots>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:gnutls</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e4c5d6e34f1d..4e19a79de148 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -23,4 +23,4 @@ EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc
 EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
-MISC metadata.xml 684 BLAKE2B e2a167f68e05a7dbcef3ad7fa58ebcbde529d28ee5d5ad5dd73b2ee66a1bf21bc5041bbde089c6439c5cd4e800ab77edf647d8cc629f051b1a489327cc000cac SHA512 d3a9fda12fc9009e675ac6ea5112b9f8c8c4a316a45623e8e536821144c886b48c9f28b1c7bcc6362bd7ae7d71d0eec36b442fed5360924d7424095b2afd38f7
+MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index ccbc56aeed7b..6267f34d90d8 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
 		<remote-id type="github">grpc/grpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3edde641b7b3..3d516046dd5d 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,15 +1,9 @@
 AUX Makefile.Darwin.in 2074 BLAKE2B a1aeb0fb86fb24f1027c9ad9424b7004dff4c9f43c3e18fb4c5eab6938efa09d8ba9a25951073afe0446f342356cee31ca1345cc45a91f2f1764dd8496723707 SHA512 cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22
 AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0af792f53b00af1ff227c8a1cbaba42595620250ff7c16ce3eb9f21489966b128615f532633cd66c92983657b3c0d712ee6ff SHA512 560aaf84c59c90b6c19f8cd8290e54bcbe7e1e5dad226b8c332be7a67789f68d29d19bd6110ffa907c587d80dc370f68fb4db88442015723a526cb77079441d6
-AUX liblockfile-1.13-makefile.patch 2368 BLAKE2B aa269b2ecc5aac3ef62fb716f4311f7a15089d46402cae106f5f24cadbd6320926140b0d20d36849a71dad62ed337a09aa20ac28eda009f6f3bd96f32b99711c SHA512 65c73a6717d466f60bee814920be455496ea958db86d0004c30a4bed1d5554a0b7e9917d8380dda097c38b2b91b2cdac08095cde2c48dbba85bd4a1920e980a0
-AUX liblockfile-1.15-makefile.patch 2655 BLAKE2B 16f079f138b98d927e6d421b5445210d8187a204eadd9ffacafa2923d55eb2e0f8d4406795ae1460d853d28a223322663eeb5933736af3b0c422db023fa24c4f SHA512 3e468cb22758910dc992c501321282f8bbfe533037fe2009928d537011662d8347ca28f53d8b8cd92040bfc90b481affb7edfdf06c7c8d1a3e2b2892f7d024db
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
-DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0
 EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
-EBUILD liblockfile-1.14-r1.ebuild 1130 BLAKE2B 14451dec7293976ed3ccd58fbe675f6efc5f05bfae8d211c28b656c544d288c6f09cf40abbc0fbf1234784c24d85f78c589b7ecec4b5b4d0e620b2a57e014fcd SHA512 76f42e4476266e4b9d3d9e3717ac6299fc247bec1892121d515581ba9e476a2b3ae8cc669ea2bc412c02bb6e74d9f96e906628c667c6ccab3ab503e4a083fefc
-EBUILD liblockfile-1.15.ebuild 1165 BLAKE2B bef201605ed043612397ee0c2a5f8bbbc91cb70c945b6690a92b0897596c2df066f2f8eca6e5f9452fa4f78596abfdf69b5257fd8966b5b26f7670ec41aff7b3 SHA512 ed07cccd8be76c9677dc6083a31511aa17c52f8fb02629fc6b7ec962c0e202e55ea669a16cc538eead4564511e63d4c3eec34fa3403142fdb310c4367c30edd3
 EBUILD liblockfile-1.16.ebuild 1365 BLAKE2B eb781781e516595e90681c7b248dd6c9b6cbf1552a963c62a848ab826d8ca96856fe3d4271f9e9b07566264d0b6eed2e7189c4d7d53b8476fa24f8fc8c4ca80d SHA512 215232d3116f0ea65d44ba08e3f44fa284e8831b8e1e9592e09cea910efebb9fc022c84832f7a0f73dba5b7f8a0342a6ec27af04e162e7292190dd076965c40e
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
deleted file mode 100644
index e14bf12ad313..000000000000
--- a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- liblockfile/Makefile.in
-+++ liblockfile/Makefile.in
-@@ -10,7 +10,7 @@
- LDFLAGS		= @LDFLAGS@
- CC		= @CC@
- 
--prefix		= $(DESTDIR)@prefix@
-+prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
- libdir		= @libdir@
-@@ -49,34 +49,34 @@
- 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
- 
- install_static:	static install_common
--		install -d -m 755 -g root -p $(libdir)
--		install -m 644 liblockfile.a $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
-+		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
- 
- install_shared:	shared install_static install_common
--		install -d -m 755 -g root -p $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
- 		install -m 755 liblockfile.so \
--			$(libdir)/liblockfile.so.$(SOVER)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
-+			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- install_common:
--		install -d -m 755 -g root -p $(includedir)
--		install -d -m 755 -g root -p $(bindir)
--		install -d -m 755 -g root -p $(mandir)/man1
--		install -d -m 755 -g root -p $(mandir)/man3
--		install -m 644 lockfile.h maillock.h $(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(bindir)
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
-+		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
- 		if [ "$(MAILGROUP)" != "" ]; then\
--		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
-+		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
- 		else \
--		  install -g root -m 755 dotlockfile $(bindir); \
-+		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
- 		fi
--		install -m 644 *.1 $(mandir)/man1
--		install -m 644 *.3 $(mandir)/man3
-+		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
-+		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
- 
- install_nfslib:	nfslib
--		install -d -m 755 -g root -p $(nfslockdir)
--		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
-+		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- clean:
diff --git a/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
deleted file mode 100644
index 952a5703b5d4..000000000000
--- a/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -9,8 +9,9 @@ NFSVER		= 0.1
- CFLAGS		= @CFLAGS@ -I.
- LDFLAGS		= @LDFLAGS@
- CC		= @CC@
-+AR		= @AR@
- 
--prefix		= $(DESTDIR)@prefix@
-+prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
- libdir		= @libdir@
-@@ -22,7 +23,7 @@ MAILGROUP	= @MAILGROUP@
- 
- VERSION		= $(shell sed -ne "1s/^liblockfile (\(.*\))/\1/p" < Changelog)
- 
--all:		@TARGETS@ test
-+all:		@TARGETS@
- install:	@INSTALL_TARGETS@
- 
- static:		liblockfile.a dotlockfile
-@@ -51,34 +52,34 @@ xlockfile.o:	lockfile.c
- 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
- 
- install_static:	static install_common
--		install -d -m 755 -g root -p $(libdir)
--		install -m 644 liblockfile.a $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
-+		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
- 
- install_shared:	shared install_static install_common
--		install -d -m 755 -g root -p $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
- 		install -m 755 liblockfile.so \
--			$(libdir)/liblockfile.so.$(SOVER)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
-+			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- install_common:
--		install -d -m 755 -g root -p $(includedir)
--		install -d -m 755 -g root -p $(bindir)
--		install -d -m 755 -g root -p $(mandir)/man1
--		install -d -m 755 -g root -p $(mandir)/man3
--		install -m 644 lockfile.h maillock.h $(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(bindir)
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
-+		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
- 		if [ "$(MAILGROUP)" != "" ]; then\
--		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
-+		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
- 		else \
--		  install -g root -m 755 dotlockfile $(bindir); \
-+		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
- 		fi
--		install -m 644 *.1 $(mandir)/man1
--		install -m 644 *.3 $(mandir)/man3
-+		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
-+		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
- 
- install_nfslib:	nfslib
--		install -d -m 755 -g root -p $(nfslockdir)
--		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
-+		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- test:		test-stamp
diff --git a/net-libs/liblockfile/liblockfile-1.14-r1.ebuild b/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
deleted file mode 100644
index d91ee8a4be5d..000000000000
--- a/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="acct-group/mail"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
diff --git a/net-libs/liblockfile/liblockfile-1.15.ebuild b/net-libs/liblockfile/liblockfile-1.15.ebuild
deleted file mode 100644
index 4bd4389ffac0..000000000000
--- a/net-libs/liblockfile/liblockfile-1.15.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="acct-group/mail"
-DEPEND="${RDEPEND}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.15-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 2c65425ae9fd..38f7bfb37c0c 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -2,4 +2,4 @@ DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea8842
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
 EBUILD libmnl-1.0.3-r1.ebuild 749 BLAKE2B f98f63db109dfd68c334dea46a6678dc631708d7c747be37d0424987adcde4ceaf1c2864e518468d45c6ae85935b786aef047f7b05da232a48c3dc0abb81c9d5 SHA512 ecb435192e6fa3681da974dc4f3013b30ae3bf4e6abe0eda5e260d90b87cf861380a7a09f5202069343938a10803fc892acf81318c022f9ad75cb411688b48d4
 EBUILD libmnl-1.0.4.ebuild 760 BLAKE2B cab49e4d3e5b3193531e2b8a133c1c2011f330d0153692d27b75f4bcf31cff9148a22fa376e7774a0cbba53f739024cde67083ba162ff8309ecac2139350924a SHA512 973e4f711700e5f76b291659bf9d23052f95dd2fcb60d806892c91282ea0d13a99dcc387d34a073efb694eefc98da7de6576ab6f307b3ee47dcde1e6b23f7c4d
-MISC metadata.xml 664 BLAKE2B 4245edfc6318a54d3ea1f1cb29113cf0a97be7303aa8861eac42b591a92f79372d771f73cc73f6820496444f05dfef8d798bd7b30adf5911b53b0d969b9eeba7 SHA512 92caf3829016e88cd6560da7ac0bf8140068b69abe8341b5a5c88ee353bdb9bcd5a5b5a1563cc9114d91529b8a134b42b685734e62127b2834393a76e01c5cd7
+MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 7d46164bb176..8e3ebff5ba46 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -12,4 +12,7 @@
 	library aims to provide simple helpers that allows you to re-use code and to
 	avoid re-inventing the wheel.
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libmnl</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index bf56625e7e63..3dd6b48f50da 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,3 @@
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 EBUILD libndp-1.7.ebuild 561 BLAKE2B c5338ef17843cac86e3f72a803e7f2b311da2bff20da3b36313d3fc97edd0c19b1bffe288479b1fa8c42dd976c2c5351c876d94c42924954bbc661256bb06f5d SHA512 3a1a4ef495a927f566f758bca34c3fe3a18c7c7fb1d6c16549d04af350168582d985b1d9b6108d5d04b5cdc4291d531f4b8deb5692fbaa4806a1fa4fb185a3ca
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+MISC metadata.xml 328 BLAKE2B daae7e3df86ad08016fd775c15491ac7d74f23b068d738ffc3ac73afe1be68567d488a007b49a2fe7c5c93b0fc06138838b3deede3b999728e9a597c3e7b0f9f SHA512 25b1bd4544967e35a6a9fe5f09992dd422f9f13203a81feca04db959bbc26bd1f1bb5b6be4642b97ae043c1998107fc54ab721778b2969c4652a90193eee4828
diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
index 39980802b1da..55c542b49523 100644
--- a/net-libs/libndp/metadata.xml
+++ b/net-libs/libndp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libndp:libndp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 5c681928e54d..c260192ffabb 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -6,4 +6,4 @@ EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 981 BLAKE2B c39e1a11445e87d8a4dfbfeafaa9a9e3c31903d4632161c7e40ffc5d23513f74d111536a2ff80e1d16bfb481deacd2a5dcc0dbf7f64d0174508617bfd16b792e SHA512 cb19e1486db81b3ed526053a2d2712545fb24160bd2f24da86d07862d79287eb4433b62d8cb5262b699acbdae3696a8b5c10f29b21f91a1e14c200866644f5ff
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 74c2baebb4ec..e5e613464dbc 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_conntrack</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 47ff8c775344..160192f34f60 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -2,4 +2,4 @@ AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
 EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 765 BLAKE2B cf85b6675bd7f8bb6274587787073beb1e70ea7db14ee8ef76cb9070b1db0a5bb484289c22c255847df27e7d24cff6d8044ee8f2b6985668cf43611b7eb19024 SHA512 230a52abc9917748b59d8cc38ecba74f05f11aeb230c4165e8935c187c13d897ae7ae623539e52f09e67150d3f1e3749881e4f69f63153e31ad365cc0bbe75e6
 EBUILD libnetfilter_cthelper-1.0.0.ebuild 697 BLAKE2B 4b241ef9706daab8243b6d2ccd7fca50e31dd32cae3cb4d2d4f4b7d0c879639f1e893a5c2cdbdf229479ef6482d4b214a3c01f9ba6d7e3e64dacf92d4113f7fc SHA512 031daa0c68910d0f3119d3121137d4d829f4742f7944a4e5c217da11fcc98dd7035787512ad7463cc3b9d44e576f61d219eae62f778243778b3a23dd7ed85a7c
-MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
+MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
index 2c2a7923cfc8..ceb2db8aac8b 100644
--- a/net-libs/libnetfilter_cthelper/metadata.xml
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cthelper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 0c41919e2776..50ca14d6861e 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -2,4 +2,4 @@ AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
 EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 765 BLAKE2B bf865b336ce61e5471d34592fd37eaab5bc83dfaadc231637115a6b9a33c8d83fa2e3c0b5e8f8dc9c61689db6f819a833d7ef890a36f0e6a7c4104d522b2ace9 SHA512 e782ec61b8c9b06fd4d6e9519d001fd93ec5fe93590248fc41766d7c3af2aa5e4c6ff78404d68322ad247e0289e68efbc9d81e9f67efa52b4e56e3857af7e29d
 EBUILD libnetfilter_cttimeout-1.0.0.ebuild 697 BLAKE2B 0aaab17466c3a7ff511b65d12ea978f061e69b80710d092821da0c8ca6c78388ce90772670a5b798140a406c2fc103f3ecd2db7816360beb65e481ea28c09086 SHA512 7b724b75ee17c6e9928d4b7cc65efe252efb1cc628abb332f760cfee423c125c62db1cf79823b4321ccae79b05e5886a0336ed561a98594ce835df677bf9a6ff
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 74c2baebb4ec..430482ee0ae1 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cttimeout</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 27d808929a98..2e3930429077 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -2,4 +2,4 @@ DIST libnetfilter_queue-1.0.2.tar.bz2 354201 BLAKE2B 5df5a94ca07a6fb919d8a153143
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 EBUILD libnetfilter_queue-1.0.2.ebuild 734 BLAKE2B d8d107fefaf2cadf8ab1d447a3057d4dcdb7761be47ab71165a0c7c47c132e75058f88856c957329ee18ae94ed940f222ca986b79f51aa8810da21ef8102b7a0 SHA512 7de798e5f3f7f0454df64bfda182a312a96f5b33b15b86380ea9e3f8d94140d6f8559df945dfb81de2768ab90ca54cd1ec1283ff7ce4620ed9f64057be4deaa8
 EBUILD libnetfilter_queue-1.0.3.ebuild 731 BLAKE2B af4d66659b119dbb220e8d01a735641447c01e1bfddb5359c9eac608b874264046597c28f9c98a3df9fbdf6eccf233e3a1701b6604851c62763ad6b4a96b7a05 SHA512 9dc9aa4d5041c691faf05cd855b60d5a60eb87632bb9f702ce768f79d761b305cdbc45f88f3e0fd440185a254f6ff440e72fe03a50e8045dd1237fdfa108c8e8
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index 74c2baebb4ec..36c0581a520c 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_queue</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index ef5bfcd864c1..283f9ee86a97 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
 EBUILD libnfnetlink-1.0.1.ebuild 1490 BLAKE2B 00d5bb529d106ccce36e8ae5f702edb28abda84998b02aacf09e639fcb38d924977bf7746b480e43610cf4a757c4d50eef410a0b9f70f39199bd6c7ef9206cce SHA512 ad29e647e4d00cdda114b8579807ac3546431123008fe7b3f40260bd15fc5a530b5f97b242e31d1687322d11a5c278d9cb5f11730d5e8a419fb7b98f4b48dbb2
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index 74c2baebb4ec..4bdfc11bfc02 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnfnetlink</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index fe4d345b0202..896afe94d77a 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,5 +1,3 @@
-DIST libntlm-1.3.tar.gz 518803 BLAKE2B 7cdb4a27c4598d935a7f4916359fc6b177eb6407f45d7b3832956fd9a0378cfa6c6e2e490577c843d3c92cdc283681b3b1fc796c4ae48b7f40a99b5a3551b5c9 SHA512 d375d472167e9c0f142e2415428f48ef692c9fcfe4d882ca442e0fbff86554a5bee23747ad1eb27f81d32ec2f3f5ff654e5c095e4b62dc25dc4918e6664966c0
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.3.ebuild 544 BLAKE2B 53a01c011e1d72199e2ef85ddeb6c19c948b0efecad8644929d312fcb0c61c05c10d03d022c7adc240ebde6a1673ed0f583e9a3a42c15531fbc0b6f03f79fb51 SHA512 9dd07a7c1ae43e096cc74d52104cdd2bfcaeb1de12708ef60c23767d477ead55c369f2e02ac0ed07080a39910921224e2380b660aafc104ab673905a12755eea
 EBUILD libntlm-1.4.ebuild 445 BLAKE2B 53b25ce4fd6947072fb4bb4aa724ce2c06fb4966c195bb7d407b6ae55c09d9b2b9570447cb9a82cae61389c709f06764c385a8d5c6bb7929c9a2e46014684163 SHA512 6912b45ad4e81f059e58340b01d366c2381680b00387b9acb1cfc6f926118878a84bd1a55b7045a0d7cbefef16eb7eee0edadc0b7cfa3de22255408f5ee6854d
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.3.ebuild b/net-libs/libntlm/libntlm-1.3.ebuild
deleted file mode 100644
index b78348b90109..000000000000
--- a/net-libs/libntlm/libntlm-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
-HOMEPAGE="http://www.nongnu.org/libntlm/"
-SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-src_configure() {
-	econf --disable-valgrind-tests
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 912671aca81f..ee6c9ccb66fe 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -15,4 +15,4 @@ EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf
 EBUILD libpcap-1.9.0-r1.ebuild 1850 BLAKE2B b58af5a4955c4476724d65f45c4adc44fb950cc327e282d6fb0cf4cb081624f7cbf5f931c557a6b14aaa9b0c992267031f7cb116b80fa0981450ba689d24ae12 SHA512 259c29e531b016747fb9b2ca02782c6e484068bb45b573adf6c4c878f10f056b859db669c63e9cff9ed141aed8e8401ea173452e9b03e424a58dff18e7133e10
 EBUILD libpcap-1.9.0.ebuild 1807 BLAKE2B ef1334b7356fe43b302f8526e70b8c244824ccd60b9e3825484f56f4d46a2f76d23dfac18d7f1c36aebfbba097252e6c27e8f706049cbe0b3c1985a8e938025a SHA512 31f6a00350d35015c7cd6de63715d0e5fcdb86be2aa81067d201c2a9b00196e0d23736969b1a1df7c915fffbbe9e524e57d35f1550ecb644f93659c728fe6116
 EBUILD libpcap-9999.ebuild 1510 BLAKE2B ca653872343d7f710dcf2ebfcf0a85f40fd82392cb030ba6ea0d1b01be98dfb132c748e7baf55c4556300634ee08836886f507b642b5172f6c3ba7ead3e84361 SHA512 472ada950b336389d86c12ef428636702e009a8a0e7fe63ecd0f3eb497a669b97e145b5cd91a4c3e04f1c803470a313502be2f89d400747c91fbc9023c9fcb8f
-MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
+MISC metadata.xml 532 BLAKE2B 849e5d71a36953d94f8fc4ccce028dea25038eeacf50cbfc45c390155ad84b87fdb217b1f2ec4284c331f98d72367b9e3e82283b3660805f506b9eda8cdfd236 SHA512 e71f06ad211b784c6a454411f54a0bb7575a934f86f345602d205fdfa56b609e4d2d0b5c907bad047793f3c7b4373e000f67e914c17c1f402cc267e7e7493f06
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 488e8703b179..241fb6113b5f 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -9,6 +9,7 @@
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
 </use>
 <upstream>
+<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
 <remote-id type="github">the-tcpdump-group/libpcap</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 941c275d977b..4c431e19dbfc 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -8,5 +8,5 @@ DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f87
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.0.2-r1.ebuild 1676 BLAKE2B 95d6e124b652527f41be0b9bd26bc7d0aa5e8771aa66d043296432d41ed5c140a523251dd6ab9666b63f273e4372fefc95d4c3316ab07180c0072a72e1cf0748 SHA512 c90f06a5ee77a4f051c7b6596ef0a6618c7d42fc50ea8874e3937a566902b14f9e841d59518322e082cc29ae23b627389bcd42dbaf22000f531f5dcad00862a7
 EBUILD libtirpc-1.0.3.ebuild 1551 BLAKE2B c390415aadfcd1eed82c0149eac08c8ec8d67ff72ca2ea1da6fd3fd95b0b8c82cc8de27117a1e0ad805e057ed076b8625c2ac7ccd379f3cc711cbd67843ce62f SHA512 2b7c8cf69aca75cdb96ba82334b47ec2a0527daab0da2de4cb59d1086b8598b49bd556efb323a8b4a8e3cdfb1737d06003b3326201f7c6855df30531fb37735a
-EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B 8a7d487f856300242a18659e12974d84d51777f32c8c0d52a99ff3395d5329c7db00e8d329f3d04783779ccf3b803bde59e186ff98f08e390d723b7d3fa6aacd SHA512 3e4c49ada7c56d3c2d041d7e7551e563ca0bc4331287e987bd935063b3217103cf0f9d295c2641b3ece0af37a89776170c005637c9117638dc3a054f170b1951
-MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
+EBUILD libtirpc-1.1.4.ebuild 1546 BLAKE2B 83b9f0c5042dd551b08c5f7418d6077ef48d0c22e85f7d1ffd0e6c9127adae3be340d42c18eb860fa47ac62f5ce8fda08ca99f631d5c3d9b180c356e4e474b65 SHA512 0c7b0826d1e23e23f6536c1e1a5666298ba82a2c9cdf9dee11d24d90b82e95a18707a6f025956b64a32bfa8afe981808286771891815c6531d6b222c78ed269c
+MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
index 154c5fcdab39..c5248f9bf9b7 100644
--- a/net-libs/libtirpc/libtirpc-1.1.4.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index 36e84cdfa7e1..9034a1198e4c 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libtirpc_project:libtirpc</remote-id>
 		<remote-id type="sourceforge">libtirpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 400a82269940..3882cec690d9 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
 EBUILD neon-0.30.2.ebuild 3428 BLAKE2B 0b6d26febcd80cc8289c51abbf7ceae84bd88622808fc0fca3da19131e6ce3ceef4e071b80815b8b6ab8a837c0b60133bd9239173ec3122da47864e35794b258 SHA512 e5b6370cae0b9cb4195cc52ade60e753309d7a3c558e1af5fcfdffcae221c80ff4076da6466e24fc2f1702ff491f7aa0c526809c76bffa8bb3dd898e10952c15
-MISC metadata.xml 1199 BLAKE2B 495e472125fe19c83d094194f31d428eb3dfa48ce15b643200235753e6b551b05c1b5f14f88454fa0dcd0364e3bf1f55ff4d1050d3954928f9398601860e2baf SHA512 623626ea62c3f7998122acbe60e36a67a3d5a5abb1c7239a03bf099b7ee7eceda14b16fd1384e303b9bc39d4b65d932d31c5f365a76b8c45fcb1407fdf80a455
+MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index c22fbd8f2851..78e276ad6748 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -4,6 +4,11 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<longdescription>
 		Neon is an HTTP and WebDAV client library for Unix systems, with a C
 		language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 80adf8aa2fe1..50abc19ebae6 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,7 +1,3 @@
-DIST ripe.atlas.sagan-1.1.10.tar.gz 128425 BLAKE2B ba2ec5c3c58d8ec4cfc03dad89d7b3d705796a3e8a37b518fb63cf32ace360c4790401c5ba384cd3ce6690cea30d83413472aeb26c32ba5dfe46908c5170b6ac SHA512 dab5aa200a77ca4f4a29b2cef79df7c12cee4e6ff2583e5cdf1e6e381b9ca4de2e4bf8c56e9856f9b79ed196f72304d62b8cbaa76b0aa9a5d5294559b8f6bbce
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-DIST ripe.atlas.sagan-1.1.8.tar.gz 100037 BLAKE2B 1054dcedb7f31766fcb2dc388efd87c3a5ca12526757adfcf5b7a57a24caf84bbaa0f84c2377cab1877e95bda96b087f1139a950e5e6acb92f60b29fd9322396 SHA512 9e89eff270d58ac0d69abf5c589a129b468ad7adbe49144eae9e3ee1a73ada3278efbf395aea02b612fd3b3b3db2996d68587f5465b1cec29de79b112cb20b53
-EBUILD ripe-atlas-sagan-1.1.10.ebuild 823 BLAKE2B 46a65babb7ae9990bf2e020b12a70471a84fc48d13fd7cbc1c1e9ce55a50c889de10aaf4a7cfb49577fa3f9de61b19e53d07acee9756f1354a97cd1692f4f8ee SHA512 c4eee9830df50b841f944956896c1cc4766bda0adb68e2b3e0b920205a84671760a4bf64eeaa79e35d0654abb2a28e1f7f4d98e8c50b0814ffcb4e47b346662a
 EBUILD ripe-atlas-sagan-1.1.11.ebuild 856 BLAKE2B 45359fc23e6bd24a561ba5608209df99834a8c0fbd4e24215eded258744ebecb8d905472c3cbaeb310b25df903b4400aa8b6976d1b61532d8f005afa0f92d861 SHA512 799dde2d232cd25e6d695557b1e8c3202a98ffd123ae2673d6fdbc8b430768a0a3f84143c6b1995c754384eea50acc874c45c4dfa830dff372bb5aa3eee49092
-EBUILD ripe-atlas-sagan-1.1.8.ebuild 855 BLAKE2B 1c0b04f14a3aa18e1e3bff3ecba1bc6742455177c091ae92a1a6c1bb161c583d5002b60baa8aefe816e120c8dbd665b68175723cbf9df5774e06af36726977f1 SHA512 54e487101113b84f484c9596c6e95f509438c45d475fdd73eeea3102546e4113b2d430be9a4148c4af4b9e0c0fa1a497a6da0e0e043ba63c2a1066bb79b4fed9
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
deleted file mode 100644
index 2acecbf72e02..000000000000
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A parsing library for RIPE Atlas result strings"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.sagan/ripe.atlas.sagan-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
deleted file mode 100644
index c573da8f16f0..000000000000
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A parsing library for RIPE Atlas result strings"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.sagan/ripe.atlas.sagan-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 994ab9262c16..0c473c7a47b6 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -3,5 +3,5 @@ DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
 EBUILD rpcsvc-proto-1.3.1-r1.ebuild 688 BLAKE2B f86e886eb61a421f74c8373e41ee46a03cc8d92a5616d95cd463df808ea959b2af5e5c67894bce1386d129aaf0606bc1cdd4cf146762ebfb7184ed3bf0272170 SHA512 5a8fab744c86854f0924fb0532bd4c4cb023b83d128572ea440048923c213a5ca6f15df74dbb0537e81b157b6f57d60fba148cc7fd4d38c7df4f5bacbb880cd5
-EBUILD rpcsvc-proto-1.4.ebuild 647 BLAKE2B 274128c8e109224f042bebbaa6b19661fc937ba304a1825b703e783e11c74122b7cf9cb65ffed98188c1e6cf01bd9a2c35f8b7fb4ab5277b6391d7c809f2d21e SHA512 b7f0bf69bd1f36e03cad7aef88df7f860d31533755ae37f07c6e61aff540a0517cdb164e95af1895a8625551beaaab969edb75f52b84199dca8eed22610e4e74
+EBUILD rpcsvc-proto-1.4.ebuild 638 BLAKE2B 1f3e486c64757d266d5ebab2a14049dcdee7ebd0b885c8d758bb6f8ffa3fa2b1407240424f809a82f29d013c103b1714a1ac416d4967a434b65ff60ddd4c97a1 SHA512 aa2005572cc7679296be89a307db3a1486d41cd3a75e2c3f7e52b52e22b649f69aaaa0c78e3ea85def9c8ebdf9a3f42f1f3e9b77bc9d8f89347b2500f5465853
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
index 353734d0571a..15ca0b74ffe5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index fe49fb1c0cf5..2a032f979523 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -8,4 +8,4 @@ DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2a
 EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
 EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
 EBUILD serf-1.3.9.ebuild 2127 BLAKE2B 419bc569c5160f8406ac098b959238a47230d0bf762f7644e420168dd6b252e835616a88598573e66e144747bea5923e5c5e49892a2644aab90bfe22939bce4b SHA512 23ba5aa3fbb59ce5b3140a1a281c3868dbf378c1dc93555ffa5634267ca89c9b0a1109aa8240fcca25ad6ae2178d00db7f4e41db7f9e4405429a6ad359e3e4cf
-MISC metadata.xml 222 BLAKE2B 94ebd170c2e2b56a2a280b892081f4a2b380a9dd63304df741df254293ac82054167980b6e986315718abdf0da5f6d26226df0d13c3f1eedc4ee2f32bdb5a798 SHA512 c4199e672c74e701df271dc48c920480d853cdc341936ef071bb5d1cd3a28127ff0fdf6a4e135ce7e805bcb99bebe93407dd2aa4dfda91a8c66d6cc2d2ae9a01
+MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index 58be4f4a109f..ca82cfff518d 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -4,4 +4,9 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
commit	a1392efe64137262023d92492396ca9156d22396 (patch)
tree	de438b2711c7697c4597fb04f07e988586f34233 /net-libs
parent	e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)