gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /net-misc
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
108 files changed, 903 insertions, 2867 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 646e6f2b9fb2..23e2105fbe82 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 7df583fdb80d..e2f434ba8306 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,28 +1,9 @@
-AUX 511666-segfault.patch 731 BLAKE2B b43d19d5fdaecd3659535981ad6a296131248d2f666a3d1bbc247cce5f82fdb791e564c151da5255bc9b6bd29432bf093cb3b34c0530e2374941ee31924d653b SHA512 3a4e971e7cd60a1cef9644b075f45787d3ef8159d9d18c3aea4847391f246b5c96c658ab98f8b7184e9d315acca3d0d2961826a2785d029b2b4b009686fe7133
-AUX admit-noclass-520696.patch 400 BLAKE2B 034166c262cae8df913275c5838faed7403e625988985ee16b1ea18b347df3889f67a3ec39531ea0d846b270ca754f53ff064ac226f10e97bdc8ca2606d07bba SHA512 1263459a8a91962ddd5290374f4066f38d09eb021bedc86c15683d5b0b9ad3969672cb490ccf386a7816f8401ee1665aef60a10735e539357112f785ce7407ad
 AUX cf-execd.rc6 319 BLAKE2B 0abc025c3b122627576a4f93b7963a5bfc4b9695153e02b855812cab529ada9acbddbbda63095f893eeccf3d5c1c6b861d5f7130db31d56ebbad3d70c9d33af4 SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d
 AUX cf-monitord.rc6 316 BLAKE2B b19ff5106f87b5fed13e090552c9aa00b67d8c6597525e055823638a9c7909da810efddea216177b42557ac15ea760c89e488960526a624c4c7a7b3c30f0dd78 SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a
 AUX cf-serverd.rc6 311 BLAKE2B 82ee5abedac139a55ff886c8503d17f6ef35a3da9bb14975b5e9647652545869cfd30cadb3ed553c868040a23f4a42a6da6eb29aed8a4cece5bb19401108b835 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf
-AUX cfengine-2.2.10-lsbrelease.patch 697 BLAKE2B 346d5e21d49504ee1c27847d168cf07978a296c6a87a29303102ddc9b00740514f622ef79e942b679ea9358d4e715181dce349b4487fdd549d04c89e024c57c0 SHA512 dbbeeb73fb61dc194cd9800fe5be00a292bd106e5ba13292929b067f4748ccdd0f1127914382533323cb20e30dc43ead0963136e8e70c562b54998ed214d1864
-AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 460 BLAKE2B 81de82584ff683d13b2a209f9591bd7939e21d806269731cc3cdba73a0e07bcfa8495e108b419d8e80da3e99741df720e38f720b40133aa21bcc003c6bb4bc4b SHA512 14600a9b48c6ed326600ade59f833ab8d93837218070b5420ac7d4e45e1988a3e15554c8d9280c3d33d11613da3084ed728d5b27435d201eaa6a57978ad1167d
-AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b
-AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55
-AUX cfengine-3.5.3-ifconfig.patch 1776 BLAKE2B e96d9ac013494d43ad2dcf9c7ee5499eae3f799ddf36cf6c147fa9c416b01f31a2fd9b1de1377e82c4f389fda874b06e862055701343c58e5124eba58ab09e6b SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9
 AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece597c63728a7dd890ffbf363bed81d2be22b6354df9acf6d7082fe573418ba53e805ce1581251a458811cccb084a144e SHA512 f2cd1c008f3d4dea418207660c6d6cc4769e7effa50259b59e74ecc3e6fc1581f282fec1482046f50c0e0aa46d40084aa1616bd618de33ae3055ce626bfa9c5d
 AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c
-AUX cfenvd.rc6 255 BLAKE2B e65d843b93d6eacc657f2fc7d03c48ddf55ec1bee8d278cce9c44e9822bbec352cb2f98480095804d5b4511e260448898182deeab28c2127fc4ca723c83ebf3f SHA512 3b6356bd75d2986d4482a6d603cb1b07697d5314a748f440b8f11e7275670c072ed96fddd5a41d4066e19ebbf1d126f93d70428324e37bbb40185dc414e10994
-AUX cfexecd.rc6 260 BLAKE2B c31397f5b0c8473ee4dc1c505ea32bf7618fc5ef25572f0e8023e6bed812ba665d4cd68b050f58035fe29429bbad7b907f0a548deecfaebe24b3ac7e97dc71f0 SHA512 735a34204b6c9d555b454f264edeaf371e1ee7cf80a2c23fcc83d604ed87d3a19dcd9008f6c815a024535b1d9e9a32aac008ce7b4e440f9b688b642050ec7ff1
-AUX cfservd.rc6 260 BLAKE2B 01accee08aa1005eae37f57bb7f6d4bb9133ef137170053677786d4dcef5e5afee1e9b4250c5f1722bc6730dd3b9251f2931cea10759cb897de94231ba26eeab SHA512 c69b2bcc509b0dbcf93a7131a85bcbb57ea2a648b90fb1a886a4fa6bcb787593dc49d03857b0ef8f552e10db46c3002799c67bc57655e43927e02ce1d13c393d
-DIST cfengine-2.2.10.tar.gz 2690333 BLAKE2B a6e0027fc290a46730327f3fc4bf382add421f37759d6972b3f99de92417e77d8c5ff649aa376d216abde017e49072d3bd98aed60a109cb57b9e5920a358923a SHA512 861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea
-DIST cfengine-3.3.9.tar.gz 1256138 BLAKE2B 15a71f5de94f55df9a117331029b81385a8196a5602db5775154527eb1ec63dcf15d55c89b34706e8448baaa6ed8f6cccc4e24bc8c7d6b3c56deedd55d5b606c SHA512 9d64667d001daa2db506abf97ecde43e6b6ac672d3ca6dba4c5e68b742b72f2c7cee65c2f5ab82a12cf0f9b385f48fb0d2bb9eae7fe2ff57b187c725238faf1f
-DIST cfengine-3.4.5.tar.gz 4671628 BLAKE2B d6964631ef6a6ba2fab661c5d0b287f8a5fb8ffc747bd8963133fe0b24d5969f57bed02d059bbee83a042b3c5912fa05aec591262d94e17fd081c0167a154959 SHA512 3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f
-DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a74749b131a424201445b954492d90dfc6a8b0530d5f9bcd2852b41b32ed25dc43e70b525dafc9c4a111b7c4990f SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
-EBUILD cfengine-2.2.10-r6.ebuild 3289 BLAKE2B a879eff37f932f5bf65639f47a6db9602b56239dd8fc0e0ed3d49468063696b5ed82b49643ceaf362dca2380fe142bb330d30ae1ef9b367e27931614a7ddc90a SHA512 39c6795f652346cd4dcb0455c4e637f12a0233c342e4dcc83d54e1e8a855462f8ea805f5883f7daacd527d35597733570acbe7445d732529407943f2aad064c1
-EBUILD cfengine-3.3.9.ebuild 3491 BLAKE2B b74a4325583d6ae105e0fe336be431e12d99a5d6a63d9c242e0ef3318b646c0091403507f9cf767bfe719b7ee5c65d1037cd4f9271c2396f290a04e553f1318a SHA512 803ec254482363e66056005af2f2befb886d84247f89f0054b2d9fc8d288aa642764a4a6c686f65dfc954923ade60f3b837df7e1066d1e73992d19ae7b737154
-EBUILD cfengine-3.4.5.ebuild 3717 BLAKE2B e7385a42ab34a3016afb4b0ab01eb6884640d4cfddb77b0f2b23328f4897a42d5cb3654f603b58398bd8a2971c83428a16d68afee37d5cfd93cd9e42f61c8e6f SHA512 ac9b0b051fbb64d80041e9eced6199ab533a0437813e0e37de21c3aa64a6a482bc1722dad68f7b2818f8ed2739165e2e23148631778d17a043f01a966a1e6973
-EBUILD cfengine-3.5.3.ebuild 3791 BLAKE2B 5ea2c138d74ecad59d7a84f3c6deaef9691945087da761fe869e2444d7f5b02083acc32e6af2f9d9c25533fa19fa610f1d7ce0d142dfaa5082d0a55da45baf29 SHA512 3e8d3e5bedd37d0dc9838ef887db2085ff871810a1d98010d280e0fe2570e6aa96739f90bfa12593ba3d25716ef7b3f700cf13f1bc6b10264b98777264e9923a
 EBUILD cfengine-3.6.2.ebuild 4233 BLAKE2B 5122f44c2f29211090bdaacaf69ea5494ee5c17318dd3c3726a9291d5c7489f50b9d36f27a5cfbb197b890ee9a974f52ae74e012ce5263722e186cc191f30f04 SHA512 64cc74d3cb5ad93b5898d78928be0d81438bca150302ef236e71d6ee6acab3d370f3dfdcd2919685ebe6f98faec119dd3e8872d0f094bdd8d862740d9260e650
-MISC metadata.xml 2159 BLAKE2B fce780617a458d494a437239729a7841c860e797e66f1a8c783c4ffce62bef89b92ef644fa8258cf4209e44aa56b566e9df493a1ba34667611b47bf274cb7bd9 SHA512 c30ddd7fce32d4e7231b860d64940d9368085bc8f65851fefa886b312995512c48f7a1291afcfb80921fac64f2a676946c286723483294d13d4a9c89c01659e4
+MISC metadata.xml 2058 BLAKE2B 55eb2fc9f281e651d45e677bd8dedd4294009ae8975fdf94d15abb295abd92e9a1a2cfbdc97789e14f9a6789c0d6d59678637e947a6d778d10262e01d6936369 SHA512 212daea407c091ede8db7b3444d3e39e354e97a1ddb29ced2c448bbda7eb9dfbfd93dcea5aeeb35198181eee0b9c5ebda454b9d864f9b20c94134ed4fcee41a0
diff --git a/net-misc/cfengine/cfengine-2.2.10-r5.ebuild b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
deleted file mode 100644
index 22bdd71cfd9d..000000000000
--- a/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="vim-syntax"
-
-RDEPEND=">=sys-libs/db-4:=
-	<dev-libs/openssl-1.1:=
-	app-portage/portage-utils
-	net-libs/libnsl:="
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-src_prepare() {
-	eapply_user
-
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
-	# https://bugs.gentoo.org/339808
-	eapply "${FILESDIR}/admit-noclass-520696.patch" \
-		"${FILESDIR}/511666-segfault.patch" \
-		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
-
-	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
-	# messages say to turn it back down.
-	if use x86; then
-		sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
-	fi
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--disable-static \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
-	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
-		-e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
-		-e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	# Fix man pages
-	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
-
-	emake DESTDIR="${D}" install
-
-	# Remove static library and libtool file as they are not needed
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	dodoc AUTHORS ChangeLog README TODO INSTALL
-
-	# Manually install doc and inputs
-	doman doc/*.8
-	doinfo doc/*.info*
-	docinto examples
-	dodoc inputs/*.example
-
-	# Create cfengine working directory
-	dodir /var/cfengine
-	fperms 700 /var/cfengine
-	keepdir /var/cfengine/bin
-	keepdir /var/cfengine/inputs
-	keepdir /var/cfengine/modules
-}
-
-pkg_postinst() {
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-
-	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
-
-	einfo
-	einfo "NOTE: The cfportage module has been deprecated in favor of the"
-	einfo "      upstream 'packages' action."
-	einfo
-	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
-	einfo
-
-	elog "You MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-}
-
-pkg_config() {
-	if [[ -z ${ROOT} ]]; then
-		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
-			einfo "Generating keys for localhost."
-			"${EPREFIX}"/usr/sbin/cfkey
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
deleted file mode 100644
index d172669af7b2..000000000000
--- a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="vim-syntax"
-
-RDEPEND=">=sys-libs/db-4:=
-	<dev-libs/openssl-1.1:=
-	app-portage/portage-utils
-	net-libs/libnsl:="
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-src_prepare() {
-	eapply_user
-
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
-	# https://bugs.gentoo.org/339808
-	eapply "${FILESDIR}/admit-noclass-520696.patch" \
-		"${FILESDIR}/511666-segfault.patch" \
-		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch" \
-		"${FILESDIR}/${PN}-2.2.10-lsbrelease.patch"
-
-	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
-	# messages say to turn it back down.
-	if use x86; then
-		sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
-	fi
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--disable-static \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
-	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
-		-e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
-		-e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	# Fix man pages
-	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
-
-	emake DESTDIR="${D}" install
-
-	# Remove static library and libtool file as they are not needed
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	dodoc AUTHORS ChangeLog README TODO INSTALL
-
-	# Manually install doc and inputs
-	doman doc/*.8
-	doinfo doc/*.info*
-	docinto examples
-	dodoc inputs/*.example
-
-	# Create cfengine working directory
-	dodir /var/cfengine
-	fperms 700 /var/cfengine
-	keepdir /var/cfengine/bin
-	keepdir /var/cfengine/inputs
-	keepdir /var/cfengine/modules
-}
-
-pkg_postinst() {
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-
-	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
-
-	einfo
-	einfo "NOTE: The cfportage module has been deprecated in favor of the"
-	einfo "      upstream 'packages' action."
-	einfo
-	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
-	einfo
-
-	elog "You MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-}
-
-pkg_config() {
-	if [[ -z ${ROOT} ]]; then
-		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
-			einfo "Generating keys for localhost."
-			"${EPREFIX}"/usr/sbin/cfkey
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
deleted file mode 100644
index a671fd89e08f..000000000000
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~s390 ~sparc x86"
-
-IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	libvirt? ( app-emulation/libvirt )
-	>=dev-libs/openssl-0.9.7
-	dev-libs/libpcre
-	net-libs/libnsl"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--enable-fhs \
-		--docdir=/usr/share/doc/${PF} \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		$(use_with qdbm) \
-		$(use_with tokyocabinet) \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with libvirt) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install the documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	emake DESTDIR="${D}" install
-
-	# Evil workaround for now..
-	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
-
-	dodoc AUTHORS
-
-	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
deleted file mode 100644
index f3399734b57b..000000000000
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
-
-IUSE="acl examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet
-vim-syntax xml"
-
-DEPEND=">=sys-libs/db-4
-	acl? ( virtual/acl )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	libvirt? ( app-emulation/libvirt )
-	xml? ( dev-libs/libxml2:2  ) \
-	dev-libs/openssl
-	dev-libs/libpcre
-	net-libs/libnsl"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	epatch "${FILESDIR}/${P}-acl.patch"
-	epatch "${FILESDIR}/${P}-ifconfig.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--enable-fhs \
-		--docdir=/usr/share/doc/${PF} \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		$(use_with acl libacl) \
-		$(use_with qdbm) \
-		$(use_with tokyocabinet) \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with libvirt) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install the documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	emake DESTDIR="${D}" install
-
-	# Evil workaround for now..
-	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
-
-	dodoc AUTHORS
-
-	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
deleted file mode 100644
index 911431636bda..000000000000
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools flag-o-matic
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source-code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
-
-IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
-
-DEPEND="acl? ( virtual/acl )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	libvirt? ( app-emulation/libvirt )
-	xml? ( dev-libs/libxml2:2  ) \
-	dev-libs/openssl
-	dev-libs/libpcre
-	net-libs/libnsl"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	epatch "${FILESDIR}/${PN}-3.4.5-acl.patch"
-	epatch "${FILESDIR}/${P}-ifconfig.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-
-	econf \
-		--enable-fhs \
-		--docdir=/usr/share/doc/${PF} \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		$(use_with acl libacl) \
-		$(use_with qdbm) \
-		$(use_with tokyocabinet) \
-		$(use_with postgres postgresql) \
-		$(use_with mysql mysql check) \
-		$(use_with libvirt) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install the documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	emake DESTDIR="${D}" install
-
-	# fix ifconfig path in provided promises
-	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
-
-	# Evil workaround for now..
-	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
-
-	dodoc AUTHORS
-
-	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
-	done
-}
-
-pkg_postinst() {
-	echo
-	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/files/511666-segfault.patch b/net-misc/cfengine/files/511666-segfault.patch
deleted file mode 100644
index ea3ae9686254..000000000000
--- a/net-misc/cfengine/files/511666-segfault.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix a bug involving CheckFriendReliability (see bug #482439)
-
-Index: cfengine2-2.2.9/src/instrument.c
-===================================================================
---- cfengine2-2.2.9.orig/src/instrument.c	2009-03-06 21:25:59.000000000 +0000
-+++ cfengine2-2.2.9/src/instrument.c	2009-03-06 21:26:31.000000000 +0000
-@@ -716,11 +716,11 @@
-       key.data = timekey;
-       key.size = strlen(timekey)+1;
- 
--      if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0)
-+      if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0)
-          {
-          if (errno != DB_NOTFOUND)
-             {
--            dbp->err(dbp,errno,NULL);
-+            dbpent->err(dbpent,errno,NULL);
-             exit(1);
-             }
-          }
diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch b/net-misc/cfengine/files/admit-noclass-520696.patch
deleted file mode 100644
index 1e5d8594aaed..000000000000
--- a/net-misc/cfengine/files/admit-noclass-520696.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix a bug with admit/grant that let cfengine2 fails when the class
-of a cfengine fragment does not exist and more than a host or IP
-ranges are specified for a path (see #520696)
-
---- a/src/install.c
-+++ b/src/install.c
-@@ -6561,7 +6561,7 @@
- if (!IsDefinedClass(classes))
-    {
-    Debug1("Not installing Auth path, no match\n");
--   InitializeAction();
-+//   InitializeAction();
-    return;
-    }
- 
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
deleted file mode 100644
index 6f8dfa04d8f2..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Newer GCC mis-compiles the lsb_release reader function.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---- cfengine-2.2.10/src/misc.c	2009-02-10 21:55:36.000000000 -0800
-+++ cfengine-2.2.10/src/misc.c	2020-01-06 17:58:07.049226386 -0800
-@@ -1187,6 +1187,7 @@ if ((fp = cfpopen(VBUFF, "r")) == NULL)
- 
- if (ReadLine(VBUFF, CF_BUFSIZE, fp))
-    {
-+   Debug4("(%s)",VBUFF);
-    char * buffer = VBUFF;
-    strsep(&buffer, ":");
-    
-@@ -1198,7 +1199,8 @@ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
-    info = buffer;
-    while((*buffer != '\0') && !isspace(*buffer))
-       {
--      *buffer = tolower(*buffer++);
-+      *buffer = tolower(*buffer);
-+      buffer++;
-       }
-    
-    *buffer = '\0';
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
deleted file mode 100644
index 80a3a542974b..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
-+++ b/src/instrument.c	2010-10-15 22:21:34.132271440 +0200
-@@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
-    
-    tthen = (time_t)then;
- 
--   snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen));
-+   snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime(&tthen));
-    datebuf[strlen(datebuf)-9] = '\0';                     /* Chop off second and year */
- 
-    snprintf(addr,15,"%s",hostname+1);
diff --git a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch b/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
deleted file mode 100644
index 815f257c36fa..000000000000
--- a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a12b5b3b8cd4397545104923d1de3297fd971f9e Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 29 Mar 2013 00:23:21 +0100
-Subject: [PATCH] Fix acl header detection
-
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 542d115..f3f0c04 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -335,7 +335,10 @@ AC_ARG_WITH([libacl],
- if test "x$with_libacl" != xno; then
-   CF3_WITH_LIBRARY(libacl, [
-     AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi])
--    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
-+    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [found_acl_h=yes], [])
-+	if test "x$found_acl_h" != xyes; then
-+		AC_MSG_ERROR(Cannot find libacl library headers)
-+	fi
-   ])
-  fi
- 
--- 
-1.8.1.5
-
diff --git a/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch
deleted file mode 100644
index 47107784ce0f..000000000000
--- a/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch by clabbe.montjoie@gmail.com
-https://bugs.gentoo.org/444532
-
---- src/conf.h.in.old	2012-12-28 16:18:23.000000000 +0100
-+++ src/conf.h.in	2012-12-28 16:19:08.000000000 +0100
-@@ -773,3 +773,6 @@
- 
- /* Define to rpl_vsnprintf if the replacement function should be used. */
- #undef vsnprintf
-+
-+/* Define to the path for running ifconfig -a */
-+#undef IFCONFIG_RUN
---- src/unix.c.old	2012-12-28 16:05:28.000000000 +0100
-+++ src/unix.c	2012-12-28 16:13:15.000000000 +0100
-@@ -900,7 +900,7 @@
- 
-     default:
- 
--        if ((pp = cf_popen("/sbin/ifconfig -a", "r")) == NULL)
-+        if ((pp = cf_popen(IFCONFIG_RUN, "r")) == NULL)
-         {
-             CfOut(cf_verbose, "", "Could not find interface info\n");
-             return;
---- configure.ac.old	2012-12-29 11:38:20.000000000 +0100
-+++ configure.ac	2012-12-29 11:49:11.000000000 +0100
-@@ -882,6 +882,16 @@
- 
- 
- dnl ######################################################################
-+dnl Find the path to ifconfig
-+dnl ######################################################################
-+
-+AC_PATH_PROG(IFCONFIG_PATH,ifconfig)
-+if test x"$IFCONFIG_PATH" = x"" ; then
-+  AC_MSG_ERROR([Cannot found the ifconfig binary.])
-+fi
-+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a])
-+
-+dnl ######################################################################
- dnl Summarize
- dnl ######################################################################
- 
diff --git a/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch
deleted file mode 100644
index dc982c6801f7..000000000000
--- a/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur cfengine-3.5.3.orig/configure.ac cfengine-3.5.3/configure.ac
---- cfengine-3.5.3.orig/configure.ac	2013-12-09 13:13:14.000000000 +0100
-+++ cfengine-3.5.3/configure.ac	2014-02-27 12:36:55.179893570 +0100
-@@ -1047,6 +1047,16 @@
- AM_SUBST_NOTMAKE(post_macros)
- 
- dnl ######################################################################
-+dnl Find the path to ifconfig
-+dnl ######################################################################
-+
-+AC_PATH_PROG(IFCONFIG_PATH,ifconfig)
-+if test x"$IFCONFIG_PATH" = x"" ; then
-+  AC_MSG_ERROR([Cannot found the ifconfig binary.])
-+fi
-+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a])
-+
-+dnl ######################################################################
- dnl Summarize
- dnl ######################################################################
- 
-diff -ur cfengine-3.5.3.orig/libpromises/unix.c cfengine-3.5.3/libpromises/unix.c
---- cfengine-3.5.3.orig/libpromises/unix.c	2013-12-09 13:13:14.000000000 +0100
-+++ cfengine-3.5.3/libpromises/unix.c	2014-02-27 12:38:35.036608105 +0100
-@@ -767,7 +767,7 @@
-         return;
-     }
- #else
--    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+    if ((pp = cf_popen(IFCONFIG_RUN, "r", true)) == NULL)
-     {
-         Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
-         return;
-diff -ur cfengine-3.5.3.orig/libutils/config.h.in cfengine-3.5.3/libutils/config.h.in
---- cfengine-3.5.3.orig/libutils/config.h.in	2013-12-09 13:55:25.000000000 +0100
-+++ cfengine-3.5.3/libutils/config.h.in	2014-02-27 12:39:41.537416111 +0100
-@@ -914,3 +914,6 @@
- 
- /* Define to rpl_vsnprintf if the replacement function should be used. */
- #undef vsnprintf
-+
-+/* Define to the path for running ifconfig -a */
-+#undef IFCONFIG_RUN
diff --git a/net-misc/cfengine/files/cfenvd.rc6 b/net-misc/cfengine/files/cfenvd.rc6
deleted file mode 100644
index 638ae993dcf5..000000000000
--- a/net-misc/cfengine/files/cfenvd.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cfenvd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cfenvd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cfenvd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cfenvd
-	eend $?
-}
diff --git a/net-misc/cfengine/files/cfexecd.rc6 b/net-misc/cfengine/files/cfexecd.rc6
deleted file mode 100644
index 032a9c469b50..000000000000
--- a/net-misc/cfengine/files/cfexecd.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cfexecd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cfexecd 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cfexecd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cfexecd
-	eend $?
-}
diff --git a/net-misc/cfengine/files/cfservd.rc6 b/net-misc/cfengine/files/cfservd.rc6
deleted file mode 100644
index 034b25c72000..000000000000
--- a/net-misc/cfengine/files/cfservd.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cfservd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cfservd 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cfservd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cfservd
-	eend $?
-}
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 3c6b17c9adcc..e0c37fb6131c 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -6,11 +6,9 @@
 		<name>Gentoo Sysadmin Project</name>
 	</maintainer>
 	<use>
-		<flag name="html">Install HTML documentation</flag>
 		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
 		<flag name="masterfiles">Install the Masterfiles Policy Framework</flag>
 		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
-		<flag name="tests">Install test files</flag>
 		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
 	</use>
 	<longdescription>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index c259fd33830f..a47b1b15a9a4 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -6,7 +6,9 @@ AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
+DIST chrony-4.0-pre4.tar.gz 544660 BLAKE2B d7f25a980a8cfd9c56fdf4f8ab3dc63594a428e0a18a5bb3b93488ea4db16201e67589ac8a0d966dea4a06c7ff9c4dfa5a1adc3a77849f69d594305e5961a1c8 SHA512 81471682b091851f79dfe08315a016c01199b850a1cc6289a3f3d6f56df2ab415266e156900f2e9d60804197097ff8bb89bf7c8072a90a05d6f257b5368e5939
 EBUILD chrony-3.5.1-r1.ebuild 4761 BLAKE2B d0bf0aa6403b9f4d691d41a4fd77de3b2de15783ebb445c403ffd3777e3888ecc659e05f131a2b0465e20c5f64c4f6e9084680ed01bc75f410b93caf13b84f49 SHA512 b2cfbab377cc697cd8903708dd870b7bda141a32b9a5f4f4a155efa93dd6ccd5af815c98005a074e039b3645938c3c684ee9d0afb418de6236ddf8db903394df
 EBUILD chrony-4.0_pre3.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
+EBUILD chrony-4.0_pre4.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
 EBUILD chrony-9999.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
 MISC metadata.xml 1744 BLAKE2B a30c56ac26aca1450ed5654e496132b47eb498694a2c5da6bcdd55f974f9379835aca68dc4293cf07a13aae0d1507b3b1db473bbb5fe32e02f82f403ae069420 SHA512 4bf5ef57e61ac80f7c45662125a6b5000072edf698be5c48333ce2a286950627381afad062df12268eb4e628a00d48f37e401aa79bd6e43a7e87a74c605a7176
diff --git a/net-misc/chrony/chrony-4.0_pre4.ebuild b/net-misc/chrony/chrony-4.0_pre4.ebuild
new file mode 100644
index 000000000000..b5c97cbbd863
--- /dev/null
+++ b/net-misc/chrony/chrony-4.0_pre4.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +seccomp +sechash selinux
+"
+REQUIRED_USE="
+	?? ( libedit readline )
+	sechash? ( nettle )
+"
+RESTRICT=test
+CDEPEND="
+	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	nettle? ( dev-libs/nettle:= )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+)
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
+
+	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp; then
+		sed -i \
+			-e 's/ -F 0//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
+	# not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+		$(usex caps '' --disable-linuxcaps)
+		$(usex cmdmon '' --disable-cmdmon)
+		$(usex ipv6 '' --disable-ipv6)
+		$(usex nettle '' --without-nettle)
+		$(usex ntp '' --disable-ntp)
+		$(usex phc '' --disable-phc)
+		$(usex pps '' --disable-pps)
+		$(usex refclock '' --disable-refclock)
+		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
+		$(usex sechash '' --disable-sechash)
+		${CHRONY_EDITLINE}
+		${EXTRA_ECONF}
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+		--without-nss
+		--without-tomcrypt
+	)
+
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		fowners ntp:ntp /var/{lib,log}/chrony
+		fperms 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=false
+
+	if has_version 'net-misc/chrony[caps]'; then
+		HAD_CAPS=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
+		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+		ewarn "This is necessary for chrony to drop privileges"
+	fi
+}
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
new file mode 100644
index 000000000000..9ba97c7b2665
--- /dev/null
+++ b/net-misc/croc/Manifest
@@ -0,0 +1,107 @@
+DIST croc-8.3.2.tar.gz 2542462 BLAKE2B d113164e0cf56b1d996df5c1e3dd345bfa26d3c18c4f78865002641903b76fd64ce0470ccefcb4398feca8e0431e586cd842d8a56e0bf15688b12c3cfaa79d68 SHA512 d1ca24f41f21acb9a4548697030bbdbf67faf220abeb1b1eb22ad3309c89b0d39cae5578c21ae66831e7d043dfa7fa3075c20175cfbc55263853a127151ec754
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip 15230 BLAKE2B 0c1948a396a0dff83d93bee74ed9bfd558d6719fc1881d01d060cef8bc231fd6fb5f0c2c2542f9e9b482e893af6fe89e93abc12f7a29e27eb76e7728b8df556e SHA512 7fe3517b3b1a5bf60782d7c15ef44b622090a21d4420e52a2a43a10da9b636eb1abf66b213b19bb699e8f60a96f122c888bd12906b2f2e2644b928f35b8c9139
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod 42 BLAKE2B 82ce41a468f86b7e890b3f78540b186af17a4dba7dc95f9e19ae08a0008af3ab1a4f6dc4038233dad1cc62b9c8e0950c6ea062f03f4502cbccb256a84c4cea45 SHA512 330121b143198b7a6564df33fd8cb6b2526d641c08301f7e26c06a4274e8e038b16b0bc833ec3363770f0c177882fe0e8021d721a2fc32e8050e75a2051febf9
+DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip 32312 BLAKE2B 37cf6c05b306d6d88aaf6455a0068dcd5744657e057529ec6e62b1117b87c09c40d159e1d1205f6751111c4eea3194cbfe199de5d7a74d3a0ada349ceb4b8e51 SHA512 ca740e3296a7699459cfc4ce454277c7b5dc2bacd12ad5959f6d2a77d9d268f6671d4c30b1c84072d53045935838005d2dcc5beeab1acfee6e952c67e0bbc859
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod 34 BLAKE2B 86aaf734f424439c38d57c59bb08da879781d897196a6f1c6486fe74677d055bc301fdfd72825e079b50bb04ef2a12db0c0e65a0a59f0be65db12f03c731bed9 SHA512 8664f01b08e210d9f70e72a1c8add0547055979561ebc689e9b7f601f4ee8359d00649a5f8a0bc0c9715009ef8066a1924f5311377b7346685b3bef676481dcc
+DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod 142 BLAKE2B 61dc9cff180fdd116136f37018e74635e19370e37f237c8cf7b52cc026d91ca0e97c1da39232828405f26b786fc39a81b70a2ffa09a9279bdff711a0f219072f SHA512 33c28ef3ee2d71f8f2a4c02a443bf9f40c6b7bab1e56a686e5f7e0e497eae7f2878d3e725be8cf15ad1be26716ab0d783404529f082a36056173f718f4bdd68a
+DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip 9682 BLAKE2B 8257caa4722ca71e9155888b9b483aabd2f5ebd4d561ebf263c40c260c9feea01f57844e0952ff890806b2d434dcf3731d859b7d7e5cf08aa8c086bd9522f9b7 SHA512 a297bdc807d24ed88953c86aa0ac320851977324dbff9e00d4e5b813a0a8467b9cf12f6536759a4d87c7695579d2a3efd050991d488dfef4c85c996f9e6005ee
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
+DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod 42 BLAKE2B 28d1441e2d219c8194a4acaaea2d072866bef631fec3e10ccf73527337b09da5a4205a4298f60ed823bdc323a7517e69f3fb1cab925baec13a6684688d8f26ad SHA512 db5dd8742ef68cf0e1710f2065435b07f44899cca8c2bcd4df2a127596ff778661531f45a35a59b981b4fcb246757beea26835ddab8e3f5d24954af616067124
+DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip 4494 BLAKE2B e17a498a1c54d88a2e98483c52efbd8e0150a728c299e0bb0319ea820cc50276e5f2727c549a126d3094efe9a889adcdc2862286f19fcb870abe8a9157fac4ee SHA512 25f1fde274a499c5ade50061cbb5727f2798158b1547092b298d36b89ed0efcfe84b727e20a3dc980b1f9fcaa1a0dc07f8e0369155df11bd5f76b8fffbb32a64
+DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb44d202f99b7e2168a08000eba8b70f3b669190d8ebd8d485adada71049cacc71b6e72931d45284565b816597f995e16858b2fd0a2eef2cd815c7d SHA512 eaedd08e8235f2a61d8e3c8e342b1773d2d687351e715adc8ea13d1e49511d16c6f8d5510bba5ffcb9d295a64813d21214e6d55dadcd1c8686f9c3320a9d2511
+DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.mod 256 BLAKE2B 6db1eae7733ceafbf69c2a627c61260ea496109ec997f1baf03f8d5522b7b723532ef06c91d1b581ff02fbb11eb9f306b0649c1b03846edba123cbb117fc4b78 SHA512 2afe00182ead5ed732add5c73f4268a28184bb48c5c3489d7dd60a661d9dca0ca4240369cbd27e9381d10140bcb3d4f39e73f7e7896380d55dde57f1727e7992
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.zip 7809 BLAKE2B 90cae180375deefc1cf194f89dd2c356f14de22a6514911ee9e6e0413c55841fc24f7334e9861279b0efce74382c36532595f5c0f38b8cd83d6fdee1d6d55e98 SHA512 ce3df459a08d92b2d6f1f3832d2d8dd44f827f95703e9b11ed0c758ad160c40d8f3ba3b9caf61f448741900ccc718dc65ba5933ab444db06f855510ade7e5a4e
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.mod 259 BLAKE2B 5e53a9867d162f1e4e5123307344d1fc8cad3eeaf729bbfccb2ba508f9b454be4bcda796c640840567c677c1881d8d22d0b15d7ed5f09d03dfb98e164c8be385 SHA512 d0cb54b94e22519f0d53e30c2571274deeaf15bda3df9d15e805c83d4efad63902f593761410a8d11871610a2b0ef09f7e6c096080529494511948536b204e36
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.zip 10286 BLAKE2B 36f83614f5f443bca84956bd58e6d813c97d2627fb4330aa50faa9453f9cab0eaef87dffddf229f04706486d57933ab90fa97ce9a3a9209d2d39c96c23e01cc7 SHA512 08cbb78e55392078b41d287823994a48a8af64649371acbc1e86f9a42c318dca18ce42c54eca65779477f4a454469d7601483b07cce7db3a2c7b40b5b1939a22
+DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.mod 215 BLAKE2B ffd46ea78d3bd4056b847fbc7fe0dc3a0d66311c962e116209c6d36a55310324cd4911a57faa695f8b9fdfa18e44f1feca756746760770c3928f42df428ce97e SHA512 ecff876ae068c2b14b675ef336b2b217b490302d3db183cecc6ab70f981d4b848c4b85acfe9637159bc18002b606904bf318387e9722b995901cca1f3bf836cd
+DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.zip 11585 BLAKE2B e601ef9ca149678f6f56e35d3e6248134269968796fe61fc04edfef81199c199c3e28ef1b3981fe388bda92296b91ffaafbd7ea89234b6d541bdeb13de270ce4 SHA512 c9c52f87ba0472d909ce10d9e31bb978334bea9264999591e0c14a86dc39edd05704d8c0174f498617b760d8087d5e9ee585f999aa80d4c039a8720633a7a567
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.mod 429 BLAKE2B 3aea302dca6784c0ec50a040419fdc2537af06f18b469a70777896c34dedd5d21a1a5588f024ee3ea0f9bf77e1cc794405b45b6d705600a7ad0cbb6080679c06 SHA512 58caaaa80b8c2cf73287afb985959b0f31a113fd38fc8d9c635b4fd3a308bab5e6694e49388790d54ecbb3e27e525b62e863a8430b189ff6d4c896d6ed3ed34a
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.zip 605787 BLAKE2B 339fca9864d95f7776dba2eb97a44a3cf55d7155be37bcbc491563ff2e6f8390de842cd3cdb2e8ac2cf5e9add200774b8260778e51f6af944c02533b7600b39c SHA512 7aed0a84d74289245090da6566dd0bb9a0d8858792e31e9fece26344ae8670039a0ec6c4cb6533f7759d098ffceafdf7019adaa853f07e0689ae15b0602ea7ff
+DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.mod 34 BLAKE2B 5f3c9e06283ff0f5bebdd8f2dd80b5c73889cd9c8b4151e1eba6a7d8a32bd5a3d97a8fb4523cddf08f9ed6155b1082fc290524a6bfca218b650dd327a13dba41 SHA512 aeae9f51dff80a8751c736027566b69fdf60131438135e3d33fbba1008c384a4bfdc7ae646357399f04d358c2cd305da3d693f2dfc7d1b67ed2d81e03a67062d
+DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.zip 15758 BLAKE2B 09b3b2c9128c1c879299a9224306a940ced1e9d8493d45af7260d95cddf19714f675e620667e90f67da60d1b9170c3df1667f6d10be5675396ad2a3ec06c211a SHA512 0d6489d0f8be43d9a0e5f543d6d4b0c190d34309dcd0dacd4ed0d795015f671a8964608d9235b70b89826af90207226214ceef5f41860ab7d3d6d1fdb7f486b1
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f
+DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip 72830 BLAKE2B 5ce514604ab22c4d54b49be8b79448ccd2218c7d189acf746b74b2bf6869ff3dc74a99306b89bc7ee198cb78f717f05640ba6ca365c5f54b999730283354e4eb SHA512 72c9fdf871d60349e2dddc1dc70ba27b22632b0f0f992e7fa53ac89fdb7daf952fe5ac2c2a93a3875ca036cb7f14dff7c555267468fe9f533901d3766ee674bb
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.zip 1487101 BLAKE2B 248836520e1dae45333b38bbdc889cf8ce136c536891ce3e819af8decba00317dda0b4e186607b25e2ad605997c1c8ee1f7535077e6f9f2e79fdb89c8fcc125b SHA512 410356c04131880f99da82743350d70fbbdcb71b85f1a96be3648eaf580942770ed2146594928e13cef46ccc9a2bfc9b125f3de2568aabea1c9610684ea16659
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod 29 BLAKE2B 19c591a3bcec66342d2e3b47488fa4975e9b0e48628091fd8c36b77a2dfca279ca5be1d2fac9b97b8f43db6315fe24b4597ad91c4b26d963746b3022ff31e1fb SHA512 aaa83d3edd25827dc6a4f3ef13c8c726f518c91343ba85ecc09cbfbf9a318b66394506db5b72c3e9117b21b9ebc9cf81d1d6ec4cbd4246f8de32123cbea0ea24
+DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b52504f3fd58c5f8452a550633d79407310c27ee0ecc66c612e7011937a1e220bb67e8fbc47d2bf9d88ccdad6088d967ea541f4a7e302dbe441 SHA512 d371c8a87ec7ea2f7fc4af4818292d4882c15de1709f6d939adbf86a6a81537d066aceb0538c4fcf9849e05018755caa472be5f3e3894cdb462c9fa2ee3b0a44
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+EBUILD croc-8.3.2.ebuild 5771 BLAKE2B a975f1a23bc6222bdae58f835dce4b919749fe0e2b902aaec18ebf88994b6e32c595d72ebfb0b251b0a268c75150b603197dd03bbde6cb3b85d926f8b311c4ba SHA512 40bd78393e802c2310a11f4516c51a03f77725db4df3a5c2f7e41323abcbad55ee86a74d1ff6058ecc9f6cbee3083c04c86a44576bcd552b9f640672250a27ab
+MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.3.2.ebuild b/net-misc/croc/croc-8.3.2.ebuild
new file mode 100644
index 000000000000..3fc261c88d26
--- /dev/null
+++ b/net-misc/croc/croc-8.3.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.5"
+	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisbrodbeck/machineid v1.0.1"
+	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
+	"github.com/kalafut/imohash v1.0.0"
+	"github.com/kalafut/imohash v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.7"
+	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/schollz/logger v1.2.0"
+	"github.com/schollz/logger v1.2.0/go.mod"
+	"github.com/schollz/mnemonicode v1.0.1"
+	"github.com/schollz/mnemonicode v1.0.1/go.mod"
+	"github.com/schollz/pake/v2 v2.0.4"
+	"github.com/schollz/pake/v2 v2.0.4/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.0"
+	"github.com/schollz/peerdiscovery v1.6.0/go.mod"
+	"github.com/schollz/progressbar/v2 v2.15.0"
+	"github.com/schollz/progressbar/v2 v2.15.0/go.mod"
+	"github.com/schollz/progressbar/v3 v3.5.1"
+	"github.com/schollz/progressbar/v3 v3.5.1/go.mod"
+	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9"
+	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"github.com/urfave/cli/v2 v2.2.0"
+	"github.com/urfave/cli/v2 v2.2.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a"
+	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/tylerb/is.v1 v1.1.2"
+	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.md )
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	einstalldocs
+}
diff --git a/net-misc/dmr_utils/metadata.xml b/net-misc/croc/metadata.xml
index f4c696b2c619..43324a981870 100644
--- a/net-misc/dmr_utils/metadata.xml
+++ b/net-misc/croc/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<name>Rick Farina</name>
-		<email>zerochaos@gentoo.org</email>
+		<email>sultan@gentoo.org</email>
+		<name>Stephan Hartmann</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">schollz/croc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/dmr_utils/Manifest b/net-misc/dmr_utils/Manifest
deleted file mode 100644
index 199ebaadb406..000000000000
--- a/net-misc/dmr_utils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD dmr_utils-9999.ebuild 438 BLAKE2B 31fa2571ec54b379bbcb7c34497762efcc41c29cf4a54ff5206f17c39e12b5d06dd85c5b902f98ab58bfcfdd86aca7a4fd96f521fc546444c392f34811564e9f SHA512 bde028534c8f7cb22e9cf00740fec6ce171e46e7b58e49e41aab4306d47c72169bb2da62a8a5747754781250cd0efd3dd1c79bd9c20214ef4b4b679678e914b4
-MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-misc/dmr_utils/dmr_utils-9999.ebuild b/net-misc/dmr_utils/dmr_utils-9999.ebuild
deleted file mode 100644
index 134326c73ccf..000000000000
--- a/net-misc/dmr_utils/dmr_utils-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit git-r3 distutils-r1
-
-DESCRIPTION="Python utilities for working with DMR"
-HOMEPAGE="https://github.com/n0mjs710/dmr_utils"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/n0mjs710/dmr_utils.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-PDEPEND="dev-python/bitarray["${PYTHON_USEDEP}"]"
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index f3dab4042266..e106e58f94f5 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -3,8 +3,6 @@ AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fe
 AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4
 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
-DIST exabgp-3.4.28.tar.gz 546611 BLAKE2B c4916fd903fe8853e99ba872d87dc97908546c53d34936019c809ffa18761c3044dd7a21aace9bf6e5bb6a2823d2178422b4cdc2e8f65d7be1fda6de2755ae4d SHA512 40edde5262e3033b5fcccf1e6020cce1fe856b6e31420e14166d5e0d636e5f616283827af2cd82946d94a196ef76ed7c5330ac4bebc564329852869f13018403
 DIST exabgp-4.2.7.tar.gz 2931058 BLAKE2B 2c7bf175322a36c800a8a5874b699b01f4c3d4a8712b1f8decb73665cd214c25ccf657909cfef74610e6a5fd1903245bc4da638ac9245b04c6e63d8247d72d50 SHA512 9c53b78e3fc5ff9cef4d267e2cb3509dbcfdd4a3b21d2c7e40a8d873a9ac586b8d5bf860699b6f878cc221af341df140acdf88aaa26a79b0e7865ce7cc607e01
-EBUILD exabgp-3.4.28-r2.ebuild 850 BLAKE2B ee79eef857a6364e4d1748da8ace0bd2e5d21d51f608b6fd0a027fcd7fb16f9f13062feb25826190d09e0f9285ae2c7d68b902bf3df44f1a45ce0041831f907f SHA512 ef8e5f7cdc233bfb4bdf476317fc3021c4796dd0e661a778df24fce72261224a987718ce0b96a6ca44695f8e8f46518bec48069a4d290c33896d18ce1604648a
 EBUILD exabgp-4.2.7-r3.ebuild 1225 BLAKE2B 056734c689ddd191bf4227f71f8af8221b19bb176feb233ea1f8c6515886b9088c8b16c3cb2657a7e6ad4fac627282f349ac20b560fb9671eb6de7f770b44842 SHA512 5204bbdb48d313bae38e74fca9ddf48f1d2e57e7eaabd18943f13abedc4961c2b2ca1ef8335f5b38664aa8bf4910bf7c18c1c28d2827a323c06a403b6e500c1c
 MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6
diff --git a/net-misc/exabgp/exabgp-3.4.28-r2.ebuild b/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
deleted file mode 100644
index f6753117ebc7..000000000000
--- a/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit tmpfiles systemd distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/exabgp
-	acct-user/exabgp
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
-	systemd_dounit etc/systemd/*
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	keepdir /etc/exabgp
-}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index c48cf22a03c1..21effd5a67ad 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,10 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
-DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
-DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
-EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
-EBUILD gerbera-1.5.0-r1.ebuild 2376 BLAKE2B 536362d7fddae6d2dc9b1846889e8757635512218edc73a909775b0b230d62429d721580e7cfbe7748faa93e0c1fa4710d778dc7e523e43e06eab027b5575070 SHA512 323b9a355a8691e7a76db7a28f4a151d840552de2f32b200e17e783aaa426b3d96bf0fc94c873db5860ac3f558fda03da2023806ab58a6cadb85a6eb1688bca7
-EBUILD gerbera-1.5.0-r2.ebuild 2375 BLAKE2B f47ccf1d0d0dff9e7ebbb0720d56fe3215ad18f4f91fd057dfb116c250cdf489dfacd83a1c5408e471332dee44dc9e7029de169f88a9192026c3ee97aee901d7 SHA512 6c7e7a0cebef43e0a4b8eb700438696f2bdc3c41f72449e81cad0808a29c9f6a717e23c9e19a9a75d3c32e453b56b44b288a3487ca3e1268149d4ea4e0863ea6
+DIST gerbera-1.6.1.tar.gz 3061089 BLAKE2B 6edd26318da6d69b43d983089bd31c0f77891590fe7094da9c77adb8e91418a11aecf0cc3c8fc602758a7d5aafb6e0f8726c85acfc89dc011c89f2565ede38e9 SHA512 488ce58fb1ef0c5412ba85876e04ecb6a71836f5064f29e9d4e786a4e66226522ca331be0c9c577bba3ea8dad7807ab032a0fe306bec0942e37bbfec25634247
+EBUILD gerbera-1.6.1.ebuild 2382 BLAKE2B 37a4b8eaf96e23f7d32d44e9d1fe2cfee5ec4ce6f33352a950e8e447cd8cae09c1b7cc44fb9cbe85ce5bbc6138f33d9593d58819d3534428614827f7a6f419de SHA512 20f7bc03960be4b81dc1a24c363390ad96e075d7c049c82c0013d32b48baf5179fa24ac05432bc08607efbd6525b0543de0342a2490055e638f4cdc477350a22
 EBUILD gerbera-9999.ebuild 2310 BLAKE2B 03da9d17449ebd6f00cf0460cead7a3772ac86d473a11f4b249e53cf50502cf1b932417e64cd1e432cd863fa3e896138fc6a9dd802ecd90e482652030bccdbe4 SHA512 320e649c649417b44fd7f87a4a10d21aa6489e284482167b7ee49afc6789a13d7433dc0bf05f1c6941934479be21e5b4b03b97082d98ffc6a14c7992a795777c
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.4.0-r1.ebuild b/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
deleted file mode 100644
index f639025a6dc0..000000000000
--- a/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eutils linux-info systemd tmpfiles
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
-
-DEPEND="
-	acct-user/gerbera
-	=net-libs/libupnp-1.8*:=[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/expat
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
-	magic? ( sys-apps/file )
-	matroska? (	media-libs/libmatroska )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_DEBUG="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_EXIV2="$(usex exiv2)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MATROSKA="$(usex matroska)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-1.5.0-r1.ebuild b/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
deleted file mode 100644
index df9d236f5d0f..000000000000
--- a/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eutils linux-info systemd tmpfiles
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
-
-DEPEND="
-	acct-user/gerbera
-	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/spdlog:=
-	dev-libs/pugixml
-	dev-libs/libfmt:0/6
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl )
-	magic? ( sys-apps/file )
-	matroska? ( media-libs/libmatroska )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=(
-	"${FILESDIR}/${P}-incomplete-type-iohandler.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_DEBUG="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_EXIV2="$(usex exiv2)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MATROSKA="$(usex matroska)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-1.5.0-r2.ebuild b/net-misc/gerbera/gerbera-1.6.1.ebuild
index 5357c3346ff8..56b7793c25ab 100644
--- a/net-misc/gerbera/gerbera-1.5.0-r2.ebuild
+++ b/net-misc/gerbera/gerbera-1.6.1.ebuild
@@ -50,7 +50,7 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~INOTIFY_USER"
 
 PATCHES=(
-	"${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+	"${FILESDIR}/${PN}-1.5.0-incomplete-type-iohandler.patch"
 )
 
 src_configure() {
diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 9e0c1c4f87b4..e639068dc4de 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -1,7 +1,4 @@
-AUX grdesktop-0.23-desktop.patch 538 BLAKE2B 70bc1fc74c7c9b298e844bd499a04a062ec8c511dca75acfc17914faaad6431573d0ae1897c72ee0e3018a174a5ecab8bed1ebef3d84c6279c7d87afdbb5280c SHA512 c228120c40f1c1afa18b120c6804e5bb824256fd5515bdcd05b7fb4a8c964cf8ef6d2a7902645640b5133b513bc9612b2484cce7413af5663d0e16c7e65122fd
-AUX grdesktop-0.23-format-security.patch 856 BLAKE2B e5f8c03ce0b7639d0662295d8260888d18af4062750aa5ce73ee13c0fb9b77ea61e3287a11f1b5d00bf1c3a654d84fa7e6bd820c81c09dc00c4fecce08d305fc SHA512 7754a958a45648cf1194e0840ab22de3025a3eaf0001670c3abe6b5ea0852caa9d27fd9f7db0b4c43a8c93a462a8f297b1c89007755486c9cef9eff26cca6590
 DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b
 DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f
-EBUILD grdesktop-0.23-r1.ebuild 950 BLAKE2B 7f142f234235a9c5063e26c882d64dac69a9914b2a0fa72f52162e7b8fc5f2ce6bf70a3bd838a395e5debc7e5be678e272f8fa4f066ebdde402d702bf939dcf9 SHA512 1377d544d03f32707e11a9c6a72cf40865151edd727b189b922770fce3ffe87b6e31fec03110c48f1f60fcc5b4292c5e2f240d910a29b11494d0e50b41c5a310
 EBUILD grdesktop-0.23-r2.ebuild 1080 BLAKE2B b2d8544a08e70f5aadc352406c5496370ef903149a1674ae5ff00d26734090661fbbe874944d0fd15fda3b78a59518462a349e8cc7b452f7953972ddfa95fbc1 SHA512 3ccf3f08814b8ae47089e98e2a8df4701702988bf4fd9f18a8db367c33858583df26dbb914bf5bd46d9606c624cff264819b30011dbe38c3a1826bacd5afd028
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
deleted file mode 100644
index 01102b802cd3..000000000000
--- a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/grdesktop.desktop.old	2014-07-08 14:05:45.500537718 +0200
-+++ b/grdesktop.desktop	2014-07-08 14:06:27.237420849 +0200
-@@ -4,13 +4,13 @@
- Comment[de]=Verbindet zu einem entfernten Windows Terminal-Server
- TryExec=grdesktop
- Exec=grdesktop
--Icon=grdesktop.png
-+Icon=/usr/share/pixmaps/grdesktop/icon.png
- Terminal=false
- Type=Application
- Version=1.0
- Actions=Full;
--Categories=Application;Network;X-Red-Hat-Base;
--Encoding=UTF-8
-+Categories=Network;X-Red-Hat-Base;
- 
- [Desktop Action Full]
-+Name=Remotedesktop Client
- Exec=grdesktop
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch b/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch
deleted file mode 100644
index b5610efc0c62..000000000000
--- a/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./src/run.c.orig	2004-03-30 13:17:53.000000000 +0000
-+++ ./src/run.c	2012-05-13 06:33:35.000000000 +0000
-@@ -110,7 +110,7 @@
- 		sshcmd = g_strconcat(sshcmd, g_strdup_printf("%s",
- 			SHASH("sshhost")), NULL);
- 		sshcmd = g_strconcat(sshcmd, g_strdup_printf(" \"%s\"", cmd), NULL);
--		g_warning(sshcmd);
-+		g_warning("%s",sshcmd);
- 		cmdline = g_strconcat(sshcmd, NULL);
- 	} else {	/* execute without ssh */
- 		cmdline = g_strconcat(cmd, NULL);
---- ./src/rdpparse.c.orig	2012-05-13 06:36:59.000000000 +0000
-+++ ./src/rdpparse.c	2012-05-13 06:37:31.000000000 +0000
-@@ -306,9 +306,9 @@
- 	parts = g_strsplit(value, "x", 2);
- 
- 	if(typ == 'W')
--		return(g_strdup_printf(parts[0]));
-+		return(g_strdup_printf("%s",parts[0]));
- 	else
--		return(g_strdup_printf(parts[1]));
-+		return(g_strdup_printf("%s",parts[1]));
- 
- 	if(parts != NULL)
- 		g_strfreev(parts);
diff --git a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
deleted file mode 100644
index 8e5d2c6a2dd0..000000000000
--- a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	>=gnome-base/libgnomeui-2
-	net-misc/rdesktop
-	gnome-base/gconf:2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Correct icon path. See bug #50295.
-	eapply "${FILESDIR}/${P}-desktop.patch"
-
-	# Fix compilation with format-security, bug #517662
-	eapply "${FILESDIR}/${P}-format-security.patch"
-
-	sed -e 's/\(GETTEXT_PACKAGE = \)@GETTEXT_PACKAGE@/\1grdesktop/g' \
-		-i po/Makefile.in.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-debug \
-		--with-keymap-path=/usr/share/rdesktop/keymaps/
-}
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index e805867a8094..47e75566dd81 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,5 +1,7 @@
+AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501
 DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
+EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd
 EBUILD grive-0.5.1.ebuild 756 BLAKE2B e2d3f071ea93435ba19516baa1a138d6312f794133a8ce4edb811dd601daf7e129e73c13345c843d9a5c0af9346351d5c70df775a16d572f42c02913b8f82a77 SHA512 9e9c1fd7d8c34de9615f6a93af74caad6dbb5fe632ad4417aa7571a683099a3c3b8cb40dd984d6e57e2ca29473780e9bd0c3080c6c9cf6a569af68c1e179de08
 EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/files/299.patch b/net-misc/grive/files/299.patch
new file mode 100644
index 000000000000..a5e030f2534a
--- /dev/null
+++ b/net-misc/grive/files/299.patch
@@ -0,0 +1,113 @@
+From b4d6ac055f8f16ac735a70036243bc4ea2334039 Mon Sep 17 00:00:00 2001
+From: Giuseppe Corbelli <corbelligiuseppe@mesdan.it>
+Date: Tue, 14 Jan 2020 11:50:20 +0100
+Subject: [PATCH] [SymbolInfo.cc] Support compilation with binutils >= 2.33.1
+ on Debian.
+
+bfd_get_section_vma macro was removed.
+bfd_section_size changed signature.
+
+See inline comment for details.
+---
+ libgrive/src/bfd/SymbolInfo.cc | 35 ++++++++++++++++++++--------------
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/libgrive/src/bfd/SymbolInfo.cc b/libgrive/src/bfd/SymbolInfo.cc
+index 5876cc0..cdb5d7c 100644
+--- a/libgrive/src/bfd/SymbolInfo.cc
++++ b/libgrive/src/bfd/SymbolInfo.cc
+@@ -49,9 +49,9 @@ SymbolInfo::SymbolInfo( )
+ 	m_impl->m_bfd		= 0 ;
+ 	m_impl->m_symbols	= 0 ;
+ 	m_impl->m_symbol_count	= 0 ;
+-	
++
+ 	bfd_init( ) ;
+-	
++
+ 	// opening itself
+ 	bfd *b = bfd_openr( "/proc/self/exe", 0 ) ;
+ 	if ( b == NULL )
+@@ -60,13 +60,13 @@ SymbolInfo::SymbolInfo( )
+ 		          << bfd_errmsg( bfd_get_error() ) << std::endl ;
+ 		return ;
+ 	}
+-	
++
+ 	if ( bfd_check_format( b, bfd_archive ) )
+ 	{
+ 		bfd_close( b ) ;
+ 		return ;
+ 	}
+-	
++
+ 	char **matching ;
+ 	if ( !bfd_check_format_matches( b, bfd_object, &matching ) )
+ 	{
+@@ -78,7 +78,7 @@ SymbolInfo::SymbolInfo( )
+ 			std::cerr << bfd_get_filename( b ) << ": Matching formats: " ;
+ 			for ( char **p = matching ; *p != 0 ; p++ )
+ 				std::cerr << " " << *p ;
+-			
++
+ 			std::cerr << std::endl ;
+ 			std::free( matching ) ;
+ 		}
+@@ -107,7 +107,7 @@ struct SymbolInfo::BacktraceInfo
+ 	const char			*m_func_name ;
+ 	unsigned int		m_lineno ;
+ 	unsigned int		m_is_found ;
+-	
++
+ 	static void Callback( bfd *abfd, asection *section, void* addr ) ;
+ } ;
+ 
+@@ -117,17 +117,24 @@ void SymbolInfo::BacktraceInfo::Callback( bfd *abfd, asection *section,
+ 	BacktraceInfo *info = (BacktraceInfo *)data ;
+ 	if ((section->flags & SEC_ALLOC) == 0)
+ 		return ;
+-	
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
+-	
++
++	// bfd_get_section_vma works up to 7b1cfbcf1a27951fb1b3a212995075dd6fdf985b,
++	// removed in 7c13bc8c91abf291f0206b6608b31955c5ea70d8 (binutils 2.33.1 or so)
++	// so it's substituted by its implementation to avoid checking for binutils
++	// version (which at least on Debian SID it's not that easy because the
++	// version.h is not included with the official package)
++	bfd_vma vma = section->vma;
++
+ 	unsigned long address = (unsigned long)(info->m_addr);
+ 	if ( address < vma )
+ 		return;
+-	
+-	bfd_size_type size = bfd_section_size(abfd, section);
++
++	// bfd_section_size changed between the two objects described above,
++	// same rationale applies
++	bfd_size_type size = section->size;
+ 	if ( address > (vma + size))
+ 		return ;
+-	
++
+ 	const SymbolInfo *pthis	= info->m_pthis ;
+ 	info->m_is_found	=  bfd_find_nearest_line( abfd, section,
+ 	                                              pthis->m_impl->m_symbols,
+@@ -149,7 +156,7 @@ void SymbolInfo::PrintTrace( void *addr, std::ostream& os, std::size_t idx )
+ 	{
+ 		this, addr, 0, 0, 0, false
+ 	} ;
+-	
++
+ 	Dl_info sym ;
+ 	bfd_map_over_sections( m_impl->m_bfd,
+ 							&SymbolInfo::BacktraceInfo::Callback,
+@@ -165,7 +172,7 @@ if ( btinfo.m_is_found )
+ 			filename.erase( pos, std::strlen( SRC_DIR ) ) ;
+ #endif
+ 		os << "#"  << idx << " " << addr << " "
+-			<< filename << ":" << btinfo.m_lineno 
++			<< filename << ":" << btinfo.m_lineno
+ 			<< " "
+ 			<< (btinfo.m_func_name != 0 ? Demangle(btinfo.m_func_name) : "" )
+ 			<< std::endl ;
diff --git a/net-misc/grive/grive-0.5.1-r1.ebuild b/net-misc/grive/grive-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..323a194002ef
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	dev-libs/yajl
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/299.patch" )
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index a05dda27955d..4c232ef5d82d 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-20.04.0.21.tar.gz 111281435 BLAKE2B 2aa0b7fbde8f8ed11a5f6fec5d9434d58ec386220fbf30c52488664cccf5c488741ecde8287c91ba98308cccb33c2ef912212d755d2d61c41b32939263a7081a SHA512 e98d907fccc6b6b5e763ab75d55cdec56559ba261b2e8730dddd65662942f98a2d9167cd09e1c13efe811db12fa40edacaa3eea9e0d7ec319765c28f5626b308
 DIST linuxx64-20.06.0.15.tar.gz 115086774 BLAKE2B fbdec8b80364baf55c1429c1db76466630487e7efb05a8dc33011b5fdb90a7244d3a1b8990428ea1b210ac918c91f859fa9a5aa39ea2f747b0c52370e793b4cf SHA512 1b7d696978e89af5b460cd9985eaedf9d941d1acaccb6fc3ade8b174c342fdf682c70ea46e62c149490d3f720909905bcbe50519c985ec66b70f0731aa60d45f
-DIST linuxx86-20.04.0.21.tar.gz 103733746 BLAKE2B ad7c16726722a90e31685325430c9fe67a2dd61a7829f5288db774957350bff2b97d26341230e1542fe98ee845f0eca7f1d757afe15e468bdad0c7df7c6bb352 SHA512 6cbd4a0127e73402df24e12b3c557f8388238f7d9b58ac9d850fa28767d272f16f6c6dd73b1201e62d58c98d4795f30a95a9f4263bdcebc3ca1c98a1a9152b38
+DIST linuxx64-20.9.0.15.tar.gz 117636697 BLAKE2B 4279fa23edd6be2c0cd73f4f1881815b377779d695b1fb110fd5a28aae6ef45649e9b9796ad6d637954bd4dd62e35aadbb352311297e10fa0923fb03ea42711b SHA512 6a5e2cc3f40ffd894548247df4ce2dd988293fa17e72ba101bd32250ac13ea077a80ab1129e7d85987333ad6afaf3c3e2fe75a642e66d21c87d07cf6c57adfb2
 DIST linuxx86-20.06.0.15.tar.gz 106253412 BLAKE2B e40bb86b688d5c8f83fa2d8cdd48ebd20fc8ebde305ea49cc726e48eaa12141130d648fca2bef25b59c1b4cefdabca0f53b497d4ee0e76bfa5aeede7df1aff4a SHA512 fb1d6104c9407f96bcdd6a385703fd142eb4b6347d35617d3bd09bd4908c6ad099933677688d4a77f9ce3c4b7f5c89fe24adb28bdc97112da5a58b618ba0e173
-EBUILD icaclient-20.04.0.21.ebuild 4633 BLAKE2B 0a89cf787af7469cf614006d9fda84d3396c240d7da66f754f5df7ff93776c5db5c30313bea6875c548f797ea2cf903258645410db5d229f2ee872e2f186c30f SHA512 21d1eed08066a6055b4b4f2e4ca91d9f2f9a46d562dd206d6cbe4f6132cf52d11b9797d0869fd8c11b240509f041ffd3c8fccaf1314a8b7b1bd28594905faf4d
-EBUILD icaclient-20.06.0.15.ebuild 4608 BLAKE2B e7ed3501ac4ffe9808f0451188e5db05a874f9e17f9a2a26b18eefe7ce01abf1693056635a28fa33b24003f1010474847df2d66ec5935592c9d754eea1a8dc69 SHA512 1082496a0979cb827839a5a9f874de889b3440de71f41411a3b9613c20ecda314ea498c79543c3ea05285466288aaccb07f3ed15d347ca20a335bf13bc573eb1
+DIST linuxx86-20.9.0.15.tar.gz 108055955 BLAKE2B f94ff3e44152165d0122cc28c302df2bbc7401aaa7b61ee8e7479ffd44d6fcc25daac94211ba3dabed56d51b531d9a72a41e63dd2019880d956f2a4faa0269c1 SHA512 cddbef60ddf4baa1e9f45e80df78c2153907a4eb010649946ee10d0875c9066268a47d37ddd3f3cb026cf130a3f4e566d745f1b3781c13810b50476344cfafb4
+EBUILD icaclient-20.06.0.15.ebuild 4606 BLAKE2B 1bab1521a347da2ce9a9278c10d14951df0adc684c60e8c0289d3f29497024b2227f539f6890ee4aa6e5332845bd2d5eb6aa64ba6cff41ece0872ada52e69390 SHA512 380e52cc685c874db97a1f2265e44638b776fce938a8d36681a2a8bbd3a06e0ab06865c26a217531c5dcd5607772967d7bc43df6d08e721ed34224528b896d43
+EBUILD icaclient-20.9.0.15.ebuild 4608 BLAKE2B e7ed3501ac4ffe9808f0451188e5db05a874f9e17f9a2a26b18eefe7ce01abf1693056635a28fa33b24003f1010474847df2d66ec5935592c9d754eea1a8dc69 SHA512 1082496a0979cb827839a5a9f874de889b3440de71f41411a3b9613c20ecda314ea498c79543c3ea05285466288aaccb07f3ed15d347ca20a335bf13bc573eb1
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/icaclient/icaclient-20.06.0.15.ebuild b/net-misc/icaclient/icaclient-20.06.0.15.ebuild
index dc55bef4c529..fef0ba0d608e 100644
--- a/net-misc/icaclient/icaclient-20.06.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-20.06.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-20.04.0.21.ebuild b/net-misc/icaclient/icaclient-20.9.0.15.ebuild
index 9e7183613044..dc55bef4c529 100644
--- a/net-misc/icaclient/icaclient-20.04.0.21.ebuild
+++ b/net-misc/icaclient/icaclient-20.9.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -95,7 +95,7 @@ src_install() {
 	dodir "${ICAROOT}"
 
 	exeinto "${ICAROOT}"
-	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
 	rm lib/ctxjpeg_fb_8.so || die
diff --git a/net-misc/ifenslave/Manifest b/net-misc/ifenslave/Manifest
index b30c0ae54d83..d16d83b77290 100644
--- a/net-misc/ifenslave/Manifest
+++ b/net-misc/ifenslave/Manifest
@@ -1,4 +1,4 @@
 DIST ifenslave-2.6_1.1.0-17.debian.tar.gz 9406 BLAKE2B 2d4fbaa39b58538eb193dc75b2b271fd56a1adfd9aa3b0321f39bf505bee5c95973cab969f227c272dafc8fe389204dc62fc1d8ecc0e9b29f41d94805405a1d4 SHA512 90773620e15883f39f3bf3039133385d21d597f2051b81d98f96a2d7b9d7f69bf8f00bab0ffa2ad0fde5b2f4b83cac683b24925f26b6f014c0fa06f6d1023de5
 DIST ifenslave-2.6_1.1.0.orig.tar.gz 8002 BLAKE2B 573eb446b390d044d636aceeb8e022ebf8792a1c4fc50cf7903aef647b38052ddc05dff53539c2c760867a09fc04fd29469137499cfa2b73da1a5b1c3fc1c05c SHA512 65d9b632e88c63dc4c2bae752a4561cc7f315278b301c906c6f023934d6af8cdb894d06e1582d831bf0ac88f8d27751115b4f2e8bea6cbb89a705e4bc04068c7
-EBUILD ifenslave-1.1.0-r6.ebuild 1543 BLAKE2B e2bf4beb6fd5fd2f50e80d7037fbba0fee9358e71607d205be6985596d36b3de72211e67da9fbe0500fc1e0c304aaac199a7b2ad0b64154c780ce4697b1e07ab SHA512 8d8b9e7a250d4205d9d2f8429f2cf435d7f3466b0abb8b869ab4210ee81247c4533c0a165703b2c622377a2b03879692f7a4bb729688b5744683cbbfe5e6d35c
+EBUILD ifenslave-1.1.0-r6.ebuild 1476 BLAKE2B f67d1b77cfb03f78878deaacf7cc67758a9439ad13120af0f83109d5cb943d7f0b5786ce9037527ff94aa426e2f5d6bf9fd75c34a5c2863206e04db13b3d89a2 SHA512 a56ed4edbee5d9506df903c64e388e2f688f730b2301a5bb80b3930271f3f60e7fd55e2fc49b9b20552220b0b7278017cf397546cb0d2b076f02ecacd7399dfb
 MISC metadata.xml 336 BLAKE2B 5eecfb87390ed73dc4084412611127d71f427716bfa06f50acaff415d329433f133ca05668dbc4bf678d8b701c2b5082e8152bb20a2291e1e6086e37e93d4d31 SHA512 abf41fe162a73a2cf8e2300bd61bcbb0ea1947073ba16a070dbf731511050de8ec1691b1e1bb5a43278db912551c452fcd0fdb2f87aa2b5e328be28308ad12c2
diff --git a/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild b/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
index 8199a0f5a180..a5a85b6fa342 100644
--- a/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
+++ b/net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 MY_PN="ifenslave-2.6" # this is NOT an error
 DEBIAN_PV="17"
@@ -12,36 +12,36 @@ DEBIANPKG_BASE="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}"
 inherit toolchain-funcs linux-info
 
 DESCRIPTION="Attach and detach slave interfaces to a bonding device"
-HOMEPAGE="http://sf.net/projects/bonding/"
-SRC_URI="${DEBIANPKG_BASE}/${DEBIANPKG_TARBALL}
+HOMEPAGE="https://sf.net/projects/bonding/"
+SRC_URI="
+	${DEBIANPKG_BASE}/${DEBIANPKG_TARBALL}
 	${DEBIANPKG_BASE}/${DEBIANPKG_PATCH}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~mips ppc sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/gcc
-	>=sys-kernel/linux-headers-2.4.22
-	${RDEPEND}"
+DEPEND=">=sys-kernel/linux-headers-2.4.22"
 
 CONFIG_CHECK="~BONDING"
 WARNING_BONDING="CONFIG_BONDING is required to get bond devices in the kernel"
 
+src_configure() {
+	tc-export CC
+}
+
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} || die "Failed to compile!"
+	emake ifenslave
 }
 
 src_install() {
 	into /
-	dosbin ${PN}
-	into
+	dosbin ifenslave
 
 	# there really is no better documentation than the sourcecode :-)
-	dodoc ${PN}.c
+	dodoc ifenslave.c
 
-	doman "${WORKDIR}/debian/${PN}.8"
+	doman "${WORKDIR}"/debian/ifenslave.8
 }
 
 pkg_preinst() {
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 5afa15a74491..1a4571640f39 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,12 +1,7 @@
 AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
-AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df
-AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d
-AUX iputils-20190515-fix-setcap.patch 1706 BLAKE2B e90392bfe79201cbf88e2c6356b9f24d014e845cd65b29d66532dcabc8672df7f47e2bde0d6f267c4aff63f55bd4949ac91ab9d411c71c183586cbe47d6064f9 SHA512 769111d6bfd124d37125554993ea8c47dde2f6d917226597af9521db92fc31417b48648945bffb54f11201f230cb46d820f5a1ded027e1ee8e781d935841507b
 AUX iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch 1134 BLAKE2B cb6a700f3b0681e6abf5bfcfed3b5b4736aeba481e1b5334193cc32dab8e21134ed729d1b6b098495e46f59416f9d2c29f186b87143adcb2824f08058c7792ce SHA512 4e8bd9d4ae752dcdcb169eec1c42bc16d3f89cd1579140db74c3883da54145faea875513aca4bf8241208253b8950590fd615fe2ea7e448d431d509ff2e8dc03
 AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 2852 BLAKE2B a9375c41ba6dde249ec2a0a287eef68228198c7132dd145550c55a6f42b29d2e53160ef9a99455e0f60e2bb738f1a2dbeff016f2ce6903ead58c75bdcafeb618 SHA512 e9f322620ce2e10830c7127fdb64e68ea7bad59620e8b1ffd10ec9ee9f49f74500f0efe25de62feb0e1dd3cbd37af744263b53deeae8d78d44a6b9d335686afc
 AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07
-AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338
-AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada
 DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5
 DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
diff --git a/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch b/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
deleted file mode 100644
index 8d8160a3d4af..000000000000
--- a/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Sat, 21 Jul 2018 17:46:14 +0200
-Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
-
-Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
-systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
-alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
-uClibc-ng 1.0.30) when not using the system libidn2.
-
-Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
-
-Reported-by: Nicholas Fish
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
- ping.c | 2 +-
- ping.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index 733477f..b241815 100644
---- a/ping.c
-+++ b/ping.c
-@@ -207,9 +207,9 @@ main(int argc, char **argv)
- 
- #ifdef USE_IDN
- 	setlocale(LC_ALL, "");
--#endif
- 	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- 		hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
- 
- 	/* Support being called using `ping4` or `ping6` symlinks */
- 	if (argv[0][strlen(argv[0])-1] == '4')
-diff --git a/ping.h b/ping.h
-index 3e09685..8a0c4ef 100644
---- a/ping.h
-+++ b/ping.h
-@@ -28,7 +28,6 @@
- #include <netinet/icmp6.h>
- #include <linux/filter.h>
- #include <resolv.h>
--#include <locale.h>
- 
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
-@@ -36,6 +35,7 @@
- #endif
- 
- #ifdef USE_IDN
-+#include <locale.h>
- #include <idn2.h>
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
diff --git a/net-misc/iputils/files/iputils-20180629-musl.patch b/net-misc/iputils/files/iputils-20180629-musl.patch
deleted file mode 100644
index 48742d966021..000000000000
--- a/net-misc/iputils/files/iputils-20180629-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 5007d7067918fb3d950d34c01d059e5222db679a
-Author:     Aric Belsito <lluixhi@gmail.com>
-AuthorDate: Mon Dec 4 00:10:29 2017 +0100
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Wed Jul 11 01:33:28 2018 +0200
-
-    Fix build on MUSL
-    
-    Add missing AI_IDN and NI_IDN declarations.
-    
-    Bug: https://bugs.gentoo.org/503914
-    Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-
-diff --git a/arping.c b/arping.c
-index c2f2129..d753345 100644
---- a/arping.c
-+++ b/arping.c
-@@ -44,6 +44,13 @@
- 
- #ifdef USE_IDN
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
- #endif
- 
- #include "SNAPSHOT.h"
-diff --git a/ping.h b/ping.h
-index 3e09685..1e51c67 100644
---- a/ping.h
-+++ b/ping.h
-@@ -37,6 +37,17 @@
- 
- #ifdef USE_IDN
- #include <idn2.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
- #else
-diff --git a/tracepath.c b/tracepath.c
-index 53bda16..9558e49 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -29,6 +29,14 @@
- 
- #ifdef USE_IDN
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
-diff --git a/traceroute6.c b/traceroute6.c
-index a1022f9..ab34615 100644
---- a/traceroute6.c
-+++ b/traceroute6.c
-@@ -246,6 +246,10 @@
- #ifdef USE_IDN
- #include <locale.h>
- 
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define ADDRINFO_IDN_FLAGS	AI_IDN
- #define getnameinfo_flags	NI_IDN
- #else
diff --git a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch
deleted file mode 100644
index 6e9c7c6a8354..000000000000
--- a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Thu, 16 May 2019 09:44:27 +0000
-Subject: [PATCH] build-sys: Make setcap really optional
-
-The setcap dependency is marked as optional but meson.build depends on
-setcap.path():
-
-meson.build:246:7: ERROR:  add_install_script args must be strings
----
- meson.build | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 8af9e18..95c778a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -221,10 +221,13 @@ config_h = configure_file(
- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
- if get_option('NO_SETCAP_OR_SUID')
- 	perm_type = 'none'
-+	setcap_path = '/dev/null'
- elif cap_dep.found() and setcap.found()
- 	perm_type = 'caps'
-+	setcap_path = setcap.path()
- else
- 	perm_type = 'setuid'
-+	setcap_path = '/dev/null'
- endif
- 
- ############################################################
-@@ -243,7 +246,7 @@ if build_ping == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'ping',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -263,7 +266,7 @@ if build_traceroute6 == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'traceroute6',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -276,7 +279,7 @@ if build_clockdiff == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'clockdiff',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -306,7 +309,7 @@ if build_arping == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'arping',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
diff --git a/net-misc/iputils/files/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d
deleted file mode 100644
index ef7fc48e17bf..000000000000
--- a/net-misc/iputils/files/rarpd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for /etc/init.d/rarpd
-
-# You probably want to select the interface for this to listen on.
-# By default it uses loopback which most likely won't help.
-RARPD_IFACE="lo"
-
-# See the rarpd(8) manpage for more info.
-RARPD_OPTS="-b /tftpboot"
diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
deleted file mode 100644
index 27081fc760c0..000000000000
--- a/net-misc/iputils/files/rarpd.init.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/rarpd.pid"
-command="/usr/sbin/rarpd"
-# The -d option keeps it from forking.  This way s-s-d can do the fork and
-# set up the pidfile with the right value below.
-command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}"
-start_stop_daemon_args="--background --make-pidfile"
-
-start_pre() {
-	if [ ! -f /etc/ethers ] ; then
-		eerror "Please create /etc/ethers with the following content:"
-		eerror "[MAC address] [name or IP]"
-		return 1
-	fi
-	return 0
-}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 19469a3e8e4d..61d7110055a6 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -7,6 +7,7 @@ DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f
 DIST kafka_2.12-2.4.0.tgz 62283588 BLAKE2B 3492f7a5be9941a75aa5896be0e25974b46887a66e391395a813844bae2f5f57062b636852cdb7aa3650fb4017f9d462a3b95b2166b8a0be62f403c44826b675 SHA512 53b52f86ea56c9fac62046524f03f75665a089ea2dae554aefe3a3d2694f2da88b5ba8725d8be55f198ba80695443559ed9de7c0b2a2817f7a6141008ff79f49
 DIST kafka_2.12-2.4.1.tgz 62358954 BLAKE2B 333b4a1d34c6249efb9984e90c314f4b39bbd1e907bbd53e1ce67d49eaa7f972c291fafcbf5be129cde055cd696ba545ac8c95c54dfbd3a89f639f7461f8dc45 SHA512 8582dc25cb14a2e9c6966efd98e41cd0ebf6369b42436954800b847298e763b22caecf130fdccc58bf79fe9e95facce6e0b5aacad072d69f6dc1eed7678a49b8
 DIST kafka_2.12-2.5.0.tgz 61604633 BLAKE2B f73f3a03f245aa82b9ce5a895e7875d5ad9c4006b84c3152cac72322eb18283a1a87d81f255160ff062883737ae9862e160fec0d85160ed3a64f45e47b26db53 SHA512 447a7057bcd9faca98b6f4807bd6019ef73eee90efdc1e7b10005f669e2537a8a190cb8b9c9f4c20db1d95b13d0f0487e9cc560d0759532058439ce7f722c7cd
+DIST kafka_2.12-2.5.1.tgz 61709988 BLAKE2B 4e6943058fe25da0cc9285e1e8dbe2be2ad2be5ef52d7c12f9007607e34ba1834d192c45e01275e893dca2e8968bdba07510dbd30ccd106e80edaabc0f7c6dba SHA512 91f96f28c016bdaa3fe025f87ace188417a1e594c8e32b7d23a104aa390bc25f5db5897e23cccf00ea7ede3ac20b3028c10363ebe99dcbd7db2cf6237ee7553a
 DIST kafka_2.13-2.6.0.tgz 65537909 BLAKE2B 883bc22f53ae7882ff2e27a3b9b62967f4718718f8e2ee222debd5f5b36636e00b35ceb60c3fd6924905b88ef96442439198255bb8329cee1cc722364ff0810f SHA512 d884e4df7d85b4fff54ca9cd987811c58506ad7871b9ed7114bbafa6fee2e79f43d04c550eea471f508b08ea34b4316ea1e529996066fd9b93fcf912f41f6165
 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
@@ -15,5 +16,6 @@ EBUILD kafka-bin-2.3.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354
 EBUILD kafka-bin-2.4.0.ebuild 1445 BLAKE2B 7a3195fa859a082c87c53c9a635e60f7c2a17e3f1b3b86e5098c1fb4d6693de1a56502a5885c012b9a19a8ec8bb45e9fe2d5ad3bf3b3d6abed0e021f9d33b42d SHA512 0ae2805608cfda3fdcc9f1c54733e7c2e7cab2c4e385fd3bd3c78339f08be5162d7a397b0cd747b6bad5d1e6f556524dc02cbfb0cb4b7d5aa6d77a279701604c
 EBUILD kafka-bin-2.4.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b
 EBUILD kafka-bin-2.5.0.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b
+EBUILD kafka-bin-2.5.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b
 EBUILD kafka-bin-2.6.0.ebuild 1445 BLAKE2B f462939b918172f7dd31dbeaab8ecd9e4480da93ba6f2220597f158019789007ddf686029e12747669e7eae836b79a4f81dd47594d570b55ef054d5479010248 SHA512 1ae04cb30a976b1fb242856c8089e59071dd17f3278176b61d51e180c4cf0d768e9fb3331c18baa3ae32c321e156bb8bc77c5b225aedd909ad3a40521f42da6e
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild
new file mode 100644
index 000000000000..4c7d84184e1f
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="https://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+COMMON_DEPEND="acct-group/kafka
+	acct-user/kafka
+	virtual/jre:1.8"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
index 9145acd1e614..dcea9753027b 100644
--- a/net-misc/mcproxy/Manifest
+++ b/net-misc/mcproxy/Manifest
@@ -1,7 +1,8 @@
-AUX fix_checksum_calculation.patch 1154 BLAKE2B adb80fa3b87106c8953675205cc580d13f1d5e4e9d93bfd05b87d9aa4843086ff7682c4ea47ec573654e39cc3ab2961d9daa69f8335043f63e8e623ad331ec0b SHA512 8b31c6758054d250fbbe91eef62d5a6df93ca0fa700730308c34a7402868644d7ed709c642a84a5f296217c6f3cf8132fba7a8506f54c951a2381cc1bf288cd8
+AUX mcproxy-1.1.1-clang.patch 2940 BLAKE2B e6f3845ac49e6a3ee1c31e5ff131d24d9c409c88b422162c90215a93ce24442cb8f506d075c5debf8e11dc2890495f7ce5588c2ac09442897d6630f5d05db3d9 SHA512 2aba42fd92cc9a2237d51013337e4054d8ce4e077a6e7221851e0720f740d921175e5816b94fa17fa63204a0003fa19cecae5b7287875e3704704841052a60c9
+AUX mcproxy-1.1.1-fix-checksum-calculation.patch 1154 BLAKE2B adb80fa3b87106c8953675205cc580d13f1d5e4e9d93bfd05b87d9aa4843086ff7682c4ea47ec573654e39cc3ab2961d9daa69f8335043f63e8e623ad331ec0b SHA512 8b31c6758054d250fbbe91eef62d5a6df93ca0fa700730308c34a7402868644d7ed709c642a84a5f296217c6f3cf8132fba7a8506f54c951a2381cc1bf288cd8
 AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c504a5166396f4d09f18a5e203d5fd73abec5f55666742af26a6baa28d8e51fbcc1f7c3b35310965 SHA512 c7096d15afe94002197ee696ea94b88bb85d646c67bb3a2debf8d07098565d35399232610c7bccc0a13a390f6f6be8aad4295f2bf575e7940fb617651a945414
 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
-EBUILD mcproxy-1.1.1-r1.ebuild 1064 BLAKE2B 2ea2e0fda806e7b9473a52eac381488d37a2bed631da4f20f43d8258c66f79738a438e93dfc6433cef6999c702a09410ef3b34693394d9c569ee5bbc9a58f0b2 SHA512 e33e7a701893fa3d5738b859d27bf4ecd8c4476ca22d08c3d9b98fffd9df3f99dc1778318b91d486c7b53ad9bc67d930601014949b5799af0e90c2e88bdfb35c
+EBUILD mcproxy-1.1.1-r1.ebuild 1102 BLAKE2B 74acb2772b94c138b1b1f2a9b2f3f252465830a5f99786a654e366e7b3a84db89f8963ecc0943b2daea460056f9f64ab138ee6b4f2454d317073f782ea013587 SHA512 eda0a3c1622319d7a0a5ea01b7af3c367c7efd9427a08cba345b2df9e268e825fd400ee2c7c73d237ba135923f6b1ee36e323e302255b4857158701c8bfeff6f
 MISC metadata.xml 1263 BLAKE2B e3df52a90f366a1c7f6f754908f31455322c8b0da826ee1f121925a231c4f8cb74961ba9ca49607336310e5f7176ad8ff0610220a4888f2dcd004f2bce44ecfe SHA512 48e7b7051b9172bae3816e1e2737371a9253cff443a03953b373becc9bcaf152e63a341f7a97a00adae283aeab003cd0765514ba30988994a59570314ab00df0
diff --git a/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch
new file mode 100644
index 000000000000..e3db8f754093
--- /dev/null
+++ b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch
@@ -0,0 +1,93 @@
+From 842e2859669f8a721c10c4f8d019f78f37e29e48 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 20 Sep 2020 16:28:39 +0200
+Subject: [PATCH] mcproxy/mcproxy.pro: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ mcproxy/mcproxy.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mcproxy.pro b/mcproxy.pro
+index 5216198..b576b3c 100644
+--- a/mcproxy.pro
++++ b/mcproxy.pro
+@@ -15,7 +15,7 @@ tester {
+     HEADERS += include/tester/config_map.hpp \
+            include/tester/tester.hpp
+ 
+-    LIBS += -L/usr/lib -lboost_regex
++    LIBS += -lboost_regex
+ }
+ 
+ mcproxy { #default mode
+@@ -123,7 +123,7 @@ HEADERS += include/hamcast_logging.h \
+            include/parser/parser.hpp \
+            include/parser/interface.hpp
+ 
+-LIBS += -L/usr/lib -lpthread 
++LIBS += -lpthread
+ 
+ QMAKE_CLEAN += thread* 
+   
+From 5b2f3e3e2ea23c3bb8e72a90e18177f69e350d37 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 20 Sep 2020 16:38:03 +0200
+Subject: [PATCH] include/proxy/message_queue.hpp: fix compilation with clang
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ mcproxy/include/proxy/message_queue.hpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/proxy/message_queue.hpp b/include/proxy/message_queue.hpp
+index 347a616..ede35ab 100644
+--- a/include/proxy/message_queue.hpp
++++ b/include/proxy/message_queue.hpp
+@@ -101,7 +101,7 @@ bool message_queue<T, Compare>::is_empty() const
+ {
+     HC_LOG_TRACE("");
+ 
+-    std::lock_guard<std::mutex> lock(m_global_lock);
++    std::lock_guard<std::mutex> lock(this->m_global_lock);
+ 
+     return m_q.empty();
+ }
+@@ -111,7 +111,7 @@ unsigned int message_queue<T, Compare>::size() const
+ {
+     HC_LOG_TRACE("");
+ 
+-    std::lock_guard<std::mutex> lock(m_global_lock);
++    std::lock_guard<std::mutex> lock(this->m_global_lock);
+ 
+     return m_q.size();
+ }
+@@ -130,7 +130,7 @@ bool message_queue<T, Compare>::enqueue_loseable(const T& t)
+     HC_LOG_TRACE("");
+ 
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         if (m_q.size() < m_size) {
+             m_q.push(t);
+         } else {
+@@ -148,7 +148,7 @@ void message_queue<T, Compare>::enqueue(const T& t)
+     HC_LOG_TRACE("");
+ 
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         m_q.push(t);
+     }
+     cond_empty.notify_one();
+@@ -162,7 +162,7 @@ T message_queue<T, Compare>::dequeue(void)
+ 
+     T t;
+     {
+-        std::unique_lock<std::mutex> lock(m_global_lock);
++        std::unique_lock<std::mutex> lock(this->m_global_lock);
+         cond_empty.wait(lock, [&]() {
+             return m_q.size() != 0;
+         });
diff --git a/net-misc/mcproxy/files/fix_checksum_calculation.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch
index 2cbfb6590b72..2cbfb6590b72 100644
--- a/net-misc/mcproxy/files/fix_checksum_calculation.patch
+++ b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch
diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
index 77232c3d9926..b264a8937f8f 100644
--- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
+++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
@@ -21,7 +21,10 @@ DEPEND="
 
 S="${WORKDIR}/${P}/${PN}"
 
-PATCHES=( "${FILESDIR}/fix_checksum_calculation.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-clang.patch"
+	"${FILESDIR}/${P}-fix-checksum-calculation.patch"
+)
 
 CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 6b9306631718..efd87c3d4e11 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20200329.tar.gz 243725 BLAKE2B a9ca048744bc8f397e10bcc5e27638285d0000700855952cce4c2ba7959b2c9099e18045bd5e9103c67da79c90d04a2e505e064bcb1bbca5574437d4625101a5 SHA512 3f6a1a6f08924505a6db5ca5b1dbf7c59f8b48647c59a600799b020146422497248367767e41df0715bd9774129f2d8f95c4a63493af2db849bbe006231e6edf
 DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
-EBUILD miniupnpd-2.1.20200329.ebuild 1973 BLAKE2B 37124c901c4055cca0a10b90e135fb31a85bb90f40d330ec765d28c9742173c38f856ebbde4cdf9e9f40c759ec090b53732fe4814b4297a2e6ef8b907a454e43 SHA512 2cad4ddaa9ea78cc1c8425499a268164fe4f4d93d34c27c5d88693946262a4490a9ff8047984dda9d7088ca82ed2a95e63c04ca5ee971e4eb014341f733005ba
 EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild
deleted file mode 100644
index a2f14c2708f1..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	CONFIG_OPTIONS="${opts[*]}" emake config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index bbf54633c2f3..43ce037ab669 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,3 +1,4 @@
+AUX ncp-1.2.4-fix-makefile.patch 424 BLAKE2B d8687f2186a762872cac04df49e26013b844884b3d1537ac53cdbd4e1fd397d04fe7c6069c218ecd919c3c68b3e1998cc2cf699ec162ffbe0c9d5d356c77b72b SHA512 fd8fb4bffe36fb8fde955b963f4ba1d00e64e7480372e465fbb8c0750c0c02bd0a6dfb032af101a7599db3446f623a05f604cf3ab57469ef691f424db6520e41
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
-EBUILD ncp-1.2.4-r1.ebuild 843 BLAKE2B d42afa30ebcb9b390ff02b964f66353cd00ece303168645ccb4dd2ab85339e66b968b496fa8fd230b38da87c877a2e0f39085a333f7371686cc9ae6a861cbaad SHA512 3cb657dd0c5eba849d352eccb6b880df6660c854e98883b7ba1f9c054d677fcbd1ff812001cbc138893369dc5f5b57a352ad17d0fcd6ae1a9295291665af4186
-MISC metadata.xml 696 BLAKE2B 5a7039139c48529dc58d23f5ccb5bf0cfb0f512934bde8f1db62569fd1ce2a3ba15e72dcd35ad40b53786fc701d19a9036e893d05696f7a86d90e203d5f42942 SHA512 bf9abea0e052be4f733327d6ad5b87264222da86a095995c2697039811bd11ca2d87943fe6d920f662d5f4059f1a36c884e8dabe76821fd1d3e739a5471c1401
+EBUILD ncp-1.2.4-r2.ebuild 767 BLAKE2B 94a45adf6aabcc5fda72de6804c341aece92ea22d2b3c1d9308e0a0b6a8cacbcd0b50098d74d337f41a5cf761c7863042135249cfc3b63377adc120b7ac4e29e SHA512 67e9c79f7c1b379936325503a2af35cc9a210f35ba9bbc49e576e2c21c4ac6faeebe1bc952c8a82d3e0284211f3db4586394c6050a6bfb84c57cab870ffc3f50
+MISC metadata.xml 614 BLAKE2B bb945ccb5995827fd325fb351f0426852a9750c8942452c195800006b8dc8c647b5423fe70fda692091dcb7b814bd6f984b14d4be340e4d7c4abb466712f0c0e SHA512 e0a56910b48f3105c8ec1a414bf65966e411657d1a2f95afde2460b8c203acac1db96df725a9352e9fb9c41f818c8464caaeb1523d5ce348dff628ec314e3c34
diff --git a/net-misc/ncp/files/ncp-1.2.4-fix-makefile.patch b/net-misc/ncp/files/ncp-1.2.4-fix-makefile.patch
new file mode 100644
index 000000000000..54608a665417
--- /dev/null
+++ b/net-misc/ncp/files/ncp-1.2.4-fix-makefile.patch
@@ -0,0 +1,16 @@
+Never strip executable
+
+Patch by Michael Mair-Keimberger
+
+--- ncp-1.2.4/GNUmakefile	2005-05-13 19:17:17.000000000 +0200
++++ ncp-1.2.4-ng/GNUmakefile	2020-09-04 20:08:50.399902892 +0200
+@@ -53,9 +53,6 @@
+ 
+ ncp: ncp.o libsocket
+ 	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) `cat libsocket`
+-ifeq ($(DEBUG),)
+-	strip -R .note -R .comment ncp || strip ncp
+-endif
+ 
+ install:
+ 	install -d $(PREFIX)/bin $(PREFIX)/man/man1
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index 874363d1925d..17fb58cb0b1f 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -12,5 +12,4 @@
 	<longdescription lang="en">
 "ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer.
 	</longdescription>
-	<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
 </pkgmetadata>
diff --git a/net-misc/ncp/ncp-1.2.4-r1.ebuild b/net-misc/ncp/ncp-1.2.4-r2.ebuild
index 6309febf0296..cb6d5545c438 100644
--- a/net-misc/ncp/ncp-1.2.4-r1.ebuild
+++ b/net-misc/ncp/ncp-1.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,21 +12,19 @@ SRC_URI="https://dl.fefe.de/${P}.tar.bz2"
 LICENSE="public-domain" # mail from author, bug 446540
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="diet"
 
-DEPEND=">=dev-libs/libowfat-0.28-r1
-	diet? ( dev-libs/dietlibc )"
+DEPEND=">=dev-libs/libowfat-0.28-r1[-diet]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-makefile.patch" )
 
 src_prepare() {
 	default
 	rm Makefile || die
-	sed -e '/^ncp:/,+5s:strip:#strip:' \
-		-i GNUmakefile || die
 }
 
 src_compile() {
 	emake \
-		CC="$(use diet && echo "diet -Os ")$(tc-getCC)" \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
 		LDFLAGS="${LDFLAGS}" \
 		STRIP="#"
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 3dc489f21481..833367d2cb1f 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,9 +1,4 @@
-AUX ldflags.patch 452 BLAKE2B c2adba2e1cb395eb2261397acc879ab8cb82ef776cfd5e53411761d1ebf91017cd5bbe14654d814798149d2838efc90979273a406d8ab8c72b343e8453d8ec5d SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
-AUX omniORB-4.1.4-format-security.patch 557 BLAKE2B 3aef2fdebedfdaf91cac169aa04715c37509e6d86bfc03a0171af238e232f3d2b9b59e69f2a01c6b35d291a4dba199ec6cf2c80203ee58478318ca0fb5a89f58 SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee
-AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f450a9f128fe84b3a345ce72f4be551e203ed21978dbd0381b610b98cc64375dd4bd873a33b9403374980b7e17b1264 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396
-DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
-EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
 EBUILD omniORB-4.2.2.ebuild 2699 BLAKE2B 7d90ee3818c33c9789e895fda80aa51311f37ea719272f2908e530a24568fb9befae217d695ef2287eb83bbc3abfea03f37692c8f7b4d1be97bd7f289414ac50 SHA512 11149736ef2da11c63a961767e1193bced15b818905c5c8d290d3e38eb8e18014523219a1f4f6ba662d8ac7a66c47362d9ad455c84ef4a8c7c07a0725e17dcb7
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/files/ldflags.patch b/net-misc/omniORB/files/ldflags.patch
deleted file mode 100644
index 471df27ae7f4..000000000000
--- a/net-misc/omniORB/files/ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/beforeauto.mk.in.orig	2010-04-24 21:13:17.000000000 +0200
-+++ mk/beforeauto.mk.in	2010-04-24 21:14:24.000000000 +0200
-@@ -541,7 +541,7 @@
- SharedLibraryLibNameTemplate  	= lib$$1$$2.$(SHAREDLIB_SUFFIX)
- SharedLibraryImplibNameTemplate = lib$$1$$2.a
- 
--SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname
-+SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname @LDFLAGS@
- 
- define SharedLibraryFullName
- fn() { \
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
deleted file mode 100644
index 2af8d21d308d..000000000000
--- a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/tool/omniidl/cxx/cccp/cccp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
-index 0198b1a..64d80ae 100644
---- a/src/tool/omniidl/cxx/cccp/cccp.c
-+++ b/src/tool/omniidl/cxx/cccp/cccp.c
-@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
-       else
- 	parse_error = macarg (NULL_PTR, 0);
-       if (parse_error) {
--	error_with_line (line_for_error (start_line), parse_error);
-+	error_with_line (line_for_error (start_line), "%s", parse_error);
- 	break;
-       }
-       i++;
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
deleted file mode 100644
index 968013a25781..000000000000
--- a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/326791
-
---- include/omniORB4/sslContext.h
-+++ include/omniORB4/sslContext.h
-@@ -111,7 +111,11 @@
-   virtual ~sslContext();
- 
-  protected:
--  virtual SSL_METHOD* set_method(); 
-+  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+  virtual const SSL_METHOD* set_method();
-+  #else
-+  virtual SSL_METHOD* set_method();
-+  #endif
-   // Default to return SSLv23_method().
- 
-   virtual void set_supported_versions(); 
---- src/lib/omniORB/orbcore/ssl/sslContext.cc
-+++ src/lib/omniORB/orbcore/ssl/sslContext.cc
-@@ -197,7 +197,11 @@
- }
- 
- /////////////////////////////////////////////////////////////////////////
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+const SSL_METHOD*
-+#else
- SSL_METHOD*
-+#endif
- sslContext::set_method() {
-   return SSLv23_method();
- }
diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
deleted file mode 100644
index 183a5713a85a..000000000000
--- a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1
-
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc ssl static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect ldflags, bug #284191
-	epatch \
-		"${FILESDIR}"/ldflags.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-
-	sed \
-		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
-		die "sed failed"
-}
-
-src_configure() {
-	mkdir build && cd build || die
-
-	local MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
-		--with-omniNames-logdir=/var/log/omniORB --libdir=/usr/$(get_libdir)"
-
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
-
-	ECONF_SOURCE=".." econf ${MY_CONF} $(use_enable static-libs static)
-}
-
-src_compile() {
-	cd build || die
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	cd build || die
-	default
-	# this looks redundant
-	rm "${ED}/usr/bin/omniidlrun.py" || die
-
-	cd "${S}" || die
-
-	if use doc; then
-		dohtml doc/*.html
-		dohtml -r doc/omniORB
-		docinto print
-		dodoc doc/*.pdf
-	fi
-
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB"
-	doinitd "${FILESDIR}"/omniNames
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	insinto /etc/omniorb
-	doins "${T}"/omniORB.cfg
-
-	keepdir /var/log/omniORB
-
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/omniidl
-}
-
-pkg_postinst() {
-	elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
-}
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index 3965978b2b92..e6318b092003 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -1,4 +1,3 @@
 DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe
-EBUILD pimpd-0.8-r1.ebuild 503 BLAKE2B eac7df99d9cb8ac26de9f3759fa0d3b58a2790187515cb7446a65c25a3e9144341727b55248e92931ed1b14ade358257124e4ba9241c585e39f7d2426e034fa1 SHA512 29ff45d798f432dda24c29ee8f9892bfecbb124e4131ea00b1f2e88b9e76e9a04831bf166fd33bd11e846ff32ea345a4339f8c6307bf782392c8e67aa0111a1c
-EBUILD pimpd-0.8.ebuild 502 BLAKE2B 2dc0b588b80c1b16483ea1500dee2bf79bc5ac6cffa612c006362102743d35e89ec580471900ceda5d71c0574c26a9d7a6d4566f57f678892eff27ac4e5c3186 SHA512 d1161161cc4f2223aead8397de6064bebd37eb820585ebdd90dd3845249fa0862aeada927e83064eac2e1620ff3d5f4ebf83a3ebce635195e4d723fca71d513b
+EBUILD pimpd-0.8-r1.ebuild 494 BLAKE2B b3a3e74cefb5029e1a4493c59346855b767f5d9181150396e86392c32aba58a39f22292d1ee06201ad0d9daf59c5dd6414086674512d2739003f24552b7793b3 SHA512 e9046383d5637f8e38b6a458c981733dd45ade64640c804015f7502425d94a19265aca9eb2df8d35e2b327f46aabf81d147db8257177df9ec62714530e22d8bb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pimpd/pimpd-0.8-r1.ebuild b/net-misc/pimpd/pimpd-0.8-r1.ebuild
index 449da1bcd34c..8c5762a44ff5 100644
--- a/net-misc/pimpd/pimpd-0.8-r1.ebuild
+++ b/net-misc/pimpd/pimpd-0.8-r1.ebuild
@@ -11,8 +11,7 @@ SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86"
-IUSE=""
+KEYWORDS="~amd64 ppc sparc x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
deleted file mode 100644
index 62183ccfef28..000000000000
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin pimpd
-	dodoc README
-}
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index dd03446b49b2..a4e54156a70a 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -1,13 +1,5 @@
-AUX pps-tools-0.0.20120407-build.patch 1268 BLAKE2B d0f86dbcec57a82b59f9a0ed2cdb90e16392f39eeb2ad1592b81a8111df546d08fa9ce987c489f9d5812cc9ed28d867869fef71df8fa403ce56ed95fd4591db4 SHA512 942f1a94e4f0811a82e7b15905c84050e9990266690bb26f4145ecd5c29a9804dd5917158f925cf0df3908f3d2eee67c7df6daef32e745cec574f9169c6f0818
-AUX pps-tools-0.0.20120407-install.patch 740 BLAKE2B 3da7acd1c21d49f1628752e7b9a77524250d549e6ebc05ddc4661ea0a7422c5d82530cfea0e103246be9b8bb43c34fb3ff3508dcba630fdbfa69ea36932f4b43 SHA512 0f08cd8018ec279751d297c0392bb685488e44aea0b03f754e7f81cc020a5d8872b4aad362c59eebe857a3ea0127827a66567f70f269fcbd0961fb4fe284dce2
-AUX pps-tools-1.0.1-LDFLAGS-fix.patch 537 BLAKE2B 9fbabfc6465043d86494d7e4bb4ae2e6281c7484188aff25e46f7ad6f3c7eb36b82fac4ae35b03a6a099792d71d562e91f94db708458d40e4f349e44a10c6f29 SHA512 1e5f301f7f7d40196db7341ed99160deab2efd9f38eb23683ca549241169cba441c4c893f793f26b55ff727274b1d44f2fdd65c870373b23e3e6f781cf150875
-AUX pps-tools-1.0.1-build.patch 1220 BLAKE2B 0f5f1cb76a57753a34913b308ebdc50bc399ad2a71958c9fa72520a3968243d518fc5aadce101033bfb6634c39ab1bce11c1a2202c59f9245353797685b3fdfc SHA512 d2f845e21baf0643dcdf222dc39790eb3e60ca112d6ce2de1a9b8b12f6d1dde6645a72a91df2cacb26fb10154e8f9b99917570a854e1a4fdae0f10271fa1ba0b
 AUX pps-tools-1.0.1-install.patch 693 BLAKE2B 6f85d636697c30abee4a5c3c83d8c0a636c1e70343a373ab483bb98a7d5d4db60373ad0337f2feadf0f64585bf180211df8cfc17f1e465023884477bdac3a8f4 SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc
 AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a573d4e69bec67283aac1c19ab86939478b2ce6a205671d9282cfd17f7f0731653374d1fb7971bbead75c6ac6a23e4 SHA512 3494d05eca69fb3b3011ce79a4b8cbaab5eb2ec89abb2b1ffabbd1d677585b4054bae398c4703048be0e32c4cdbd9c188fb624571b688630d95b03396e5e759c
-DIST pps-tools-1.0.1.tar.gz 12695 BLAKE2B 8c05f037b03efc2685bf303f521e168e6c56c203665482fa456278e3580fba8d2fc04935b7f32b70b6ac50c28d4f998a2808f5e3034dcffad4ff1589fd8f2907 SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784
 DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
-DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
-EBUILD pps-tools-0.0.20120407.ebuild 683 BLAKE2B 86c7a81d4a0d372967245aa0695f39d9c0e873d1532f305b8debaca5f55377b21f202e32fb8829409452882adde35cb1169184a0508ec504d5e9943e92058be7 SHA512 6ded78dfbb7ea4ff2221b0cf4d8833aa3b71d2bcce158d7467fc130402f0445c974da85f71bd3ba9f8311477a39c7e896fb2a0ed8514d9819070fb691471e473
-EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a
 EBUILD pps-tools-1.0.2.ebuild 544 BLAKE2B 98ca845a43a744c287750f2e81d4040eafc52a769c4c4983d69b7db866a034155a72da3719052a5c2b7404b6c5a2b7c429f1b0f21eceb7205bd3d6029b023fb3 SHA512 3a37793a5493210a619e575dda0765eea43c1e932361249cf0d3f9c32364b6f6938a310ffa410a5c26d0d0af0bdd0490445fa8d5c98cb5adfde064e117e1b6da
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch
deleted file mode 100644
index 5a27bb65184b..000000000000
--- a/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f4133df52856adfe9ffa2152f0e449f2f8adb49d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 18 Aug 2012 17:04:43 -0400
-Subject: [PATCH] fix up makefile
-
-Make sure we respect CFLAGS/CPPFLAGS properly.
-
-Also fix up the depend include so we get reproducible behavior --
-the depend file is generated & included first, and we don't get
-weird behavior when we run:
-	git clean -x -d
-	make
-	make
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0fb84b4..a07156f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,8 @@
- TARGETS = ppstest ppsctl ppswatch
- 
--CFLAGS += -Wall -O2 -D_GNU_SOURCE
--CFLAGS += -I .
--CFLAGS += -ggdb
--CFLAGS += -D__N_PPS=18
-+CFLAGS ?= -O2 -ggdb
-+CFLAGS += -Wall
-+CPPFLAGS += -D_GNU_SOURCE -I. -D__N_PPS=18
- 
- # -- Actions section --
- 
-@@ -12,11 +11,9 @@ CFLAGS += -D__N_PPS=18
- all : .depend $(TARGETS)
- 
- .depend depend dep :
--	$(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -M $(TARGETS:=.c) > .depend
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+-include .depend
- 
- install : all
- 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
--- 
-1.7.9.7
-
diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch
deleted file mode 100644
index e268d6622a94..000000000000
--- a/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0b3a849153ffb42fb22fe42dc2b9e59ca23cec8c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 18 Aug 2012 17:15:19 -0400
-Subject: [PATCH] fix DESTDIR installs
-
-Make sure the dirs we install into exist first:
-	make install DESTDIR=$PWD/foo
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index a07156f..bebcce7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,6 +16,7 @@ all : .depend $(TARGETS)
- -include .depend
- 
- install : all
-+	mkdir -p -m 755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/include/sys
- 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
- 	install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
- 
--- 
-1.7.9.7
-
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch
deleted file mode 100644
index 868d97138184..000000000000
--- a/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 231123e1b275f88000e336a2d80d3d96c470ac5e Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Fri, 13 Oct 2017 15:10:08 +0200
-Subject: [PATCH] We need LDLIBS instead of LDFLAGS
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 039795e..a6bff4b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@ CFLAGS ?= -O2 -ggdb
- CFLAGS += -Wall
- CFLAGS += -fPIC
- CPPFLAGS += -D_GNU_SOURCE
--LDFLAGS += -lm
-+LDLIBS += -lm
- 
- # -- Actions section --
- 
--- 
-2.14.2
-
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch
deleted file mode 100644
index adc127205afc..000000000000
--- a/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 60a8a9d3195829cc0c2953fd02bdf0a155e0c158 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 18 Aug 2012 17:04:43 -0400
-Subject: [PATCH] fix up makefile
-
-Make sure we respect CFLAGS/CPPFLAGS properly.
-
-Also fix up the depend include so we get reproducible behavior --
-the depend file is generated & included first, and we don't get
-weird behavior when we run:
-        git clean -x -d
-        make
-        make
-
----
- Makefile | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c70f073..ec437e2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,9 @@
- TARGETS = ppstest ppsctl ppswatch ppsldisc
- 
--CFLAGS += -Wall -O2 -D_GNU_SOURCE
--CFLAGS += -ggdb
-+CFLAGS ?= -O2 -ggdb
-+CFLAGS += -Wall
- CFLAGS += -fPIC
-+CPPFLAGS += -D_GNU_SOURCE
- LDFLAGS += -lm
- 
- # -- Actions section --
-@@ -12,11 +13,9 @@ LDFLAGS += -lm
- all : .depend $(TARGETS)
- 
- .depend depend dep :
--	$(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -M $(TARGETS:=.c) > .depend
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+-include .depend
- 
- install : all
- 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
--- 
-2.14.2
-
diff --git a/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild b/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
deleted file mode 100644
index a6f1989f839c..000000000000
--- a/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-GITHUB_USER="ago"
-PV_COMMIT='0deb9c7e135e9380a6d09e9d2e938a146bb698c8'
-
-DESCRIPTION="User-space tools for LinuxPPS"
-HOMEPAGE="http://wiki.enneenne.com/index.php/LinuxPPS_installation"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${PV_COMMIT} -> ${PN}-git-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${GITHUB_USER}-${PN}-${PV_COMMIT:0:7}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-install.patch
-	tc-export CC
-}
diff --git a/net-misc/pps-tools/pps-tools-1.0.1.ebuild b/net-misc/pps-tools/pps-tools-1.0.1.ebuild
deleted file mode 100644
index c631eada6ded..000000000000
--- a/net-misc/pps-tools/pps-tools-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="User-space tools for LinuxPPS"
-HOMEPAGE="https://github.com/redlab-i/pps-tools"
-SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-build.patch
-	"${FILESDIR}"/${PN}-1.0.1-install.patch
-	"${FILESDIR}"/${PN}-1.0.1-LDFLAGS-fix.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
index 58a203313446..1ad89b28ca11 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -1,5 +1,5 @@
 AUX ps3mediaserver.confd 169 BLAKE2B 9406c426b73e7d4cb349146f2dd975bcdd8de177615c9b5cd7e3f39bf8e5a8917ef7db3d442bdb67decefc1fde3fc86820a9f797c76b971d30e3fe515f06e7e6 SHA512 3ecbd0a99c422f2fad3082ea70d0755d3af9aca3d426865e57fbe8669647603df90006c79064166ca6866e4e61a86f0dccfb5f8c8429476de69b91c4e6e10f37
 AUX ps3mediaserver.initd 399 BLAKE2B e45d66c845f47f54217a995bfad68fe5a3bddea5b16a009f94fe610bc26f292450f554fe822fa238e95b57add60f30397328e6d5460c3b983e49e06499c7726f SHA512 bd260d16f7d4b29d922ede6531d774031f548889fdd9156dd025ec7135824362dc4026cc9577ce85733a00b3eed70a8ce96fb894ccfeb81355b818013de12406
 DIST pms-1.90.1-generic-linux-unix.tar.gz 15789602 BLAKE2B 6240c4c4e21fdc0a587e26499969a0dd597ffa8a079812ef944268cc13d2437749f95d6671367baba04f52e2c7499b841e6cf845b3f8c708b756295a66ae9f76 SHA512 af5748989dff1b106ba44a952fc68b43d11a929dec56440cf11ffd6f0a0c561febce54557855bf1afc2614cfb904b5997265f0bdf4ecf45535e12bbabc0fd11f
-EBUILD ps3mediaserver-1.90.1.ebuild 2060 BLAKE2B 93d08be0c5e0b20a9ae18b782d74571f34c4b18efb1d677d79390db3ba70c33f9a2e34013f05dab75f65be06a8ad640e96996b24a4376097dd8a73479b002c81 SHA512 8879d3781dda5a43c6a9d7039d8d0565f5844a97f9d291baf3fb75d8a0b0c1125bdd487ad47c2b99c9106c2a04e2d465296b873945cfff826fc35bef017ec60f
+EBUILD ps3mediaserver-1.90.1.ebuild 2079 BLAKE2B e7060191c5c5cc481cf249e6f46a1351c279db9bec09943fd2cf464e2d27d6749151946191c2285a06b215e92e323266c5d0cf54d97b84380cb4725a0f502119 SHA512 ca4752f9fc283b82548627466500c0bcd2955ec984c05809cf2b75e4a0f3d0b0708b69a51cbc946c7ea56f5df3e298d9430547ef7d3d6849991b42f6b043e42a
 MISC metadata.xml 683 BLAKE2B eb0d168e6d9c9ec4090f8efdd98c5edaf0888e63bc31b6aab98c306d87e9e65a93175ac0e7e2b9198d8e7d53f63c3181e8d044273cc0b6ca18bc7758e12ba366 SHA512 0ac0f8a5a30436a0597b97eaee727419e6c981b7dd5edc6f5ff98178c7b025a08ad57a5884834c42fcac54445e35425d7177ce4ac9c66a2e631ad1f6637889fd
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
index d407c37977c3..c2f1136ca7c2 100644
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils
+inherit eutils xdg
 
 DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
 HOMEPAGE="https://github.com/ps3mediaserver/ps3mediaserver"
@@ -77,6 +77,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		ewarn "Don't forget to disable transcoding engines for software"
 		ewarn "that you don't have installed (such as having the VLC"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 91aed9a4f877..29412b0c9695 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,14 +1,10 @@
-AUX rsync-3.2.2-allow_bwlimit_0.patch 3163 BLAKE2B 69255e7e2926dccdbfa63962db7b11bf8d2ce110251a9edbd437e743f3af9208b2d009b1d7aec6c57b3c241bb01e810b210cd055848532efa724543c440cdc7a SHA512 4c91e63aac56d4e177baa5e0840680515e172cc7a431408bc41ee5f4afa9f1d2f5f4de21999bc77709175cfc042997f4aa455f9ff2ccfa9c6abdf1401f81ac44
-AUX rsync-3.2.2-zstd_see_token.patch 738 BLAKE2B 3bfb8c27e6b6f1893e25d0ff763fb59966d93ac62b0c43245f9544a48d42b65d78161c9add23d26592ac3405636d2387d7d1938b6efc2264c22f25499e17e8af SHA512 03ab78e4f7cffa56727cf528d2d3b09310cb959887f72bcc7bce41b0315c7bcabe72dda9ebacf71a600a7bc9b1c417568adb740ace988beed2e016facf8faf1a
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
 AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
-DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.2-r1.ebuild 4595 BLAKE2B f98b70a7d8e1c8bc677c7cc0750c21fc8b4f837a25094fc06cbc7af4eeca2e2deed18fd1e01b3ae8eafc450b3fe0e2dc68449d7131abc1cac316322e27572553 SHA512 72752c1941c034cf09fe91b7396024d6d18c4d3837c8edb437753f9f00848fedc8dc3c562186813496538291262389184a3132aceac3a9011939be55598033ba
-EBUILD rsync-3.2.3.ebuild 4483 BLAKE2B ed42f69dbfadb523cdccd78199d45a0392fa604b22699c912d7999410a587e4320c5ed821acc9c851daef65e78fa205e206a8fbd8c1309b0d5300541ac1cfe27 SHA512 3662d29d5216c618e73f98ce87249b236f7c2667c82d1c535181d092f346fc181ccd8e3d289b131769ccf18afd6998ce524d8866df7ad04fe2cbc9812cf2fb5d
-EBUILD rsync-9999.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e
+EBUILD rsync-3.2.3.ebuild 4489 BLAKE2B 79ad583ddad8ad04d81b6bbc81c2528d5b4d4d22ac496599e34ce3b2debd36d1f8436a25f52a15bf74069e5e63dfea1a8073d2f5586883729cf065dc0d3e9861 SHA512 accd8273fd7877972798f2f57989686ebad200e138bf7aae2cb2e1c11251333491a54da1ec5b365b77e97ae9c5a5b872fa66d643bc010c595efd7e152180c5b3
+EBUILD rsync-9999.ebuild 4498 BLAKE2B 7d88aaf267cb0b8701fcdb13693acdb88f19b7155d3e13f8e3c64ca334ef5fab569543f47973a0f5f0522d2a657267c17e7aa982937b95e998a187d6bb482ddc SHA512 4054e8fd9154880c001e66f059b9e980084e34f9e1c8aacc4fb366668180c2ed0ef011f79ede25d3fc902db170b80327b0df4dbf9ea223d2e098e6f7e7f22166
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
deleted file mode 100644
index 4a795bb17b96..000000000000
--- a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Tue, 7 Jul 2020 11:40:27 -0700
-Subject: [PATCH] Allow --bwlimit=0 again.
-
----
- options.c            | 12 ++++++------
- testsuite/hands.test |  2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/options.c b/options.c
-index 5a372ae7..0b7b9f33 100644
---- a/options.c
-+++ b/options.c
-@@ -1253,7 +1253,7 @@ static int count_args(const char **argv)
- /* If the size_arg is an invalid string or the value is < min_value, an error
-  * is put into err_buf & the return is -1.  Note that this parser does NOT
-  * support negative numbers, so a min_value < 0 doesn't make any sense. */
--static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value)
-+static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0)
- {
- 	int reps, mult;
- 	const char *arg, *err = "invalid";
-@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name
- 		size += atoi(arg), arg += 2;
- 	if (*arg)
- 		goto failure;
--	if (size < min_value) {
-+	if (size < min_value && (!allow_0 || size != 0)) {
- 		err = size < 0 ? "too big" : "too small";
- 		goto failure;
- 	}
-@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p)
- 			break;
- 
- 		case OPT_MAX_SIZE:
--			if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0)
-+			if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0)
- 				return 0;
- 			max_size_arg = num_to_byte_string(max_size);
- 			break;
- 
- 		case OPT_MIN_SIZE:
--			if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0)
-+			if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0)
- 				return 0;
- 			min_size_arg = num_to_byte_string(min_size);
- 			break;
- 
- 		case OPT_BWLIMIT: {
--			ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512);
-+			ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True);
- 			if (size < 0)
- 				return 0;
- 			bwlimit_arg = num_to_byte_string(size);
-@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
- 			max_alloc_arg = NULL;
- 	}
- 	if (max_alloc_arg) {
--		ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024);
-+		ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False);
- 		if (size < 0)
- 			return 0;
- 		max_alloc = size;
-diff --git a/testsuite/hands.test b/testsuite/hands.test
-index 46928d4e..8e265b7c 100644
---- a/testsuite/hands.test
-+++ b/testsuite/hands.test
-@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
- runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
- 
- ln "$fromdir/filelist" "$fromdir/dir"
--runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
-+runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
- 
- rm "$todir/text"
- runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
diff --git a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
deleted file mode 100644
index 02f22409d4c2..000000000000
--- a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Fri, 10 Jul 2020 09:47:16 -0700
-Subject: [PATCH] Fix see_token zstd case.
-
----
- token.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/token.c b/token.c
-index cad6b641..61be8dd9 100644
---- a/token.c
-+++ b/token.c
-@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen)
- 		break;
- 	case CPRES_ZLIBX:
- 		break;
--#ifdef SUPPORT_LZ4
--	case CPRES_LZ4:
--		/*see_uncompressed_token(data, toklen);*/
-+#ifdef SUPPORT_ZSTD
-+	case CPRES_ZSTD:
- 		break;
- #endif
- #ifdef SUPPORT_LZ4
--	case CPRES_ZSTD:
-+	case CPRES_LZ4:
-+		/*see_uncompressed_token(data, toklen);*/
- 		break;
- #endif
- 	default:
diff --git a/net-misc/rsync/rsync-3.2.2-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild
deleted file mode 100644
index a7cd968e74bf..000000000000
--- a/net-misc/rsync/rsync-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	PYTHON_COMPAT=( python3_{6,7,8} )
-	inherit autotools git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
-	S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	system-zlib? ( sys-libs/zlib[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	xxhash? ( dev-libs/xxhash[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-if [[ "${PV}" == *9999 ]] ; then
-	BDEPEND="${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306
-	"${FILESDIR}/${P}-zstd_see_token.patch" #733084
-)
-
-# Only required for live ebuild
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable lz4)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
-		# SIMD is only available for x86_64 right now
-		# and only on glibc (#728868)
-		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
-	else
-		myeconfargs+=( --disable-simd )
-	fi
-
-	econf "${myeconfargs[@]}"
-	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.3.ebuild b/net-misc/rsync/rsync-3.2.3.ebuild
index fca1f4351e0f..a502102dad2c 100644
--- a/net-misc/rsync/rsync-3.2.3.ebuild
+++ b/net-misc/rsync/rsync-3.2.3.ebuild
@@ -37,7 +37,7 @@ LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
 	system-zlib? ( sys-libs/zlib[static-libs(+)] )
 	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
 	xxhash? ( dev-libs/xxhash[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
 	>=dev-libs/popt-1.5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	iconv? ( virtual/libiconv )"
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index fb78f513976f..3624db6822a5 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -37,7 +37,7 @@ LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
 	system-zlib? ( sys-libs/zlib[static-libs(+)] )
 	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
 	xxhash? ( dev-libs/xxhash[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
 	>=dev-libs/popt-1.5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	iconv? ( virtual/libiconv )"
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 2de203a8a2be..e0bd1e6fb132 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,3 @@
-DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
-EBUILD s3cmd-2.0.2.ebuild 579 BLAKE2B 37142c3dbcb5ee3d9ddd574738fdd0df153e566949a0f1f7350b1ba2c02acd36e0a4398ba4683f12ab9392d86375a5e10adbf9b39d76a020e20e4b565af1b5ef SHA512 bfad562510e73393e0cb8ca22ca7b7853ed5a66b35105282eb6eeec1ccef38a0e051d45a62eb442b923148fd75a88259fda742cd28399fad9bfdaf31fe731775
-EBUILD s3cmd-2.1.0.ebuild 557 BLAKE2B 7a9a58378ecc64a84ddb7bd96fd211a37dda3fe093ec95fa6cd464d14deca7f117914ccc2c8928c60463a7e128b488fa018c237e1f6e15b140d271049bfbebbe SHA512 bc18359ed6e4144b534089e86b6150b69cf7194cb9d3ee41b500e5ea3d1cd9024bcb5be092dbbe4f0039dacc9fe30e85e1825aa993777891cb980d4cdb688d8c
+EBUILD s3cmd-2.1.0.ebuild 556 BLAKE2B b8ec88b18235e5b9593185cf3f7988d3e71e0d12439960cf963d6385a48571060f679e6b3cf5e4c503c1b7538bc846f26eb82dcafb1d6be4333c9d5f88fffa68 SHA512 7c7011b4de0978f2d7091ff6627056c29070aa83bd4470b854d539c535bd29c379d014117a3ddbc64b9e2465d67534638773991e860c3864de5501289d07619c
 MISC metadata.xml 684 BLAKE2B a51a67e94176e0c83d810b847abce27229e0769007d984fe4947a474f7d5dbc7a27169efa6caad265405e7e489351f5cc506fc852be88381f282bc7068bd70f4 SHA512 aa2ed58e516488adeb24cca0aac779dcb49c4ed6977a6b411df34f45a0e1b58a42aa34b0ff5faf1206bfb88f85bddf034dad43577512cff67e1aed2292f373e8
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
deleted file mode 100644
index cfdb393490f2..000000000000
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6  )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Amazon S3"
-HOMEPAGE="https://s3tools.org/s3cmd"
-SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]"
-
-S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s3cmd/s3cmd-2.1.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
index bcff44746076..cece3c9cb833 100644
--- a/net-misc/s3cmd/s3cmd-2.1.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 0672ca223840..e332019e410c 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,10 +1,4 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
-DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
-DIST seafile-client-7.0.4.tar.gz 2357414 BLAKE2B 9c3368d745d30f57b313e9b5351714097403e67519a4582dd5658cb97152f4ad37c32cb9e6f47c13f199c75e9bd42c529ef0d352f363da815f486c90c305779c SHA512 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7
 DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
-EBUILD seafile-client-6.2.11.ebuild 1089 BLAKE2B ab172b2b57637d926129dc403a5ff159ac1ceb8e5f909f340f40bedf5ac006ceb3493f3e7d8a3cbdd3f5d764920c1882b5f6ce04d5e6ae67368e50a93d013f41 SHA512 400b47d792ff9310b0e1bb9ec7db7d3851d368fc5d85127d51cd3cd069215ad9c975d994ead155f0c8815baf524ee96b38a5f30f35b8515c59ecd65d4b5604e5
-EBUILD seafile-client-7.0.2.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
-EBUILD seafile-client-7.0.4.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
 EBUILD seafile-client-7.0.5.ebuild 1062 BLAKE2B 6554b553c116a436521026bac9e4d5bd45eea8f919dec85b9e55b4e9ff629523d0ae4076c12c94e8f1af135fa314b927d37cc739b571b92c377cc03b18f30f80 SHA512 f6a0e1ca65fb6d673fbbb3beb384b4d689335d65af051de610fa2a7cb8fabeff5d3db2e5a30014dbf911566eeda9b084901dc50c74e72f4adc49008a8a8b5400
 MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/seafile-client-6.2.11.ebuild b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
deleted file mode 100644
index 391e523a971a..000000000000
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-7.0.2.ebuild b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
deleted file mode 100644
index b05f5df982c6..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-7.0.4.ebuild b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
deleted file mode 100644
index b05f5df982c6..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 41b7fa493d57..9bd0b16def92 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,9 +1,3 @@
-DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
-DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
-DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb374e70739be76531e9ecb6cb3428f6d8c0aeaa6cf5638a9dd5e964f9ae72b4933fd379655149790396dfe9ffb8 SHA512 2eefbb928f3082ba8373509c149e4e1fcfe960f10baba227759ed43411d5adeca844f1538609fd1046f22661322c57bbf93ede1fa849a39e50a4af8a3a7febc1
 DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
-EBUILD seafile-6.2.11.ebuild 1056 BLAKE2B 279d62d80210e1112f63b975a032628da3894605f8f42f556ac536ced029bc45286412c8936430c7e72d14ca9ae7433d27e0f2591b8239939cb8b612ba7645a5 SHA512 4d99ce95f6d5eee226d32689bc089e6141b45d55972ee68a6bcec098132c655e15cfcc04b3001503d29c78a3c5b5a3dabe9abc669340222cbc72cb64530cf78b
-EBUILD seafile-7.0.2.ebuild 1057 BLAKE2B 440195844dcbf7b5e5ea800ea1d6a07b051ef2cb744d24a6c7059ea25f29d276649dd06117cf765e9c66e0f3c05788ec4b770c250127b07240566ff9488247d0 SHA512 a2c3e18063f7d01966ae0eb0339a5edbf45b6ca2299b7a95be1b5111d23242abb4f67371299ac76544c223f4fcd7added5039eab6e8d9bb678dbb0c8f3f415ae
-EBUILD seafile-7.0.4.ebuild 1093 BLAKE2B 46879e54739245bd99bc7e0ba179c2d73ed005b4a4dc9e63646dd9e77852f4949165578a6c3805c2b8595ebfdb0008c4a42d033a1cd580d4142be515bf167545 SHA512 7399a6e9da43f618b66d3a1d8fbb608e9c3d318a40abadf28baac63f5a4404b9a44a465ce68cdb21eb85d21ec62a2d332808db59938ef00ada40df50c787f238
 EBUILD seafile-7.0.5-r1.ebuild 1070 BLAKE2B 630903597a5ac4f4ac6f198e4ce2ecdf105f07c9f8f34e98435a7b546decec5db448796b227a3265ef0bb60781b5c5e686244eed355b59b2e6b8299c087a5412 SHA512 4f1008cfee991a89a778ab614d7d08babc38248422a80b22a8ae544008e480f5cf55bd460bba4d66242d9ade3a8b10c2689646d3ec14b2afe46876fcb9cd4b24
 MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/seafile-6.2.11.ebuild b/net-misc/seafile/seafile-6.2.11.ebuild
deleted file mode 100644
index 341db77f5c47..000000000000
--- a/net-misc/seafile/seafile-6.2.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ https://www.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_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	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
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-7.0.2.ebuild b/net-misc/seafile/seafile-7.0.2.ebuild
deleted file mode 100644
index b53b45c8e32c..000000000000
--- a/net-misc/seafile/seafile-7.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ https://www.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_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	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
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
deleted file mode 100644
index 367704af6260..000000000000
--- a/net-misc/seafile/seafile-7.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_6)
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ https://www.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_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	>=sys-devel/automake-1.16.1-r2:1.16"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	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
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index cd7effdd6af1..80288eb2e41a 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,5 +1,7 @@
 AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
+DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d
 EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 978 BLAKE2B 4b30f111c943406b8277e8c2ab0aeb0e50202e71932fa29a6ad13e857275d3afc810a54e5746960dabd99ea1850e4ccede9516331e61f8574cbc1183398a55b5 SHA512 e284b3d0629ce7290fe1c6710809c2095e1b56203f2c94ec67fd1c4163074b3d7590263880ec513a13b2b522544d60b7f66f57510dea1f5daf74506442b0c1f9
-MISC metadata.xml 344 BLAKE2B 2059c989d9bd878eb050b6960dbe5444bd72eaecf4d6f532b2cfb26c830f65010cf7081e2e2a435d541f0b03f904697966ffbcdd7bc41281319689cc65b12163 SHA512 26eb499745d0f954b33834ebecef34ba44ad457837ea4c0b0a44e917513aabe6486887124ac5ce47d69c1756f2a00693ced7ed4dabcb35539d047f19deeb33f0
+EBUILD ssh-askpass-fullscreen-1.2.ebuild 968 BLAKE2B 2b46831866ffe36aa61844095ff48fc4d4a184a626502dcc0dc1e2757089ade6b830f7bea0621fcb2e7364a993ebce5b39d2b0316603151db3893ad153b1b4cf SHA512 fa569cf9d1a9f2df8d5def931d0a5c0b947480b9c4c5850d2309e49bfb4cb32c428e611d48b4165c8e17dbde1a3169373d34f12aae0e0207dafa89c3561981fd
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
index 796542559d7d..58f638b2ac3e 100644
--- a/net-misc/ssh-askpass-fullscreen/metadata.xml
+++ b/net-misc/ssh-askpass-fullscreen/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">atj/ssh-askpass-fullscreen</remote-id>
-	</upstream>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
new file mode 100644
index 000000000000..b2439ddd038c
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A small SSH Askpass replacement written with GTK2"
+HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen"
+SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# automake-1.13 fix, bug #468764
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die "sed #1 failed"
+
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doman "${FILESDIR}"/ssh-askpass-fullscreen.1
+
+	# Automatically display the passphrase dialog - see bug #437764
+	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
+		|| die "envd file creation failed"
+	doenvd "${T}"/99ssh_askpass
+}
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index bf4ee039f581..99bca4dee440 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,5 +1,6 @@
 AUX vmpsd-1.3-64bit.patch 910 BLAKE2B 1f4fc71e6a0e1f7f0c51938d7e25487ac364054f517bba350ed2805c09059674d706fa7b536ec29a5d5ce836ebf72ffae4342dfdf3e883bb88680f032627b7b0 SHA512 45fc49fe1412760ecb45811c01e86406c4103492c5a29b99d8953dcca388c58ad157b4200a2fb9adaf73488746b8d16b168cad9dc5ae95e1e618de7490fb8b7d
+AUX vmpsd-1.4-Wreturn-type.patch 174 BLAKE2B 4d016ef840c7bef378b1350d48809935ee603bc0ac914b62fd377251145cc35bd0b3920193e58c93e2436f7cec58b57e7f1f61c6d5a39cd065952eada48dc9d3 SHA512 bf62ca7d214e5fe0e09ed7f645c36abff299db7cf3360244a881e34048b24a35c17a4d1288a1d97e4c1ef8fd9dd042c400eb9623b2eacae95264332e0910c137
 AUX vmpsd-1.4-snmp-support.patch 2237 BLAKE2B ef6f80dcdd72435d40ff36509c3aa82f71d78312575db02697b7d3dc9c3cceeeee737d8154cbb798deae89a9a24a5070f4d09835fd8d7fa6069f70358f225cc9 SHA512 fd3b9327b07d87d04d9b2f407ceb1e6c1ef64fca0ba63ae040c10e1c46739a487423a3e54fdb228a3210573fbe76faf5a0d4c7f3a4e84eeb80fb74543e42c027
 DIST vmpsd-1.4.tar.gz 92138 BLAKE2B 5fdca60762eb1fca02d95c5022a81b9d28a0266d694dbb40adc1a70e109295ab2f2914f2083f356b372161467df78c35ba28984e6febc4857501e73bd54bb860 SHA512 341a86f8db28f1f7a03b5581ec8f8319a175a2c5dc9c7ff5df880f4416cf048ef9e32afd6600220e48f8713d6c72c4ffae7d1e8d31c73ded466f084711580efd
-EBUILD vmpsd-1.4.ebuild 950 BLAKE2B b77a4a09cfef6a3561990d546377f7cb1c6a8c1c95a8b4bc6b7f1c9064be992e1fc43c7d4f973324bdff3ff3479049c00542df2ef01b32b3449883bd027e5a5e SHA512 705c1ad338c8904df7a81f579e2d063f5f761be18ca7dd39cb14dd13d2d75f13af6aa69cf065995cd5ae8d4e9f4883fb35d4b258a5f4a169b85010666a3a6bcc
+EBUILD vmpsd-1.4.ebuild 899 BLAKE2B 86862067ae11c4e416d7509be78f0e9533dff04b30a2d01b17207e306334b951d836ef2153682d68700e804c8433943dfb755f32a7ff5516e5a5993caf9e44ee SHA512 98e2f90826e246cd4a08693a1c4437e89bd5fd01a1d620f77920f5cb5ea0b51037055b57ef4c113bebde6ea9c7c18a47edddc349a7aa88aeca1cf5d5c97c51c4
 MISC metadata.xml 300 BLAKE2B da1056fac1eedc839ac074dce8ba79accd5a592d9c2c4b517e30c80fd977dd899da89b6b8be113f7ceee4ee908b3b1a246f38a698a5d570bc84e898779d8e5e3 SHA512 02b5627182dd5c4adfa3dbcce0c19c4a5d1dce64061cdb2843e133c168c4e8203c8a37a8da80fb04a0c9fb5a3b6b80be2cb6e8453839db39dc5cf3bd0fe51e03
diff --git a/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch b/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch
new file mode 100644
index 000000000000..e6354c902c12
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch
@@ -0,0 +1,11 @@
+--- a/data.c
++++ b/data.c
+@@ -35,7 +35,7 @@
+ 	exit(1);
+ }
+ 
+-void *xfree(void *p) {
++void xfree(void *p) {
+ 
+ 	if (p == NULL) return;
+ 	vmps_log(DEBUG|SYSTEM, "FREE: %x",p);
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
index e2dd42654288..242eeee574a7 100644
--- a/net-misc/vmpsd/vmpsd-1.4.ebuild
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -1,40 +1,48 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An open-source VLAN management system"
 HOMEPAGE="http://vmps.sourceforge.net"
 SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="net-analyzer/net-snmp[ucd-compat(+)]
+
+RDEPEND="net-analyzer/net-snmp:=[ucd-compat(+)]"
+DEPEND="
+	${RDEPEND}
 	dev-libs/openssl"
-S=${WORKDIR}/${PN}
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-snmp-support.patch
+	"${FILESDIR}"/${PN}-1.3-64bit.patch
+	"${FILESDIR}"/${PN}-1.4-Wreturn-type.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4-snmp-support.patch
-	epatch "${FILESDIR}"/${PN}-1.3-64bit.patch
-	# Merged upstream
-	#EPATCH_OPTS="-d${S}" \
-	#epatch "${FILESDIR}"/${PN}-1.3-format-sec.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--sysconfdir=/etc/vmpsd \
+		--sysconfdir="${EPREFIX}"/etc/vmpsd \
 		--enable-snmp \
 		LIBS="-lssl"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README INSTALL AUTHORS doc/*txt
+	default
+
+	dodoc doc/*txt external/simple tools/vqpcli.pl
 	newdoc external/README README.external
 	newdoc tools/README README.tools
-	dodoc external/simple tools/vqpcli.pl
 }
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index b899af964cfe..438a8e2a7b97 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,11 +1,7 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
-DIST whois-5.5.5.tar.gz 103424 BLAKE2B ef406985be6ca6fe1d73e5c23817c99aa1c111f9ec74707f96602e53e519b77585fc27feaf11baf0cfc4f1fa94fbd876fd6631ea0a4c2b3d7b4bcd99cfd2e786 SHA512 0fcdd5b7fbdf4123edda2af58a2fcf0a1a87c454dc6cb83c86c1d200f80659967a7d08d54d3b010c40465004aa219de2a8efcc4b41524a8aefc2e6050d868d1b
 DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3
-DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
-EBUILD whois-5.4.3.ebuild 1573 BLAKE2B fc50ea531b65cef7b4987129c8c5669a417455d50b277a5da11f1c1d418a278e549c2c1a7d958d1c52d4bf6cc33a538f64d53898dca779dc90a6940b44a6cd07 SHA512 e6547e93190db050a60658e057da8a204ab7f441d5a5f9d45145547c60bf21804e63b36b0ec29932873fade1cc048f10c6f0dcb2084574c8bce9c04dbd488a8f
-EBUILD whois-5.5.5.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda
-EBUILD whois-5.5.6-r1.ebuild 1928 BLAKE2B 2742ebe3c819638e982607d377a620215e756b578defaa13130c7f0accc893c99981ee35d9fbb102a20489965e146e42506489b5fc6566b4e225a1e083cf8660 SHA512 643b052e22bc8c9449ec669fa9bb12dd5aafc6e82f019ad0a47a415563771580bc2f16c5eccdadc3aa134b60a5a2ac74c2715b69584b51ffd287d48bc4acc3b9
+EBUILD whois-5.5.6-r1.ebuild 1927 BLAKE2B 9d7b89f81502de253111365405f2297e63896fca0ade76222d8aaae3f05cd91b88cde8129c9d98ecf167ef380601f6197a00cc549597e29e968211d6f86f4103 SHA512 5f539dff3bfdbe7e75184bc04420d70e376118394a9d3f286f04cb36462b7eb0d8eb735b36ba5a08c07cd7cb1caed86ee0719c3cbe8b85bebd7edb3b9c9a6b4b
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
deleted file mode 100644
index 669b2c40b3e2..000000000000
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.5.ebuild b/net-misc/whois/whois-5.5.5.ebuild
deleted file mode 100644
index d99078f32be7..000000000000
--- a/net-misc/whois/whois-5.5.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild
index b3b6a8ea1b68..740b5fcfc9e2 100644
--- a/net-misc/whois/whois-5.5.6-r1.ebuild
+++ b/net-misc/whois/whois-5.5.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9b1a04f62460..795277c1829f 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2020.09.06.tar.gz 3182124 BLAKE2B 557fb81812e91c13201044afdb7b119eeb17f022717a2e33c44f76e47591df3036e344e32d75ed5ba55f1b1fce5079213344c06b682f33c043fb764d0f92c5d6 SHA512 866962ab6a3c24b1951232ffb15c9f49c56156d9cbffa3ad265ee905f4b8e63cbc9695acf0a703c945a3d5da4e6cb4cd67add7f2452d54b0f152eb6ed20a0a7a
-DIST youtube-dl-2020.09.14.tar.gz 3187040 BLAKE2B 6fcf9866a3d6b13d40501677584f8c28bc26d198c20ce2e5c17adf34237c4f6373d0b6d2555780546d1b54e40179afc44c7db700f60755c0eae75f0d3e800f33 SHA512 6cc910e8725bb4d394ba45a1a89a6975e672a0a5869ecd41a312ade9127f3b14bf26268728baf575d41595457d157c6ab7179045687ad0a882b1c6e4bf4e166a
-EBUILD youtube-dl-2020.09.06.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-2020.09.14.ebuild 2171 BLAKE2B a119ca9346ab4b312f68184a5982c0db646ab961ba3282c94104db31eac370e70c8b3dda2b24bb0729c4760e267ffb740c08d5203c78a4585b5c60ad7944a26c SHA512 8415d6657358075646e8ccb5963bb616dd4f953942c8eff9214185a4d126c3c40522302ac7ce22c18f5bc45735a7d47cb7bbcd74f314eb230fa0888ae8a07753
+DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
+EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
 EBUILD youtube-dl-99999999.ebuild 2068 BLAKE2B 93977d0be35ac43d7ba1cea51a20364effe0c87a11684e02a13b70fd682d8199fff2652bd86767b3ea4a148603ee93ecd7837e7fcc54139de5ae59cdc510c1e6 SHA512 429c926a0fce1cc0ab8cabdae8904ab0fcd99399c7b6e924d7034ad07f6d038489f44ebb9ac0d69cc270a023c37d0a2845fa22deb8bd94a4d6d9237dd1114043
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.09.14.ebuild b/net-misc/youtube-dl/youtube-dl-2020.09.14.ebuild
deleted file mode 100644
index 27edc068096a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.09.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{6,7,8})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.09.06.ebuild b/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
index 9dc88dfb1591..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.09.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /net-misc
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)