gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /net-misc
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
91 files changed, 1797 insertions, 1620 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4dde49ee53f8..93309f480957 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index bdb31e207053..63487e432073 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,10 +17,14 @@ AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32a
 AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.33.0.tar.gz 33683712 BLAKE2B ecfc122628c08e93fc389f111e1ee8ddcf3d27895437df9da5b83a6440c2135f9223a5605e0ef436e8585f8b023abba5b74680cac97f1700e1bc153872c1ed87 SHA512 b866a63cce7c289d32333b4b3b0a605c413b48fc7518976aa0768dd5c68894348d0de1c9bc7c56b73eb86b69e0fd9847d7226fa0f9e449f8ebb8a7118329db56
+DIST asterisk-13.34.0.tar.gz 33686020 BLAKE2B 48de77f2e29028ab3503ea30038e629b6ede43154bec8efe1384a7077fb971f91b85d9b4eb55f7a4ea6577a31ad5fe496453fe59cd607a0c613e46edef9a11d9 SHA512 2132db831bb063330c47cea8cea67af706839d25e64eee558475643cb79a4e548fc6ffe7ce61a053f41cf6f367320eedaa87973a5de4ef38ae858a6e5a183ee7
 DIST asterisk-16.10.0.tar.gz 27706766 BLAKE2B b8d7866fe3e8420ef5ce6ea5e016316f63e4f2e8904a79de69c4ddfb7aedcd00f09cfb414da43938af0771cdde387dcebfe716eb34e5ed1de3a30ff534459c7f SHA512 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb
+DIST asterisk-16.11.1.tar.gz 27703143 BLAKE2B ad2c70f76e5d59e183713034c9bbe0988c5848512099230b58b8b2f32edd59c0e843e4d7bc72642e84e842e11639f02213057cc893532808e9fe075b061e35cc SHA512 ff4d971c32a568d4e49d0bc49f15a4a89278e4a1c70ed7d1107e3f4cca13455326465ecc97d23e83501ad45f579b572efbf9217758edfb4531c87d59879b31f9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
 EBUILD asterisk-13.33.0.ebuild 9173 BLAKE2B df9b4d5b2add191db0ea42765ae8f52a2b246761d689b1c8f7191f02475e0dfabe07b6ee318eb8ada7f83a47cf8e928dca46de5d4b898eb5388be89aff5db770 SHA512 461eb01828e69a9e294b0892a2bd01219ae39d51e80567dfbd38e50933f5fe40112c2aba05dc9ce14cad9f511fee92d692966411b032cb0a13d0672566eb6994
+EBUILD asterisk-13.34.0.ebuild 9151 BLAKE2B d94d59fc9697420346673ae2b3cd640fe7a80e2208677fcc47499190ca5e5cd5b573056ff6f0441d25034ec7ceced11db3df48c592c0f97c491ecd2cc7986711 SHA512 37ec8ecb625058151743df917dfa8d470efc8c4118e1e59451a38b0f6058b90e26d5cb79ba70aef73874f87d081d1fbb0f5f958fdb4476a46104853d27a08f14
 EBUILD asterisk-16.10.0.ebuild 9313 BLAKE2B aa08c101a2531afe02059616da7cc4e621124f86ccbcada647d1f2acdde12bdc80d2abe69a391c06d20ad26416cd3c20187e326ad9689750273b9167bdacd702 SHA512 5d851d212b4edc89addbed9058b4108c5a49e1859bc10bdeb9341b39ed0b6563da335a29c427d95d7609429aeb4beece6c16af1592c0b4026879ca7c9e101715
+EBUILD asterisk-16.11.1.ebuild 9313 BLAKE2B aa08c101a2531afe02059616da7cc4e621124f86ccbcada647d1f2acdde12bdc80d2abe69a391c06d20ad26416cd3c20187e326ad9689750273b9167bdacd702 SHA512 5d851d212b4edc89addbed9058b4108c5a49e1859bc10bdeb9341b39ed0b6563da335a29c427d95d7609429aeb4beece6c16af1592c0b4026879ca7c9e101715
 MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2
diff --git a/net-misc/asterisk/asterisk-13.34.0.ebuild b/net-misc/asterisk/asterisk-13.34.0.ebuild
new file mode 100644
index 000000000000..2e439df81c98
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.34.0.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	pjproject? ( net-libs/pjproject )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+function menuselect() {
+	menuselect/menuselect "$@" || die "menuselect $* failed."
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISE_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect --disable chan_misdn menuselect.makeopts
+	menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect --enable smsq menuselect.makeopts
+	menuselect --enable streamplayer menuselect.makeopts
+	menuselect --enable aelparse menuselect.makeopts
+	menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect --enable func_aes menuselect.makeopts
+	menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa         chan_alsa
+	use_select bluetooth    chan_mobile
+	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster      res_corosync
+	use_select curl         func_curl res_config_curl res_curl
+	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds      {cdr,cel}_tds
+	use_select gtalk        chan_motif
+	use_select http         res_http_post
+	use_select iconv        func_iconv
+	use_select ilbc         codec_ilbc format_ilbc
+	use_select ldap         res_config_ldap
+	use_select lua          pbx_lua
+	use_select mysql        app_mysql cdr_mysql res_config_mysql
+	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup    app_osplookup
+	use_select oss          chan_oss
+	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	use_select radius       {cdr,cel}_radius
+	use_select snmp         res_snmp
+	use_select span         res_fax_spandsp
+	use_select speex        {codec,func}_speex
+	use_select srtp         res_srtp
+	use_select statsd       res_statsd res_{endpoint,chan}_stats
+	use_select syslog       cdr_syslog
+	use_select vorbis       format_ogg_vorbis
+	use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	for conffile in "${ED}/etc/asterisk/"*
+	do
+		fowners root:root "${conffile#${ED}}"
+		fperms 0644 "${conffile#${ED}}"
+	done
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.11.1.ebuild b/net-misc/asterisk/asterisk-16.11.1.ebuild
new file mode 100644
index 000000000000..70f8fcbc6f33
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.11.1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	pjproject? ( >=net-libs/pjproject-2.9 )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	unbound? ( net-dns/unbound )
+	vorbis? ( media-libs/libvorbis )
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+function menuselect() {
+	menuselect/menuselect "$@" || die "menuselect $* failed."
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISY_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect --disable chan_misdn menuselect.makeopts
+	menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect --enable smsq menuselect.makeopts
+	menuselect --enable streamplayer menuselect.makeopts
+	menuselect --enable aelparse menuselect.makeopts
+	menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect --enable func_aes menuselect.makeopts
+	menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa         chan_alsa
+	use_select bluetooth    chan_mobile
+	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster      res_corosync
+	use_select curl         func_curl res_config_curl res_curl
+	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds      {cdr,cel}_tds
+	use_select gtalk        chan_motif
+	use_select http         res_http_post
+	use_select iconv        func_iconv
+	use_select ilbc         codec_ilbc format_ilbc
+	use_select ldap         res_config_ldap
+	use_select lua          pbx_lua
+	use_select mysql        app_mysql cdr_mysql res_config_mysql
+	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup    app_osplookup
+	use_select oss          chan_oss
+	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	use_select radius       {cdr,cel}_radius
+	use_select snmp         res_snmp
+	use_select span         res_fax_spandsp
+	use_select speex        {codec,func}_speex
+	use_select srtp         res_srtp
+	use_select statsd       res_statsd res_{endpoint,chan}_stats
+	use_select syslog       cdr_syslog
+	use_select vorbis       format_ogg_vorbis
+	use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	for conffile in "${ED}/etc/asterisk/"*
+	do
+		fowners root:root "${conffile#${ED}}"
+		fperms 0644 "${conffile#${ED}}"
+	done
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 12532183898b..121422764a4a 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,3 +1,5 @@
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
+DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
 EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9
+EBUILD axel-2.17.9.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936
 MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce
diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.9.ebuild
new file mode 100644
index 000000000000..dad9472d9679
--- /dev/null
+++ b/net-misc/axel/axel-2.17.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug libressl nls ssl"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with Portage, one can configure make.conf with:'
+	einfo
+	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+}
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index e2cad1ef5c75..bc9d34e2f877 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,24 +1,6 @@
 AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
-DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
-DIST bird-1.6.5.tar.gz 1114984 BLAKE2B 15b2a432e467a8ce81acc4d3d5cf7dea865cf7d3a8c893ab348916fbf60104a5606a6cbc2fcd647c102f3177f0d04d2f046860da244f26a7357f321285f1e295 SHA512 a86c340f4acd9d90b5babe8f19dbd753b2ad94db2c92181bf969244c1d7b20aa825a0311c13a1e19b019019b91af7827775970fd39e807ab32da690492ce356e
-DIST bird-1.6.6.tar.gz 1029505 BLAKE2B 45cd621175962ea22848948e61aaf8b5c4eebbae5f5703bd71571defb2661d0aee646e93a1b42b8d93e6901d256a6e6d91d9bc4573bc01c31d9b359f5184dc5a SHA512 2419e487af2c8e75f613892ee1b1ada00085945bcafe17de972d3196f50a32321a6d18c9a3b58c0c58a5273f348a6d6de8b861505ad559269510a0ba69041fd9
-DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
-DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
-DIST bird-2.0.4.tar.gz 1051911 BLAKE2B 12100685e4aad969dbb51eaa567e1038f50e7c030a25a8697bc35d4f33d0f64f9ccbc045e1210acb78f3d8d4a7cc7ef2be7ae50a36679f2322d292e8e6993ed4 SHA512 65092ca6be115b4d0c31c3c4a79d3ee2e196dc2f85454448eab568cc9cc1fe37b7bdfe1ddb74d4f6f147dc479a8570cf7bf702d762cd69414f976678c14c8e2f
-DIST bird-2.0.5.tar.gz 1099509 BLAKE2B cc865db0a845c045b441b27d1cfba6865f711ee3a68f0000056b701ba5d0652478325d3797069785af912b5f955a24647837d818c269b299106acba4acabce4f SHA512 2da6f99c5e55915f8669a0dc3778357aedbb75cf06e0f672a5ddcc01a5b850aa4a1932957d2044f89f075cd437a74ba6c5da5a607225b391525aa48f43c47140
-DIST bird-2.0.6.tar.gz 1899912 BLAKE2B 068f740a01a327b5fecf10a8aaafecac218fd14536ea98c93980d7ef9426766be80c68202410aaa20012f7f3b1837173e51d83d0ce2fb1828029d54174065206 SHA512 22aa676e171cf5ddf6dedbf0dfe9bb36a959efdf9cb278b7e969d5b08b06fe483e3b30ef40c1f9980387ed6ac6ee6626f3d85704925256c22dae91fa7d23267d
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
-EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
-EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
-EBUILD bird-1.6.5.ebuild 1282 BLAKE2B 08adb25747149de95a2b3c806db82a199044cfe2eff8887dd1394700ba7c35d25a7ad48eb5d5129220618daddf1dba526948efa56962e970da452c48f7374b9f SHA512 daeb190612f574a628d99e3d2a28187c686c87fbf454aca050719c77624cc2dd04513d084257ab6e3282e7dd5006016fdbc1261e89780b4700fc8c41f8fab07d
-EBUILD bird-1.6.6.ebuild 1268 BLAKE2B 23639d0d57b4927dcdf805a9c8f31a4197649a2168aaeb8966436c176d1eb65d63118ab9871e2566e8427c0204831b1e23fc5a439d2cbadb9b8dfb51359e8008 SHA512 a815cee9c0f749cf0faa8cef0c516b7245bfccf32293d81ab7b23b30c91e9d788511b0c9c57e681dce44c44b8f83f21af2485ef2c22d50daab166b1754f7ff09
-EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
-EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
-EBUILD bird-2.0.4.ebuild 764 BLAKE2B 8478281f359226d4fcd8373829ef27f1c119b8380a90e95c08cfa6cead3adf43ae5e519ad9b80f4c438f95163c8380da02210e5faf0d6fc02809b582690969ad SHA512 575d8d2bca595e5e215c3bc3bdd957827cd8888c885ad7dd489ef823f455a740ef1d6769af8dc435d9f1f6fb074372f1c241360ad4098fdfb4ceccc58211d85c
-EBUILD bird-2.0.5.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
-EBUILD bird-2.0.6.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
 EBUILD bird-2.0.7.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3-r1.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
deleted file mode 100644
index 5b0b890c824c..000000000000
--- a/net-misc/bird/bird-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug ipv6"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable client) \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		if use client; then
-			newbin ipv6/birdc birdc6
-		fi
-		newbin ipv6/birdcl birdcl6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.4.ebuild b/net-misc/bird/bird-1.6.4.ebuild
deleted file mode 100644
index ebdf7de5c1f3..000000000000
--- a/net-misc/bird/bird-1.6.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug ipv6"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	eapply_user
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable client) \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		if use client; then
-			newbin ipv6/birdc birdc6
-		fi
-		newbin ipv6/birdcl birdcl6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.5.ebuild b/net-misc/bird/bird-1.6.5.ebuild
deleted file mode 100644
index f4ccc176494b..000000000000
--- a/net-misc/bird/bird-1.6.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug ipv6"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	eapply_user
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable client) \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		if use client; then
-			newbin ipv6/birdc birdc6
-		fi
-		newbin ipv6/birdcl birdcl6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.6.ebuild b/net-misc/bird/bird-1.6.6.ebuild
deleted file mode 100644
index db540658a184..000000000000
--- a/net-misc/bird/bird-1.6.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug ipv6"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	eapply_user
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable client) \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		if use client; then
-			newbin ipv6/birdc birdc6
-		fi
-		newbin ipv6/birdcl birdcl6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-${PN}-2" bird6
-	fi
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-2.0.2.ebuild b/net-misc/bird/bird-2.0.2.ebuild
deleted file mode 100644
index b5bd01fc5519..000000000000
--- a/net-misc/bird/bird-2.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-2.0.3.ebuild b/net-misc/bird/bird-2.0.3.ebuild
deleted file mode 100644
index 298936acd43d..000000000000
--- a/net-misc/bird/bird-2.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-2.0.4.ebuild b/net-misc/bird/bird-2.0.4.ebuild
deleted file mode 100644
index 152c1ad23c3c..000000000000
--- a/net-misc/bird/bird-2.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-2.0.5.ebuild b/net-misc/bird/bird-2.0.5.ebuild
deleted file mode 100644
index edc17f5b33c7..000000000000
--- a/net-misc/bird/bird-2.0.5.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
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-2.0.6.ebuild b/net-misc/bird/bird-2.0.6.ebuild
deleted file mode 100644
index edc17f5b33c7..000000000000
--- a/net-misc/bird/bird-2.0.6.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
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8e11a8351a2e..d432bf6f5ac7 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,7 +5,7 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
 DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
 DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
-EBUILD curl-7.68.0.ebuild 7600 BLAKE2B cc01e76a04b7023aa8aca65e65338279137fcf943ce474518fb807e9b4eaeecfb18022c39e8157a964168f73f07ab32c1e2553ad829ed5335f4f347506c45e45 SHA512 77bac8d7fd71c7f760ded2c96085e48c0f78b782cbde0b0449164e64c10ef527b2540ee7b8dc2dd3666560dd074fcf6b05d8d289798db3e12be2cf5b3a15f3a7
-EBUILD curl-7.69.1.ebuild 7689 BLAKE2B 6ebb15523c0c917566909676365e777b084deca51fc7b70c994c1b220ee14636db15b94f13b59c5a87e2d0db3e63c5cba70b86062fe67cf3969e8df8eaf857bb SHA512 634fbd2b51bec9d18b71233cbd13c1483713063442d73442749b7bc9ebee914b9abb0810d2291e9e14c969da3bcc575f9d00699ddc27b073b9a6ad37aba7813e
-EBUILD curl-7.70.0-r1.ebuild 7761 BLAKE2B 00d1cb77817f4410c555d5892e3f32da58735ec42efa33ef1c2bf60fddb6a2c9f4e716f89bcc53f53f29ea6f549854f890cb5a7f7cc8bd6c95efd3230ec4f7e0 SHA512 42933f751419d2bad72e06aadea7948824cf2d2139647316d63077199d96ee98192182cda097a4f855319fc2f93523548745870c18faf4b59a925b7678fb0c7a
+EBUILD curl-7.68.0.ebuild 7574 BLAKE2B a63f7bd7c6a27f2c67824d2cd2e742bf6d53f2fb004ab7ea6e4aaf0034bb97a5a59a605c133cd3c27ce84114bdc715c873706f757428a8f3ade59516dea1b882 SHA512 a59e3f0ad00bf9becf08fb624e0f634f6bac617b8ba88f751e2a2a78422eb54f294149db7a1cb9fbd25554637335c01c9467d1774a26b9571d413f90a620e491
+EBUILD curl-7.69.1.ebuild 7663 BLAKE2B c3d98ec0d1f9d40d1173cec9f4a8e6198e5da809fe52fe83db75ba3ec68f0f2ca0812fcc90d29004bdcdf874136ac139a130f913899553d5912392b541f612a9 SHA512 c6f542f18802aaf42ac0ca33477f239587bc20afd9462bf931444ee79a8773e0b1fc1cc8ce503157433d6d45f0600b104fd0a0b200de2ffcbd462dc6d2cd784b
+EBUILD curl-7.70.0-r1.ebuild 7735 BLAKE2B 8bb2413f7fead1501f7146b06c0aa15e6c610c1e731c3ffc59d0a8b979b24cbc491d32087315aa0dfa178701a2a8eaee116d41fdbdd321bcee5c6c62e8ad5a0a SHA512 40c3dd6c2e168de6e596fa6e5177cef48be547fa5e76772a46fbbd076b68ddcaca0c9f8c2d1981ad528c900a3624d80dfa87dc077d84c773f21b35a57b568b9b
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild
index 3f2075b469f5..0141a4e0a48d 100644
--- a/net-misc/curl/curl-7.68.0.ebuild
+++ b/net-misc/curl/curl-7.68.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.haxx.se/"
 SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
-LICENSE="MIT"
+LICENSE="curl"
 SLOT="0"
 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"
 IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
@@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 # fbopenssl  $(use_with spnego)
 
 DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="virtual/pkgconfig
 	test? (
 		sys-apps/diffutils
 		dev-lang/perl
diff --git a/net-misc/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.69.1.ebuild
index cdec6acd02b4..c787559e0302 100644
--- a/net-misc/curl/curl-7.69.1.ebuild
+++ b/net-misc/curl/curl-7.69.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.haxx.se/"
 SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
-LICENSE="MIT"
+LICENSE="curl"
 SLOT="0"
 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"
 IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
@@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 # fbopenssl  $(use_with spnego)
 
 DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="virtual/pkgconfig
 	test? (
 		sys-apps/diffutils
 		dev-lang/perl
diff --git a/net-misc/curl/curl-7.70.0-r1.ebuild b/net-misc/curl/curl-7.70.0-r1.ebuild
index 7b751a4ef1c8..d10edbee2152 100644
--- a/net-misc/curl/curl-7.70.0-r1.ebuild
+++ b/net-misc/curl/curl-7.70.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.haxx.se/"
 SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
-LICENSE="MIT"
+LICENSE="curl"
 SLOT="0"
 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"
 IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
@@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 # fbopenssl  $(use_with spnego)
 
 DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="virtual/pkgconfig
 	test? (
 		sys-apps/diffutils
 		dev-lang/perl
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index abfb06109624..3cf6d803c79d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,13 +1,11 @@
-AUX dhcpcd-9.1.1-embedded_config.patch 1158 BLAKE2B 4bd6cee24848296b526b0430bd8cd528d80f9bf4a2658bc6385ba1b1b8731f50416211c09f2f7317662e12cec50ecc82dc900eefed4fc637891dac71204ac786 SHA512 21c6ef0a27d252e224d23202a161c37a2851af9b47b9a0d7bd739111b4ee231080c0c9a1cd23cff1dd479d82fbe53d41a45941d0a9ddd6aa833f90856d9db595
+AUX dhcpcd-9.1.2-embedded_config.patch 1607 BLAKE2B 04b6b55c60d5a57e3a06983f3324eca1ada0b732cbacc1f24eb237815d7e7906e8a856ddf8f1de949f9ad83164862ccdecee1a8d1e945688f1d658c124db5c84 SHA512 95a15299a58d8b9cf7f4162218815d7c418b8445958760ade60d7863d90a009c4a53aa64ea4651fc5dceff3a9719b7c94bdbbed955cf21bdae56897c3db0e4a2
 AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.0.2.tar.xz 244800 BLAKE2B d0c355141aa1e57715c30b2902eed7e2821f2c08fdc97497c9dc271689faf2ca22e3f50f17e6c7ae8fe4434d5c216572a42e1abf789287495e6db44f671d5085 SHA512 2a606bff2e96d1da5d3642ac68341c14b378d9a905cba364ab42eba1285604f8be56b9efeff3eee18d89b71f0f9f3b05cb7b88e8fce568baf1c0d1e5d3becb5f
-DIST dhcpcd-9.1.1.tar.xz 246084 BLAKE2B 35acaabb32e6a5b227071376e8a0387cadb776ee94a8b7f92c181440ef72bf60e9867e901347a139e4ce036c85913fa85e61d3c401c8a9f57e81dff76465ccab SHA512 7b1eb052293218e9b52f7ff40768eaa9db832979ffa8e4ba4724ce98bac9e9c809505b40aaebd4cf13192d0b30f2e963d34ca3b9c1e05458e86e11d06e1cbed8
+DIST dhcpcd-9.1.2.tar.xz 248552 BLAKE2B b7330da009bc0b906593b60db6af20a75ad49d21e1852514bad7bc6034246df8080372f2c4ffcdbbb0cd9122b2f48614159a1b0f2629584e8b2d2ed0f366ee2b SHA512 0db9a509dbd8ea8e24bf4a45780433107708d0ea42b28cd63b9828f55e0182670286f5cb678d96d7f626d8a6e404693f7f43e62ac5608d5f61b5e80de4afb965
 EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
-EBUILD dhcpcd-9.0.2-r1.ebuild 5336 BLAKE2B 57dec388e06fd7a3ac298cf8a89170921f361cd3373b0366e3db2e518d4691ebfcd1fa97fab108b06f5c807a994e0b410f20b4b4965f41e5dae2744cc55d978c SHA512 f1ee8587337dde8fb94d32cd65b34db15e797c16b58cfe0ec3cdb2c1336a706572669831150df09965ce0b226daa49b1bdfd92074b7469f80a915e4e8458e2a2
-EBUILD dhcpcd-9.1.1-r1.ebuild 4668 BLAKE2B d51930d0db7ab398025e2d045f9d787953a51c6a1a0489c98ec42f2cb79505b7ab9d7caf233bb0216ed2f9d7115ff0dba8bea40a22af699b3ab52c7aba8c7621 SHA512 8ca49168fcf9557c9531f067fbd77b52db13b2cae315effccb9a8be96dc9ec546cff36b3d2ddbaedd6f377be3545cd54cfeb00a71d3ffd5916ea78ad7f7ede1c
+EBUILD dhcpcd-9.1.2.ebuild 4668 BLAKE2B d51930d0db7ab398025e2d045f9d787953a51c6a1a0489c98ec42f2cb79505b7ab9d7caf233bb0216ed2f9d7115ff0dba8bea40a22af699b3ab52c7aba8c7621 SHA512 8ca49168fcf9557c9531f067fbd77b52db13b2cae315effccb9a8be96dc9ec546cff36b3d2ddbaedd6f377be3545cd54cfeb00a71d3ffd5916ea78ad7f7ede1c
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 MISC metadata.xml 661 BLAKE2B 079dd7ae7da62777750cda972982faec3a7040018c57a40b33874b20bbfcdf60a00487f38daaba2fcf10c2325c6d582d70983f5bb6fca64f309eaa81c615de93 SHA512 3b2db0737e02439895ee5d7fc06b9344c64282d4014ef1f7cc8ce19f93e8744aa929f85fba8f04c0a865f477a5066dfa083b568546665e870137c2989999e5e0
diff --git a/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild
deleted file mode 100644
index ac18c5907ad8..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# dhcpcd-9 introduced privesep support in a chroot
-	if use privsep ; then
-		local dhcpcd_libdir="/var/lib/dhcpcd"
-		local chroot_base="${EROOT}/var/chroot/dhcpcd"
-		local chroot_dir="${chroot_base}${dhcpcd_libdir}"
-		local chroot_retval=0
-		# Set up proper chroot.
-		if [[ ! -e "${chroot_dir}" ]] ; then
-			mkdir -p "${chroot_dir}" || chroot_retval=1
-			cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
-			chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
-		elif [[ ! -d "${chroot_dir}" ]] ; then
-			ewarn "${chroot_dir} is not a directory!"
-			ewarn "Did not set up ${PN} chroot!"
-		fi
-		if [[ "${chroot_retval}" -ne 0 ]] ; then
-			ewarn "There were issues setting up ${PN} chroot."
-		fi
-	fi
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.1.2.ebuild
index 0942b0cd0435..0942b0cd0435 100644
--- a/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.1.2.ebuild
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch
deleted file mode 100644
index 10e8520116f5..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fa1cd0004e0d3267a1217ada46e53df38824da2d Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Thu, 4 Jun 2020 21:49:37 +0100
-Subject: Fix installing the embedded config as a file.
-
----
- src/if-options.c   | 4 ++--
- src/privsep-root.c | 4 ++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/if-options.c b/src/if-options.c
-index 212e71d8..3dde04bf 100644
---- a/src/if-options.c
-+++ b/src/if-options.c
-@@ -2366,8 +2366,8 @@ read_config(struct dhcpcd_ctx *ctx,
- 			return ifo;
- 		}
- 		if (buf[buflen - 1] != '\0') {
--			if (buflen < sizeof(buf) - 1)
--				bulen++;
-+			if ((size_t)buflen < sizeof(buf) - 1)
-+				buflen++;
- 			buf[buflen - 1] = '\0';
- 		}
- #else
-diff --git a/src/privsep-root.c b/src/privsep-root.c
-index fdf43856..512dfcc0 100644
---- a/src/privsep-root.c
-+++ b/src/privsep-root.c
-@@ -297,6 +297,10 @@ ps_root_validpath(const struct dhcpcd_ctx *ctx, uint16_t cmd, const char *path)
- 		return false;
- 
- 	if (cmd == PS_READFILE) {
-+#ifdef EMBEDDED_CONFIG
-+		if (strcmp(ctx->cffile, EMBEDDED_CONFIG) == 0)
-+			return true;
-+#endif
- 		if (strcmp(ctx->cffile, path) == 0)
- 			return true;
- 	}
--- 
-cgit v1.2.3
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch
new file mode 100644
index 000000000000..5401317a2ece
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch
@@ -0,0 +1,49 @@
+From 9dc6d4b7c8df8425c9b1e893e86b8463abb2053c Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 15 Jun 2020 22:04:37 +0100
+Subject: configure: Fix fallout with disabling embedded config
+
+---
+ configure | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/configure b/configure
+index 8398ad69..a3701726 100755
+--- a/configure
++++ b/configure
+@@ -545,15 +545,6 @@ if [ -z "$AUTH" -o "$AUTH" = yes ]; then
+ 	echo "SRCS+=		auth.c" >>$CONFIG_MK
+ fi
+ 
+-if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
+-	echo "$DHCPCD_DEFS will be embedded in dhcpcd itself"
+-	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
+-else
+-	echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR"
+-	echo "CPPFLAGS+=	-DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
+-	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
+-fi
+-
+ if [ -z "$PRIVSEP" ]; then
+ 	# privilege separation works fine .... except on Solaris
+ 	case "$OS" in
+@@ -665,6 +656,16 @@ EOF
+         rm -f _pledge.c _pledge
+ fi
+ 
++# This block needs to be after the compiler test due to embedded quotes.
++if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then
++	echo "$DHCPCD_DEFS will be embedded in dhcpcd itself"
++	echo "DHCPCD_SRCS+=	dhcpcd-embedded.c" >>$CONFIG_MK
++else
++	echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR"
++	echo "CPPFLAGS+=	-DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK
++	echo "EMBEDDEDINSTALL=	_embeddedinstall" >>$CONFIG_MK
++fi
++
+ if [ "$OS" = linux ]; then
+ 	printf "Testing for nl80211 ... "
+ 	cat <<EOF >_nl80211.c
+-- 
+cgit v1.2.3
+
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 5ce240ea8f48..42774c821834 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -5,6 +5,6 @@ DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b
 DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc
 DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735
 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
-EBUILD efax-0.9a-r4.ebuild 996 BLAKE2B 5bd0f32c0096a9b35dbb553feae83062ab678cc86ed1b0c6b8c3847f4dc4b337aef076d9ae3cae7e96cd066f2f2d6c4cfe4448f5a76d4f2ab27796b3e487fbff SHA512 94cf53bdd74571ee69ff2486cf180a4e1fee46cef3dbd281ffc02b69c5f2787f84bd8cbf398864253d831d6b9fd34d0a8ec8cabe536265ca7ccad05f74f93e19
-EBUILD efax-0.9a_p19_p1.ebuild 1243 BLAKE2B e658e3f5a592f53796ae3279a5e35ece6825cbff80c51cbc6260db68c71e7258c8963cd65aac266134f4e89a6338ed45b87f6ffa4e7a548125c041fc0e1a3500 SHA512 789732760a0c6fed1b09391f6afbd0bd45c4f1691386897daac8a35c6283ee86eb6b443c9486d1bf28eb26917d6dd82844d2f802cd56d06c351f15036a338f64
+EBUILD efax-0.9a-r4.ebuild 999 BLAKE2B a877183b0f65ef3c92d58c464caf046b55880b146c610c34bcfa9cf43f4551ce7188b8681e0ce26e060ba9a9f8c93bae3d0d2e60d0db8cd979e534d1b844594f SHA512 5a8fe1b68505af8798fd785704f26b6a73d261591b08298bf6adfaf2da2dd6bd6ce4c944b2090ce95227c746c50e443c32399ff6b349dde16cd24feac5bedb74
+EBUILD efax-0.9a_p19_p1.ebuild 1245 BLAKE2B 5dc8bddd77555c3b94ef88dce2bded1c90109abf2ec51a022de1d419398003680e87fba6547bb11b02f5a18594fe99366d6e61c69199ef4ee5c9f6509b3ffc1c SHA512 866efb0d92baf2e94e00881e07a6799f7202d54ecc24ba92bef69e3e2c39fc7ebbd3beddf62504eab8990a990a6d43551c631f347f216972fade8ae8f406362e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild
index ef730ef1ec3e..ae3fd4c5975e 100644
--- a/net-misc/efax/efax-0.9a-r4.ebuild
+++ b/net-misc/efax/efax-0.9a-r4.ebuild
@@ -8,8 +8,8 @@ inherit eutils toolchain-funcs
 S="${WORKDIR}/${P}-001114"
 
 DESCRIPTION="A simple fax program for single-user systems"
-HOMEPAGE="http://www.cce.com/efax"
-SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz
+HOMEPAGE="https://www.cce.com/efax/"
+SRC_URI="https://www.cce.com/efax/download/${P}-001114.tar.gz
 	mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz"
 
 KEYWORDS="amd64 ppc x86"
diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild
index 2bcfd9441501..7e3a909cb4f2 100644
--- a/net-misc/efax/efax-0.9a_p19_p1.ebuild
+++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A simple fax program for single-user systems"
-HOMEPAGE="http://www.cce.com/efax"
+HOMEPAGE="https://www.cce.com/efax/"
 SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff.gz
diff --git a/net-misc/getdate/Manifest b/net-misc/getdate/Manifest
index 838a3f6537c5..5f405b776ca6 100644
--- a/net-misc/getdate/Manifest
+++ b/net-misc/getdate/Manifest
@@ -1,5 +1,4 @@
 AUX getdate-glibc-2.31.patch 403 BLAKE2B 7fb09ee4c4f6e610c7fadabc5739ede341d037e4c54288603ff351df9dae6105292b47768e6674fc921a67e753d833ce97d29aaafd2f49dba46c6e1d6d98d0a3 SHA512 6602d57061cc9116b7d7a4c649b8829a1b968378167a384e06adfa57661836617d63bfa27af060a84cddcf28be5ea7fa9e9ac085ed233dc123277fa74e671df7
 DIST getdate_rfc868-1.2.tar.gz 8323 BLAKE2B 03b9a9c0dd656fbb45785792484cfbce6e1f403f238a841bfc144401ad0deee257d88dcd214d617be2fd1ed0289e5ec63f0509effd51bd94b61be924b5f31836 SHA512 f4ce167e42f2ef54cb961923f15d8101c5d047659991b0f3859a0282d024b0e0273517b94b663a90f8d6af1d3e4acf46b96b17d39cd6b2f3ee25bc89995b1404
-EBUILD getdate-1.2-r1.ebuild 747 BLAKE2B 2485cf11fd9fb09a7955bce9d9b8c1e6d47673bf12e9bdabfcf27065e670373b4083b14b932f3f53ecbc9b7c9988c0c7c77ac1149da7f93e0f47e32ef3cc2d15 SHA512 b565d91d623326b4e5f2223d837b79176adbeda6ff174952766203501a766355eeaa6787e792c38700b0f37b54d1ba66e37ebdf57f7dca6296b93a977242b5f4
 EBUILD getdate-1.2-r2.ebuild 805 BLAKE2B 6fddec9e9ab9cd795343a53c88b5d9959dd796f5e804699aa37d9edad8811c2a0da98ba8e45eca65e356c5ed713078ce7b2b879467239fefc8be02f01ae1f4f4 SHA512 03558000ece9b7698bb5e5be37e5cee00ac5d12e6b17339f3ce1081406e540b90d3cd87601bcf465830b9f3004757dd187b8a2a67924f7a07d73694c804d296b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/getdate/getdate-1.2-r1.ebuild b/net-misc/getdate/getdate-1.2-r1.ebuild
deleted file mode 100644
index d05e5f442fe2..000000000000
--- a/net-misc/getdate/getdate-1.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_PN="${PN}_rfc868"
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Network Date/Time Query and Set Local Date/Time Utility"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/network/misc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz"
-
-LICENSE="GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "/errno.h/ a\#include <string.h>" getdate.c || die
-	# Respect CFLAGS
-	sed -i -e "/CFLAGS/d" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin getdate
-	doman getdate.8
-	dodoc README getdate-cron
-}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index c791ac41daaa..8f18d5b5c39a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -12,7 +12,7 @@ EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b8
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
-EBUILD iperf-3.7.ebuild 985 BLAKE2B 98d50eb4b100aef861017fe6cce8ff3513598095941e139df5d0f7fd7c59b5425cce4906e0d946b8ee6cba36214b827fde3f95dd4032cb55ac47a9a2c1d9eba3 SHA512 40ce051b5e9fa0f94245e9ac41da13d6f953d499158df675d042e3b5a0b994d6c7321caeaacafd40877982b30f825eb7c17d931764a106ff4d1d572bddb9b571
-EBUILD iperf-3.8.1.ebuild 975 BLAKE2B 9179c5b3879ca15b110dfbafd9f3bd308abd1362c891c5afa494dbd55805be513c98a23ccd390ed7161a99f071ae44013e87a1daa8db7a91d9b89bf4ee18eb8a SHA512 2aaf7b025a881a58f72b1903fb53998cb9f1b890276d6ef980c20b437d44f9ce65018af456c41cb49f032f92b101eac8e3562bd2ef04c352802d14843e9b57a3
-EBUILD iperf-3.99999.99999.ebuild 831 BLAKE2B 14b3ad32e35b19fd52f3f4dd31d09e4de30300d200a46e3e32edbfac2ed70a0c93ef2270483327583d61bbb456b61ea73f34c0307c3435c2168f9c442ff24c2d SHA512 aa529bc4e36feff38054349e61338d1152bbfa379ca0eea9d77f8b339ce53ab5c93e10ced57ffc40d1515c95b87532f7548434468c56e5a059a5a873c176b1de
-MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
+EBUILD iperf-3.7.ebuild 947 BLAKE2B f292caa6b05da89f13a0465ce03a04158cd94cb626607bb62dd119af16f9ba08bf714acd1f91a948c857aa66e5f21023bcac1fef8d635171f5393ec407d6f068 SHA512 1bece2a1ce119fa2b2bf9c34f1093f61b233726539bc885c6d078a0ed2641cb009b7a521bbad0eeb958e11bc569249efb0adfce8db2af7cb6cbfa833ec4f64ea
+EBUILD iperf-3.8.1.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
+EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
+MISC metadata.xml 455 BLAKE2B 63c2a5eb313e525820e470ca060751f9f7486147d30b59fc135cfbc1235814df004b1d0cb741842ce2380ff69e938d0105ef5a37a794c1b523b246a0c75e2613 SHA512 36ebc27e7e4b2a3577a4c532b19d0b1e61a3261a59510453689772d568972796b32acafc161f9dc8483602105ea804fbb43e9a445fd44e7869278c19cba42b93
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 1f4e52a28f0c..d4df9907c185 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -24,7 +24,6 @@ S=${WORKDIR}/${P/_/}
 src_configure() {
 	use sctp || export ac_cv_header_netinet_sctp_h=no
 	econf \
-		$(use_enable profiling) \
 		$(use_enable static-libs static)
 }
 
diff --git a/net-misc/iperf/iperf-3.8.1.ebuild b/net-misc/iperf/iperf-3.8.1.ebuild
index cb655f6b4782..eaf20a65cee9 100644
--- a/net-misc/iperf/iperf-3.8.1.ebuild
+++ b/net-misc/iperf/iperf-3.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -25,7 +25,6 @@ DOCS="README.md RELNOTES.md"
 
 src_configure() {
 	econf \
-		$(use_enable profiling) \
 		$(use_enable static-libs static) \
 		$(use_with sctp)
 }
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index f50078047e0e..14dfc1e065cd 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3 ltprune
+EAPI=7
+inherit autotools git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
@@ -11,26 +11,28 @@ EGIT_REPO_URI="https://github.com/esnet/iperf/"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS=""
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 S=${WORKDIR}/${P/_/}
+DOCS="README.md RELNOTES.md"
 
 src_configure() {
-	use sctp || export ac_cv_header_netinet_sctp_h=no
 	econf \
-		$(use_enable profiling) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(use_with sctp)
 }
 
 src_install() {
 	default
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 6941792a1185..a18ccf22423a 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -10,7 +10,4 @@
 <remote-id type="github">esnet/iperf</remote-id>
 <remote-id type="sourceforge">iperf</remote-id>
 </upstream>
-<use>
-<flag name='profiling'>Install profiled iperf3 binary iperf3_profile</flag>
-</use>
 </pkgmetadata>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 1aa7772e85c5..317288a418f2 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,3 +1,4 @@
+AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
 DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
@@ -5,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 EBUILD ipv6calc-1.0.0.ebuild 1545 BLAKE2B 20604959eec3564329c9deb173fd37d8a624ed474d5aec35efcf76dc9cb3f191eb7e70379ea942981b5cb9813bd19563cf8bd04cd307ef5e16d30bc535907f0a SHA512 4d0b6115980f57558cc2b44db4d71cdb97289e61fe80e19b7bbab07e302177af4c63b43a82c002beb41131614592595ee23b7d9ab13eb984485a8cf1e67d0f27
 EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9
 EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
-EBUILD ipv6calc-2.2.0.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
+EBUILD ipv6calc-2.2.0.ebuild 1637 BLAKE2B c3cde0645cf2d7421767aa48073e2d894cd8fa1434ec44108e0a80dbb19e0d856e9cc20b2a3d196ad687669f3f98aa0317482aa2f6b4b0c541c7bb0a3f3f10e1 SHA512 0a4e972d25b69772527e0c1450967a323ab0669a1589c6b62f3958c5df88f6a60b1f7bd45ca45b10bb5a5e22cbc92e236737d06b252fc172d49fcd6280f2133a
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
new file mode 100644
index 000000000000..4639fa7406f1
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/708056
+
+From 8c7eea58f2034113ae91ff7adc2bda72465b7d1a Mon Sep 17 00:00:00 2001
+From: Peter Bieringer <pb@bieringer.de>
+Date: Fri, 24 Jan 2020 07:15:55 +0100
+Subject: [PATCH] ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of
+ 'cache_lru_limit'
+
+--- a/ipv6logconv/ipv6logconv.c
++++ b/ipv6logconv/ipv6logconv.c
+@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype);
+ /* LRU cache */
+ 
+ #define CACHE_LRU_SIZE 200
+-
++int cache_lru_limit;
+ static int      cache_lru_max = 0;
+ static int      cache_lru_last = 0;
+ static char     cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST];
+--- a/ipv6logconv/ipv6logconv.h
++++ b/ipv6logconv/ipv6logconv.h
+@@ -20,8 +20,7 @@
+ #define DEBUG_ipv6logconv_general      0x00000001l
+ #define DEBUG_ipv6logconv_processing   0x00000002l
+ 
+-/* prototyping */
+-int cache_lru_limit;
++extern int cache_lru_limit;
+ 
+ extern int feature_reg;
+ extern int feature_ieee;
+-- 
+2.27.0
+
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
index 65630c1080ec..e08d33c2a5b3 100644
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.2.0.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 RESTRICT="!test? ( test )"
 
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-perl/Digest-SHA1 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 #dev-perl/URI is needed for web interface, that is not installed now
 
 src_configure() {
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index e6d5c1b55a02..30ac06b85181 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,19 +1,17 @@
 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
 AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
-DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
 DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0408097ce5cdf0d3074c1096d30c8eec9926cad6dab31d3b2f26e16ae06173ee25554a8f901632bfde27270a70d3 SHA512 9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
-DIST kafka_2.12-2.1.0.tgz 55201623 BLAKE2B 3c0b0ce65b65dc005fe4e0e8a3c03d9047e9028fcbcdb840bcddbbabf59d02589057c250073836f779f335523e701f2c4c48d50e3580e5168fb5be1ad730ea83 SHA512 05a07e928c439b1084a6b3f6835f067f9636ac47f9473dcaaf7040d339cbd0a4561b7478531b237aa69e27f50fe3a2e7f4d0f2ba99a6422592a89ecf1187fa25
 DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10
-DIST kafka_2.12-2.2.0.tgz 57028557 BLAKE2B d71a84a308961fc78ad51c9831ef3a45f95380f143df2c961ea79603ba7c2471d0b0ae15853df86904d90dfc82cd2d2a52c03371391f534a4bf10bcd05d314ba SHA512 63fdcd05b857a096d2e72804253590bd086e4f3046fbfa546f186602e48f54712ed6de2a346a5b05d5335870bf5268fcb2bfd3ef9c4f4bbea379091a79604556
 DIST kafka_2.12-2.2.1.tgz 57054917 BLAKE2B fb69ef12f7480b8b47e511cc9325b622dc1fcc6a265bacfdf1ac03d34ad8f5a3b3242c41386214519423bce1e18d8a90f2e7034e26681fe637c823d0a73f69bb SHA512 b8d828f06dfe59e34c4cfa20c57c8c8b43374f1e7c09f12dfa5433534a380bfe09a6de90fb86a4403939a87ab9c665e2369143c138c71391b01bbb9b384e7ac5
 DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f67abca24547d680d08213c10e0de126bf39f790ae16e704446811e9d25d78ed940cf3ae07fff8e2045cd05a89f1 SHA512 a5ed591ab304a1f16f7fd64183871e38aabf814a2c1ca86bb3d064c83e85a6463d3c55f4d707a29fc3d7994dd7ba1f790b5a6219c6dffdf472afd99cee37892e
 DIST kafka_2.12-2.4.0.tgz 62283588 BLAKE2B 3492f7a5be9941a75aa5896be0e25974b46887a66e391395a813844bae2f5f57062b636852cdb7aa3650fb4017f9d462a3b95b2166b8a0be62f403c44826b675 SHA512 53b52f86ea56c9fac62046524f03f75665a089ea2dae554aefe3a3d2694f2da88b5ba8725d8be55f198ba80695443559ed9de7c0b2a2817f7a6141008ff79f49
-EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+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
 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
-EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
-EBUILD kafka-bin-2.2.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.2.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.3.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 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
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild
deleted file mode 100644
index e285fe9e87d6..000000000000
--- a/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://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"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-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
-}
-
-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/kafka-bin/kafka-bin-2.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild
index 0f799f94c22c..4c7d84184e1f 100644
--- a/net-misc/kafka-bin/kafka-bin-2.1.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user
+inherit eutils
 
 DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
+HOMEPAGE="https://kafka.apache.org/"
 
 # pick recommended scala version
 SCALA_VERSION=2.12
@@ -21,17 +21,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
+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}"
 
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
 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
diff --git a/net-misc/kafka-bin/kafka-bin-2.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild
index 0f799f94c22c..4c7d84184e1f 100644
--- a/net-misc/kafka-bin/kafka-bin-2.2.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user
+inherit eutils
 
 DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
+HOMEPAGE="https://kafka.apache.org/"
 
 # pick recommended scala version
 SCALA_VERSION=2.12
@@ -21,17 +21,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
+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}"
 
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
 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
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 039cda7c5b54..6194799c21c0 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,3 +1,3 @@
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-2.0.ebuild 762 BLAKE2B 4aae3a869826fc311459f7bb2aeda456c6ab3cb09378842361b85f8e98a7915550451c4d9efd67f1fe751b6e78cee5fd99e13731b4e7b175cb99cb4e5ee8d964 SHA512 85bb3b3f52ca6744b33fa4e04d0e5bf96698c90bf2bc442edca4e11ac6741437f68e3d34019acfc5cc927a674bf0b2afcd4c96c03ab27f7f0204cf09a44cd5d0
+EBUILD linuxptp-2.0.ebuild 882 BLAKE2B 41e6f6c8999e290e3c574582cca7254c728a75496935d5458e3eb3b69a2c0f3237068bb587ac7289ffa429fa08cb223fed457eff3996506b84771b5d0e852cdc SHA512 16dab620bf44d59006907dfa41be1db8032af0e541008979e54d73e8ed659da65efe460f5a54445511a41953e1ff671315f129c10d661738884f7ddc74dfacf9
 MISC metadata.xml 445 BLAKE2B abfb043154cd84cb3a40212f54d9be67e89bfda3f83cdb9a8d65d8032b8d1f0a0b8dcfb4fdbaa5ed303dfa65f35715ee714a84026b730c26964a1e06a41b32e2 SHA512 6016bb962e61088156d9f2b78d8dfc0f4b07e6a22016d7d591459b8254ef42798c902a2cdfe183972703d3c1911ab48d7b3c95a0bc1b470a4dcc1a34ea66d232
diff --git a/net-misc/linuxptp/linuxptp-2.0.ebuild b/net-misc/linuxptp/linuxptp-2.0.ebuild
index 716fbf22a46d..3569ecc3c668 100644
--- a/net-misc/linuxptp/linuxptp-2.0.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0.ebuild
@@ -19,8 +19,14 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
 
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
 src_compile() {
-	export EXTRA_CFLAGS=${CFLAGS}
+	# parse needed additional CFLAGS
+	export MY_FLAGS=$(./incdefs.sh)
+	export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}"
 	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
 }
 
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 692a04756ce7..ff1bffc9db0e 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -14,5 +14,5 @@ DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04
 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
 EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff
 EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663
-EBUILD lldpd-1.0.5-r1.ebuild 2357 BLAKE2B 04b7ba279eb7904e470c98bbe3febfeaa9884a2e1f9cc1ed2f7688e6705cafb9e6d5d0bff3418f0b840e787a6134ab8a07b75c003c5aa567575064856b78f525 SHA512 fe4706dcaccc0f84651d9492ff1ede2e47101548c34f4f7dc780bd6a4e952534342a4fc2c77f2c400037705df6eb490a9548ac76466841db56e17225d37805e0
+EBUILD lldpd-1.0.5-r1.ebuild 2356 BLAKE2B c54530cc9ae48dde1b11f426e9dae87149fa4c783b309c9ab52a16c02024595a6527ac898663ea3d73271fe6132232f8b8c510ebcc03cb9b6c397c555dc85da6 SHA512 46f7d387f267e781764096f58f5020c84c2b4231f25b184d8eedfeb2d5a54609d08ebe07885fde505f506c9e44de5eca6e0943fc5c00f4ebfdf1ee1d220b04d1
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index 1223cf5d1a01..78bc6d770a65 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/4.8.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 834429a9ee51..2c7546e4c4d0 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -12,10 +12,10 @@ DIST NetworkManager-1.20.12.tar.xz 4663320 BLAKE2B c0faab91a50ee38d6c884dd4f753d
 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
 DIST NetworkManager-1.22.14.tar.xz 4771180 BLAKE2B d0133c2de2fd8a7932be7699bcef7e8e32083e6f908de0eaa3875a862329a1a302245d66dbba8a90a691245897b7a943a35785da21f394a7cf2659eb9cceb866 SHA512 81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453
 DIST NetworkManager-1.24.2.tar.xz 4848624 BLAKE2B f8030159d6f645c3015cfb9cf41ffbf30f052592e04c27a2a378e6d7c0ac86f521a5147229b84e68adb7835ebac8b8ad094977f0783b3fa794149190d809a098 SHA512 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923
-EBUILD networkmanager-1.18.4-r3.ebuild 11451 BLAKE2B a40e6bf41b7fe4c2eeeb2bf37c04e3a49bd9b7cc98c742e4632d094d232130a89a3009bd560ec860e3cf63b080dc0e8acb9d2e63989161eb3a0bf8c4a95109a5 SHA512 1aaa83f0540d0445cd22a5de38da6d9f93b12a99797bfe053143e17ab64994cff063f590144e9eede46a7e32b7ebef6bc0c24a15522e8f305960a539d9592933
-EBUILD networkmanager-1.18.6.ebuild 11452 BLAKE2B afb89ff877dfa2717c243bb60300be725ecdb516da3644e1cb84f97861b399c3519e1ecf34031bc13b2675815b15099de15e434f6bd977ddc559403e3c0e5b43 SHA512 f587d21cc707389294f157da3bf35cb4811162ed5cb737200ae6a919ce82a88620ce2f4e90f9f45e5e925c66ec6e1d5946dc788658bd1315999a03d542fb6ef7
-EBUILD networkmanager-1.20.12.ebuild 11108 BLAKE2B 2ba77fc23bc2d3bb8170c506624bcc496d8235093a834d87303b0280bb4df634dd590cc4ad99fbd0caf1874176c88b0cccf965a39139d8f4367cdfee43b25b46 SHA512 7044f843cc607a0f54855b16d924ff7f0a6d74821bfe61c6df73aa3904707937285edf3d188a12b0615553d58e827e9e57765a99a0018a140843d5d649fc2c34
+EBUILD networkmanager-1.18.4-r3.ebuild 11431 BLAKE2B 76cb824cea61c07fb21a59dc8bee989eddcaf2ad289a899d8aa5c3a865331dc5298f5e3ca92caf1e32cb081f3ab83138df56066b8ef0ac0708cf63998e002295 SHA512 a791b582b8f90aeb845f2f04052ac24ef11a5dfc6427205a76255a625e6a26cb00ac87e0b5bd5b5fb20e44259417ccd6a039a0f97cd1989b922f1f369eb609e0
+EBUILD networkmanager-1.18.6.ebuild 11432 BLAKE2B 2ef7ce19c9cd88dc3164ac651d766bbbb7fbbe2175e58fcf4eabd613cfe8cf1457678cddf0d2383fa021824e83a55d0d44734294933d95f86487b8883a8fd3f2 SHA512 852ccdbdd1c6c46ec6301f97b3108d202c1eeed3827a4cec9098a3c6d91eabb26b43f591d6bc7d2c3bbc746433efb5ba7416fe9623a5606e62fd19e317f6e323
+EBUILD networkmanager-1.20.12.ebuild 11088 BLAKE2B 0dbdfd04968daad96115958bc1340fb16dec34ec8f43f0d51acee7ecd46c310b0e041130318420d5436c78134d88f13594b5201adf710c66fc5a3a4e6318e680 SHA512 c07598b70aad185a490a179f5e92b80c62af536a77dbcde44a9506d034ae0c48d4b2a4dc115a66778dfe92650605aac353ff764389f3709d642b3053744c139d
 EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4
-EBUILD networkmanager-1.22.14.ebuild 11223 BLAKE2B 0b05a6131305a5b3b1df3104560b287f225a2e9b97ff915ec016bc39ca2c599877669b0b921350436383e3fca09a08e6f5ff7fc07f184ae45caa7fdbcc4e0be1 SHA512 28aa546fd5fc8c66f6e0aa82fa7732bfe9a76c10eb21ac13075817239c665f3a5cf51cfbad34135545def115f70d52f8f0b55dfb6903eff28694d4f5564ce493
-EBUILD networkmanager-1.24.2.ebuild 11168 BLAKE2B 8e8bad3ae67356aa17677eec8eac20edfc5858b4ad87dd41e65b06d3ae1efacc6ea4d1920a982a2ad73a7de42428714f774c0041ecc20432ae770e5f7a4a9714 SHA512 b8c334e7e05aa268c16a2d0e41ec423521c6daca7ad94392a8657c1a901dbd31dd25d42d169772f1f1941297bcc5f4f211d480be0462a4f590a1f4a27c942fb2
+EBUILD networkmanager-1.22.14.ebuild 11203 BLAKE2B d1a13257f060d03c6ff000777b0b04e422511e2c5c9f4ebf31ad49932b9b3fd47e3ece8850541c21cb70c2091381e130914a6660ebd815535122e6d864e54beb SHA512 7302dcc4bebee3787879cbb1bd6580e883d79d93e3e54a929106dd0ec4e607f9e957730db21e6851d2ef28726d636f47c12d2f52f44e1823cc20923e4c04a4fe
+EBUILD networkmanager-1.24.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
 MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
index 05cb34606ead..453af4ab92ad 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
@@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 		dev-lang/perl
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
index 0a6bc3c37e28..070ae215d272 100644
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
@@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 		dev-lang/perl
diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
index 1a1c31156f67..81c6f70ed900 100644
--- a/net-misc/networkmanager/networkmanager-1.20.12.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
@@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 		dev-lang/perl
diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.22.14.ebuild
index 7a59df42aa19..c7d5376f75d7 100644
--- a/net-misc/networkmanager/networkmanager-1.22.14.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.22.14.ebuild
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 		dev-lang/perl
diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
index 0082e77dbf99..91ce0e3aeda7 100644
--- a/net-misc/networkmanager/networkmanager-1.24.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 		dev-lang/perl
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 2cb1838f3cbe..c5b0860b87a2 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -8,12 +8,8 @@ AUX ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch 854 BLAKE2B d
 AUX ntpsec-1.1.8-fix-asciidoc-version-detect.patch 14369 BLAKE2B 5f2152463b0a551202f07b535bcd14ef8a94a599643ab5e6dedf481eacc97ba7f8e7491ead10473b2988b07cef41a65c6c3612b564a155df4a01fb6df7bdb0db SHA512 b171e5b0f3f493db6a2d10b0e9ecacf3cd8b6ed49f363d431c8d4a5fc3314acdbc4c82882967f4ef72193c6e3851a3aed5d667820175f75e43b413a277f31a19
 AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
-DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
-EBUILD ntpsec-1.1.4.ebuild 4106 BLAKE2B acd5647b4bee47d39408bf0a4864aef548c72ca49cdeb37acb043a3e922b01585eed53b27a98cabe4c8042812015076a74a5d182d18925090967d0b928855efa SHA512 0ff66468930664032e1380058b0fa5dc1dd52112b585ba0e1ce467864795046687291eb8b2a22e1047ca2caa0cffe4ad4da21edad988257eacdf3ba1c43a97fe
-EBUILD ntpsec-1.1.6.ebuild 4064 BLAKE2B 965b62889053c25f2aacbc47c3fc046f042a0d222b199f59bf03f245b6dee5f647eaf294c391a4b711a3e404d1111800033bb1216ac77c5554057e0adf35124d SHA512 4c2f6dfaff5ba632e78ae80d9476a107894cdfb33ab7b8608fddd7de06f077baa9ea14f713119d30078920e53f08435a1d623ee787c2c6bdbc85c7477b7d4253
 EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13
 EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702
 EBUILD ntpsec-9999.ebuild 4069 BLAKE2B 4ba68e1c227e7baf2b3a9305dae9eb756333bc863ec10a0f0c7b98c91327f6e0727e4cd510ef63f36d93971a004f2cf7e46fde753928456e38eb92d4856b767a SHA512 c9be282b8b99060c6f9ca84c3a07e692b99c0e278e5f6848403f911b1830212f1a67ccb8b1ffe024d9a37efa24e8f1da7fc31271fcdc9415b8799d9845eb1b03
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
deleted file mode 100644
index 7af091fcc99f..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ /dev/null
@@ -1,160 +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='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libbsd? ( dev-libs/libbsd:0= )
-	dev-libs/openssl:0=
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	if ! use libbsd ; then
-		epatch "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
deleted file mode 100644
index 4b8a3d2699be..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ /dev/null
@@ -1,159 +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='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libbsd? ( dev-libs/libbsd:0= )
-	dev-libs/openssl:0=
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	if ! use libbsd ; then
-		epatch "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 259b6b39ee4e..9b0de8e4563e 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,7 +1,9 @@
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
 DIST nx-libs-3.5.99.23.tar.gz 11073366 BLAKE2B 0e06e9c90f73a0264d8363ee3f75914ada884f469d9ba15b062675625a9922be5ec963eb7611484ef2abea83a100e58b05e6421da67d8b5c5f840737e6b37321 SHA512 b627d521f7a3c43c9c000f770bd1e228842099e794cda32b37df621ac86c650990bdc69810b7ff6117cbd60f0339dda93d1e2acdcfac03ddaa50407d71668b60
+DIST nx-libs-3.5.99.24.tar.gz 11059384 BLAKE2B 79879991c2c0127e43975d42a27159594e3be29b2e358576da4bdc17ef1dc0c27a31c85b12a8c55638abb99db9f7f1fad4f4d8794c01e1327a5cb68558073fc0 SHA512 755f9065da69f0057a7284eb80f214cd272c6753f32ddaa17b4258c6ccba77c8fec82eafaea87bd3e055610dc798cb141d8e947900ad3bad34c681df664df3b2
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
 EBUILD nx-3.5.99.23.ebuild 3392 BLAKE2B 676f533494f67fe8285db1d5a4ddd715c58ae7ce78d4cf7e4bc63d330709735c1d814426cdf80303a6420686deed5be75d3d82b2d0fc65fc4e9b04052207890a SHA512 a4020facae074b7f123c165e2009d4c1b7dcf3e33c2b1917dbfd80fc5d210c0cc93886158cfc4fb8153752a9e368910bfb750eab4a43b182581c9b4645a8aa56
+EBUILD nx-3.5.99.24.ebuild 3263 BLAKE2B 586b19ad301450226ad97666e6f8f3f07cd060f8778c1437c863876af725e29811910508345300b400cb4513861295f0f09b81fc5768f2d3452e968f2b3b3b05 SHA512 0372380455f94e9aa723c00793836b47671c6d184afd640a7a39120d6de2df54c9b0fd80577a426a460d24bd7e21541d5cab7b43b7d6c70d9113d85748776364
 MISC metadata.xml 431 BLAKE2B 0c5df628b0e1167d246de69dd43a789efd3a19257cac3c77a6e63c787e3b33df11fb46d3ee400148ed224f8c1f3a46a0a717c6945cbb5a75dbaf7db090f87d88 SHA512 919a691eca3818bbec94ce6864333f073e41808ed0e897677ec66321812998cde78cfefd6ad344b350633f315a64288476a209d9029fa4b35873d2a1f49934a2
diff --git a/net-misc/nx/nx-3.5.99.24.ebuild b/net-misc/nx/nx-3.5.99.24.ebuild
new file mode 100644
index 000000000000..f910dec05f09
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.24.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
+
+SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXfont2
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pixman"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+S="${WORKDIR}/nx-libs-${PV}"
+
+src_prepare() {
+	default
+
+	# We want predictable behavior. So let's assume we never
+	# have quilt installed.
+	sed 's@which quilt@false@' -i mesa-quilt || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
+
+	# run autoreconf in all needed folders
+	local subdir
+	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		eautoreconf
+		popd || die
+	done
+}
+
+src_configure() {
+	# From xorg-x11-6.9.0-r3.ebuild
+	pushd nx-X11 || die
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	# Disable SunRPC, #370767
+	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+	popd || die
+
+	local subdir
+	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		econf
+		popd || die
+	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
+}
+
+src_compile() {
+	# First set up the build environment
+	emake build-env
+
+	# We replicate the "build-full" make target here because
+	# we cannot call "make build-full" as it
+	#  - calls autoreconf several times
+	#  - invokes make directly but we prefer our emake
+
+	emake -C nxcomp
+	emake -C nx-X11/lib
+
+	mkdir -p nx-X11/exports/lib/ || die
+	local nxlib
+	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+	done
+
+	emake -C nxcompshad
+
+	./mesa-quilt push -a || die
+
+	emake -C nx-X11 BuildDependsOnly
+	# Parallel make issue resurfaced, upstream working on autotools switch
+	emake -j1 -C nx-X11 World \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="/usr/$(get_libdir)"
+
+	emake -C nxproxy
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="/usr/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		install
+
+	# Already provided by mesa & related packages
+	rm -r "${ED}"/usr/include/GL || die
+
+	# Get rid of libtool files and static libs.
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
new file mode 100644
index 000000000000..21f6cac5c3a1
--- /dev/null
+++ b/net-misc/oidc-agent/Manifest
@@ -0,0 +1,7 @@
+AUX oidc-agent-3.3.1_desktop-category.patch 270 BLAKE2B ab841626749f19ecfb6f27d79224a2954633e623f306d66698d6f2d9a53047a29411c12bf572d76e273315a8d99b0f2b664604e6b0aa60efe43f74ff68261d60 SHA512 249d1a50da20e4bc37eb1c8d894bd87dc7f165b85af340ee862c72a926db521819796540fe95bb58c8494c2c8bc13ffd1c8a864ec455b81f878e9cc079872cdb
+AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d496cb71a26efbd8529c67c631eeb153472c60f83a96d46e12bd263d3582c8a5c4f4bbd9841a37b3d5e750f7b24c5a205d8b6aa63 SHA512 94631b5c13d9d41dd9377740e4559f65175e6f6438d2cd108a7d3e445005443791b18cd2926e2e925a4774e6d51d1288f665461c12cc390ee60300c192972d3b
+AUX oidc-agent-3.3.1_makefile-toolchain-vars.patch 722 BLAKE2B b2e00b8b5ef2e70df4878228bc5e690e764052cb34bd8d0db74fc34374e7da4a2924ea3b1d0e422204da2e27a0bbe0baf3b8f1ff683f9b1be2df87ec2efbfc28 SHA512 04975fa76b56b998bdaf9dd1f9f2586a3df5690a318cd7741f3c542f2d9b5dc675e446770de53fb36cce0348d8f57d07618375384dcf11b8712a0608e48c3818
+AUX oidc-agent-3.3.1_test-suite-buffer-overflows.patch 1526 BLAKE2B ec623853da106f60a58814181c80786bea8ec8c02bafbcf7d1ac840723ddbf77aaf810ea5b06a62aaa4268aafd3c6c5a821d25eeb656e66393012c6b338afa18 SHA512 a9f4f50eaff99e077ac3cd1290ba45e59f6a538694919f87b3c2467b498a95fac76b84f875f92d9575516d5581cd2dfbcc9602c978ac2fd591d8dc8aabb7499f
+DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
+EBUILD oidc-agent-3.3.1.ebuild 1407 BLAKE2B e2cc4ea9c139189da68f908ed87209cb34458cbe188c5acaab5a0de8c4d3def90118ad96fb3438a52abdfc61da98ea248219f943cb8d1702593077b7d3e39a8c SHA512 35ffd6d176f5a6c9c9471e5c226cfe107edfd17b8a64cc6a7f7f9875b2e8c050c8215c1471e41feba49078f560d77f311fe84b654c8ba995f9d19384098bfca5
+MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
new file mode 100644
index 000000000000..49bfcfdb70b3
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
@@ -0,0 +1,9 @@
+--- a/config/scheme_handler/oidc-gen.desktop
++++ b/config/scheme_handler/oidc-gen.desktop
+@@ -5,5 +5,5 @@
+ Icon=utilities-terminal
+ Terminal=true
+ Type=Application
+-Categories=Application;Network;
++Categories=Network;
+ MimeType=x-scheme-handler/edu.kit.data.oidc-agent;
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
new file mode 100644
index 000000000000..1992ee0ef31f
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
@@ -0,0 +1,58 @@
+--- a/Makefile
++++ b/Makefile
+@@ -316,7 +316,7 @@
+ 
+ ## Bash completion
+ $(BASH_COMPLETION_PATH)/$(AGENT): $(CONFDIR)/bash-completion/oidc-agent $(BASH_COMPLETION_PATH)
+-	@install -m 744 $< $@
++	@install -m 644 $< $@
+ 
+ $(BASH_COMPLETION_PATH)/$(GEN): $(BASH_COMPLETION_PATH)
+ 	@ln -s $(AGENT) $@
+@@ -332,15 +332,15 @@
+ 
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ 
+ ## Lib
+@@ -354,20 +354,20 @@
+ 	@ln -sf $(SHARED_LIB_NAME_SO) $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+-	@install -D $< $@
++	@install -m 644 -D $< $@
+ 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
+ 
+ ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
new file mode 100644
index 000000000000..0cdf44fba8c2
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
@@ -0,0 +1,30 @@
+1. Support user-provided values of CC, CFLAGS and LDFLAGS
+2. Do not force the use of a static version of libsodium
+
+--- a/Makefile
++++ b/Makefile
+@@ -54,20 +54,20 @@
+ endif
+ 
+ # Compiler options
+-CC       = gcc
++CC       := $(CC)
+ # compiling flags here
+-CFLAGS   = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra
++CFLAGS   := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra
+ ifndef MAC_OS
+ 	CFLAGS += $(shell pkg-config --cflags libsecret-1)
+ endif
+ TEST_CFLAGS = $(CFLAGS) -I.
+ 
+ # Linker options
+-LINKER   = gcc
++LINKER   := $(CC)
+ ifdef MAC_OS
+ LFLAGS   = -lsodium -largp
+ else
+-LFLAGS   = -l:libsodium.a -lseccomp
++LFLAGS   := $(LDFLAGS) -lsodium -lseccomp
+ endif
+ ifdef HAS_CJSON
+ 	LFLAGS += -lcjson
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
new file mode 100644
index 000000000000..b43f20c06860
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
@@ -0,0 +1,51 @@
+--- a/test/src/utils/stringUtils/tc_strelim.c
++++ b/test/src/utils/stringUtils/tc_strelim.c
+@@ -7,7 +7,7 @@
+ 
+ START_TEST(test_noFound) {
+   const char* const str = "abcdeffedcba";
+-  char              s[strlen(str)];
++  char              s[strlen(str) + 1];
+   strcpy(s, str);
+   ck_assert_str_eq(strelim(s, 'x'), str);
+ }
+--- a/test/src/utils/stringUtils/tc_strelimIfAfter.c
++++ b/test/src/utils/stringUtils/tc_strelimIfAfter.c
+@@ -7,7 +7,7 @@
+ 
+ START_TEST(test_noElim) {
+   const char* const str = "abcdeffedcba";
+-  char              s[strlen(str)];
++  char              s[strlen(str) + 1];
+   strcpy(s, str);
+   ck_assert_str_eq(strelimIfAfter(s, 'b', 'x'), str);
+ }
+@@ -15,7 +15,7 @@
+ 
+ START_TEST(test_noFound) {
+   const char* const str = "abcdeffedcba";
+-  char              s[strlen(str)];
++  char              s[strlen(str) + 1];
+   strcpy(s, str);
+   ck_assert_str_eq(strelimIfAfter(s, 'x', 'a'), str);
+ }
+--- a/test/src/utils/stringUtils/tc_strelimIfFollowed.c
++++ b/test/src/utils/stringUtils/tc_strelimIfFollowed.c
+@@ -7,7 +7,7 @@
+ 
+ START_TEST(test_noElim) {
+   const char* const str = "abcdeffedcba";
+-  char              s[strlen(str)];
++  char              s[strlen(str) + 1];
+   strcpy(s, str);
+   ck_assert_str_eq(strelimIfFollowed(s, 'b', 'x'), str);
+ }
+@@ -15,7 +15,7 @@
+ 
+ START_TEST(test_noFound) {
+   const char* const str = "abcdeffedcba";
+-  char              s[strlen(str)];
++  char              s[strlen(str) + 1];
+   strcpy(s, str);
+   ck_assert_str_eq(strelimIfFollowed(s, 'x', 'a'), str);
+ }
diff --git a/net-misc/oidc-agent/metadata.xml b/net-misc/oidc-agent/metadata.xml
new file mode 100644
index 000000000000..befedd639221
--- /dev/null
+++ b/net-misc/oidc-agent/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		oidc-agent is a set of tools to manage OpenID Connect tokens and make them
+		easily usable from the command line. We followed the ssh-agent design, so users
+		can handle OIDC tokens in a similar way as they do with ssh keys.
+		oidc-agent is usually started in the beginning of an X-session or a login
+		session. Through use of environment variables the agent can be located and
+		used to handle OIDC tokens.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">indigo-dc/oidc-agent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
new file mode 100644
index 000000000000..12161b8e9044
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/libsodium
+	net-libs/libmicrohttpd"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
+	"${FILESDIR}"/${PN}-3.3.1_install-perms.patch
+	"${FILESDIR}"/${PN}-3.3.1_makefile-toolchain-vars.patch
+	"${FILESDIR}"/${PN}-3.3.1_test-suite-buffer-overflows.patch
+)
+
+src_compile() {
+	# Parallel building doesn't work
+	emake -j1
+}
+
+src_install() {
+	emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+	elog "You should use oidc-gen to initially generate your account configuration"
+	elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+	elog "consult the man page of oidc-gen, or full documentation at"
+	elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index aecdd0b25fd5..c7a189f85f05 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -10,7 +10,6 @@ AUX openssh-8.1_p1-X509-12.3-tests.patch 405 BLAKE2B 1a1c29fea98c4ce277c94370957
 AUX openssh-8.1_p1-X509-glue-12.3.patch 1613 BLAKE2B aef1de72da18a2af0fae1793eed5baa1be2af9f26a522e6772f43f1053d263f154db76cf0ebe3ddebbfd9798ffb334100ce5eb3894ad3095b1cd48d1ef5b9839 SHA512 e533175bcabd1ddbb50c6cc605cba0190d2cde24149d5451a807cdc05847fa95a2b72188bc23866876e8ec88073df8039e0e85e703560e90f53a92df6f616572
 AUX openssh-8.1_p1-hpn-14.20-glue.patch 3534 BLAKE2B 13206d78b0e344d4d90aad3f9aa4396cbe270f1004108f52e1b23fc4b106e01f94bdc6e198a42c0bfc9d885408caea890e72f2bd58df893f94dea4452ab11c00 SHA512 ab589f6d9eada3313b87e8e35aa4e3946cd057412336914c90f6266dafb997062f7b8be4ac475e66a8df896f9fb3004f0df6a4f69dc85c468bcb1f4778326f96
 AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c66350ce3e943cd5f1280b5294099320cbc4a611de2a23f5a5c04ed71a394e1bd23a0928df50d754f549d652e53389ceadda2ac9f1636 SHA512 96fa9a317d9cc0a77bf5a8d82d8fa0498fff04309bc4ae546b34939580c4ed945d075f26d8ea16e787d7bf631ea5067543f380ab08167993d713ec1591a346b9
-AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c
 AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290
 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4
 AUX openssh-8.2_p1-X509-12.4.2-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a
@@ -25,10 +24,7 @@ AUX openssh-8.3_p1-X509-glue-12.5.1.patch 1721 BLAKE2B c67e6ce756d8febea9066ca52
 AUX openssh-8.3_p1-hpn-14.20-glue.patch 6059 BLAKE2B 454178571fbf051fad6edff93c87d96f4fa62c687b03666a27e912e29c9f11d375935d0f830edff779ff73f0de16831bc54d2a7e747ff5e3951933b25f39b452 SHA512 0791c0936b4e316715e691b3ac0fa6dd03495fc30ddb68ba15a73c2f8aafb3892df5fa3c29d91e16d956f9aa3c9fd66ded8ad744834788f2fad08b807efe0a5b
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
-AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
-AUX sshd.initd 2735 BLAKE2B c3fd3b653676b0e628d58939a55e0ff5cfdd177af18a9ef2d53dcb1717ce478ecb654da398752ee4fef0f6225416fd4fa5cfa6e83d7e977086744616d291dcd3 SHA512 9c3e908c79674bb070e99491dc587c1e6404b1e2eec711dc27cd54510ff68217c83e7ac6fcf7b89f62ba5393ff3e417774fd6d105422464203544e8fbc91c6bb
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
-AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1
 AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch
deleted file mode 100644
index 0ad814f95d87..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Only in b: .openssh-7_8_P1-hpn-AES-CTR-14.16.diff.un~
-Only in b: .openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.un~
-diff -ru a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff
---- a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-10-10 13:48:31.513603947 -0700
-+++ b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-10-10 13:50:15.012495676 -0700
-@@ -17,8 +17,8 @@
-  	canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
- -	cipher-ctr.o cleanup.o \
- +	cipher-ctr.o cleanup.o cipher-ctr-mt.o \
-- 	compat.o crc32.o fatal.o hostfile.o \
-- 	log.o match.o moduli.o nchan.o packet.o opacket.o \
-+ 	compat.o fatal.o hostfile.o \
-+ 	log.o match.o moduli.o nchan.o packet.o \
-  	readpass.o ttymodes.o xmalloc.o addrmatch.o \
- diff --git a/cipher-ctr-mt.c b/cipher-ctr-mt.c
- new file mode 100644
-@@ -998,7 +998,7 @@
- +		 * so we repoint the define to the multithreaded evp. To start the threads we
- +		 * then force a rekey
- +		 */
--+		const void *cc = ssh_packet_get_send_context(active_state);
-++		const void *cc = ssh_packet_get_send_context(ssh);
- +		
- +		/* only do this for the ctr cipher. otherwise gcm mode breaks. Don't know why though */
- +		if (strstr(cipher_ctx_name(cc), "ctr")) {
-@@ -1028,7 +1028,7 @@
- +		 * so we repoint the define to the multithreaded evp. To start the threads we
- +		 * then force a rekey
- +		 */
--+		const void *cc = ssh_packet_get_send_context(active_state);
-++		const void *cc = ssh_packet_get_send_context(ssh);
- +		
- +		/* only rekey if necessary. If we don't do this gcm mode cipher breaks */
- +		if (strstr(cipher_ctx_name(cc), "ctr")) {
-diff -ru a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff
---- a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-10-10 13:47:54.801642144 -0700
-+++ b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-10-10 15:58:05.085803333 -0700
-@@ -162,24 +162,24 @@
-  }
-  
- +static int
--+channel_tcpwinsz(void)
-++channel_tcpwinsz(struct ssh *ssh)
- +{
- +	u_int32_t tcpwinsz = 0;
- +	socklen_t optsz = sizeof(tcpwinsz);
- +	int ret = -1;
- +
- +	/* if we aren't on a socket return 128KB */
--+	if (!packet_connection_is_on_socket())
-++	if (!ssh_packet_connection_is_on_socket(ssh))
- +		return 128 * 1024;
- +
--+	ret = getsockopt(packet_get_connection_in(),
-++	ret = getsockopt(ssh_packet_get_connection_in(ssh),
- +			 SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz);
- +	/* return no more than SSHBUF_SIZE_MAX (currently 256MB) */
- +	if ((ret == 0) && tcpwinsz > SSHBUF_SIZE_MAX)
- +		tcpwinsz = SSHBUF_SIZE_MAX;
- +
- +	debug2("tcpwinsz: tcp connection %d, Receive window: %d",
--+	       packet_get_connection_in(), tcpwinsz);
-++	       ssh_packet_get_connection_in(ssh), tcpwinsz);
- +	return tcpwinsz;
- +}
- +
-@@ -191,7 +191,7 @@
-  	    c->local_window < c->local_window_max/2) &&
-  	    c->local_consumed > 0) {
- +		u_int addition = 0;
--+		u_int32_t tcpwinsz = channel_tcpwinsz();
-++		u_int32_t tcpwinsz = channel_tcpwinsz(ssh);
- +		/* adjust max window size if we are in a dynamic environment */
- +		if (c->dynamic_window && (tcpwinsz > c->local_window_max)) {
- +			/* grow the window somewhat aggressively to maintain pressure */
-@@ -409,18 +409,10 @@
- index dcf35e6..da4ced0 100644
- --- a/packet.c
- +++ b/packet.c
--@@ -920,6 +920,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -920,6 +920,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-  	return 0;
-  }
-  
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+	rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -434,20 +426,6 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -946,6 +964,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- 		return 0;
-- 
--+	/* used to force rekeying when called for by the none
--+         * cipher switch methods -cjr */
--+        if (rekey_requested == 1) {
--+                rekey_requested = 0;
--+                return 1;
--+        }
--+
-- 	/* Time-based rekeying */
-- 	if (state->rekey_interval != 0 &&
-- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- diff --git a/packet.h b/packet.h
- index 170203c..f4d9df2 100644
- --- a/packet.h
-@@ -476,9 +454,9 @@
-  /* Format of the configuration file:
-  
- @@ -166,6 +167,8 @@ typedef enum {
-- 	oHashKnownHosts,
-  	oTunnel, oTunnelDevice,
-  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
-+ 	oDisableMTAES,
- +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- +	oNoneEnabled, oNoneSwitch,
-  	oVisualHostKey,
-@@ -615,9 +593,9 @@
-  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
-  	SyslogFacility log_facility;	/* Facility for system logging. */
- @@ -111,7 +115,10 @@ typedef struct {
-- 
-  	int	enable_ssh_keysign;
-  	int64_t rekey_limit;
-+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
- +	int     none_switch;    /* Use none cipher */
- +	int     none_enabled;   /* Allow none to be used */
-  	int	rekey_interval;
-@@ -633,7 +611,7 @@
-  	off_t i, statbytes;
-  	size_t amt, nr;
-  	int fd = -1, haderr, indx;
---	char *last, *name, buf[2048], encname[PATH_MAX];
-+-	char *last, *name, buf[PATH_MAX + 128], encname[PATH_MAX];
- +	char *last, *name, buf[16384], encname[PATH_MAX];
-  	int len;
-  
-@@ -673,9 +651,9 @@
-  	/* Portable-specific options */
-  	if (options->use_pam == -1)
- @@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options)
-- 	}
-- 	if (options->permit_tun == -1)
-  		options->permit_tun = SSH_TUNMODE_NO;
-+ 	if (options->disable_multithreaded == -1)
-+ 		options->disable_multithreaded = 0;
- +	if (options->none_enabled == -1)
- +		options->none_enabled = 0;
- +	if (options->hpn_disabled == -1)
-@@ -1092,7 +1070,7 @@
-  	xxx_host = host;
-  	xxx_hostaddr = hostaddr;
-  
--@@ -412,6 +423,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
-+@@ -412,6 +423,27 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
-  
-  	if (!authctxt.success)
-  		fatal("Authentication failed.");
-@@ -1108,7 +1086,7 @@
- +			memcpy(&myproposal, &myproposal_default, sizeof(myproposal));
- +			myproposal[PROPOSAL_ENC_ALGS_STOC] = "none";
- +			myproposal[PROPOSAL_ENC_ALGS_CTOS] = "none";
--+			kex_prop2buf(active_state->kex->my, myproposal);
-++			kex_prop2buf(ssh->kex->my, myproposal);
- +			packet_request_rekeying();
- +			fprintf(stderr, "WARNING: ENABLED NONE CIPHER\n");
- +		} else {
-@@ -1117,23 +1095,13 @@
- +			fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n");
- +		}
- +	}
--+
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-  
-+ #ifdef WITH_OPENSSL
-+ 	if (options.disable_multithreaded == 0) {
- diff --git a/sshd.c b/sshd.c
- index a738c3a..b32dbe0 100644
- --- a/sshd.c
- +++ b/sshd.c
--@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
-- 	char remote_version[256];	/* Must be at least as big as buf. */
-- 
-- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-- 	    *options.version_addendum == '\0' ? "" : " ",
-- 	    options.version_addendum);
-- 
- @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la)
-  	int ret, listen_sock;
-  	struct addrinfo *ai;
-@@ -1217,11 +1185,10 @@
- index f1bbf00..21a70c2 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,6 @@
-+@@ -3,4 +3,5 @@
-  #define SSH_VERSION	"OpenSSH_7.8"
-  
-  #define SSH_PORTABLE	"p1"
- -#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn14v16"
- +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
- + 
diff --git a/net-misc/openssh/files/sshd.confd b/net-misc/openssh/files/sshd.confd
deleted file mode 100644
index 28952b4a285a..000000000000
--- a/net-misc/openssh/files/sshd.confd
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/conf.d/sshd: config file for /etc/init.d/sshd
-
-# Where is your sshd_config file stored?
-
-SSHD_CONFDIR="/etc/ssh"
-
-
-# Any random options you want to pass to sshd.
-# See the sshd(8) manpage for more info.
-
-SSHD_OPTS=""
-
-
-# Pid file to use (needs to be absolute path).
-
-#SSHD_PIDFILE="/var/run/sshd.pid"
-
-
-# Path to the sshd binary (needs to be absolute path).
-
-#SSHD_BINARY="/usr/sbin/sshd"
diff --git a/net-misc/openssh/files/sshd.initd b/net-misc/openssh/files/sshd.initd
deleted file mode 100644
index c5df4693dbe3..000000000000
--- a/net-misc/openssh/files/sshd.initd
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh}
-: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config}
-: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid}
-: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd}
-: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen}
-
-command="${SSHD_BINARY}"
-pidfile="${SSHD_PIDFILE}"
-command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}"
-
-# Wait one second (length chosen arbitrarily) to see if sshd actually
-# creates a PID file, or if it crashes for some reason like not being
-# able to bind to the address in ListenAddress (bug 617596).
-: ${SSHD_SSD_OPTS:=--wait 1000}
-start_stop_daemon_args="${SSHD_SSD_OPTS}"
-
-depend() {
-	# Entropy can be used by ssh-keygen, among other things, but
-	# is not strictly required (bug 470020).
-	use logger dns entropy
-	if [ "${rc_need+set}" = "set" ] ; then
-		: # Do nothing, the user has explicitly set rc_need
-	else
-		local x warn_addr
-		for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
-			case "${x}" in
-				0.0.0.0|0.0.0.0:*) ;;
-				::|\[::\]*) ;;
-				*) warn_addr="${warn_addr} ${x}" ;;
-			esac
-		done
-		if [ -n "${warn_addr}" ] ; then
-			need net
-			ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
-			ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd"
-			ewarn "where FOO is the interface(s) providing the following address(es):"
-			ewarn "${warn_addr}"
-		fi
-	fi
-}
-
-checkconfig() {
-	checkpath --mode 0755 --directory "${RC_PREFIX%/}/var/empty"
-
-	if [ ! -e "${SSHD_CONFIG}" ] ; then
-		eerror "You need an ${SSHD_CONFIG} file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	${SSHD_KEYGEN_BINARY} -A || return 2
-
-	"${command}" -t ${command_args} || return 3
-}
-
-start_pre() {
-	# If this isn't a restart, make sure that the user's config isn't
-	# busted before we try to start the daemon (this will produce
-	# better error messages than if we just try to start it blindly).
-	#
-	# If, on the other hand, this *is* a restart, then the stop_pre
-	# action will have ensured that the config is usable and we don't
-	# need to do that again.
-	if [ "${RC_CMD}" != "restart" ] ; then
-		checkconfig || return $?
-	fi
-}
-
-stop_pre() {
-	# If this is a restart, check to make sure the user's config
-	# isn't busted before we stop the running daemon.
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return $?
-	fi
-}
-
-reload() {
-	checkconfig || return $?
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
deleted file mode 100644
index 5e301420361f..000000000000
--- a/net-misc/openssh/files/sshd.rc6.4
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-: ${SSHD_CONFDIR:=/etc/ssh}
-: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config}
-: ${SSHD_PIDFILE:=/var/run/${SVCNAME}.pid}
-: ${SSHD_BINARY:=/usr/sbin/sshd}
-
-depend() {
-	use logger dns
-	if [ "${rc_need+set}" = "set" ] ; then
-		: # Do nothing, the user has explicitly set rc_need
-	else
-		local x warn_addr
-		for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
-			case "${x}" in
-				0.0.0.0|0.0.0.0:*) ;;
-				::|\[::\]*) ;;
-				*) warn_addr="${warn_addr} ${x}" ;;
-			esac
-		done
-		if [ -n "${warn_addr}" ] ; then
-			need net
-			ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
-			ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd"
-			ewarn "where FOO is the interface(s) providing the following address(es):"
-			ewarn "${warn_addr}"
-		fi
-	fi
-}
-
-checkconfig() {
-	if [ ! -d /var/empty ] ; then
-		mkdir -p /var/empty || return 1
-	fi
-
-	if [ ! -e "${SSHD_CONFIG}" ] ; then
-		eerror "You need an ${SSHD_CONFIG} file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	ssh-keygen -A || return 1
-
-	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
-	[ "${SSHD_CONFIG}" != "/etc/ssh/sshd_config" ] \
-		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFIG}"
-
-	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" \
-	    -- ${SSHD_OPTS}
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
-	    --pidfile "${SSHD_PIDFILE}" --quiet
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP \
-	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
-	eend $?
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 39a501bceb1d..9b5ebd7b7ab4 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,8 @@
+AUX owncloud-client-2.6.3.14058-qt515.patch 470 BLAKE2B 70a1edb2a2ddd277ac9faf759715a5f7c956e4557d96ad30be8f02beb598ec8f87d6b42f8f5c90f4dbc60d86c022af0a63ed7d3fca44b7cef90955423b42e7ec SHA512 78eb25459347a56dd2bc8e4f7a359402cbd0359c9b5137f39939b0dd396f276d6c13663f3ac380055a0137558f5899527b23391242c1a89dadc6f92fd2f5b7f8
 DIST owncloudclient-2.6.0.13018.tar.xz 17311396 BLAKE2B b0c76b2fea51ca9e71f918ada2b99ce20b9b62494c41608e804c4ca0c8aafe59897fea31d28bed1ec61feefca4b4b6e783c6fa777ea56524e7c18d1a460ab954 SHA512 b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046
 DIST owncloudclient-2.6.1.13407.tar.xz 17317284 BLAKE2B b88bfc987aca036b6269e094cee5b91a3516db7b899df4cfde4961ba6eb3bb24329de103b154f0a21e5778997659cfb9b53be2f88affe03251aa9c747276d517 SHA512 40e0b607ac6cd5437682cd40e125404472c5ad63520e1dde19729760c0b7612451b3a34ede74e988d8fd09a6fae7d17a3dd6c5b0cfa6563dab7245e5f67c52bf
+DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B 15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c SHA512 e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3
 EBUILD owncloud-client-2.6.0.13018.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
 EBUILD owncloud-client-2.6.1.13407-r1.ebuild 1828 BLAKE2B b58064a7d7aea0fd070d1807e088bcce962acd628b9b9af8cea4eeb8f011824d82a639c8b25650210e23695c3cd2942c519f95e68ae0603e6a29a64024442afb SHA512 c3e07a9973d05adb0413185a2b68bc34fa1844df0a458850d05bee15540e1cab7bbd825703ca31676e94efc81dc947f1c3ee1b75df2daee6ee65ed007ba6dbbb
+EBUILD owncloud-client-2.6.3.14058.ebuild 1872 BLAKE2B 554174a400aaeb6437ae60011b1ed0cb52a1a8c82bfd0d5dc2b797147d38e029e89d993b68514e3fe3d77cba535bb92625f67729be04a950f5ed9a5d5822a1d1 SHA512 975b7ccf846042d4b32f67760cc409b43ca86d053adbac42d780373374c3eaa4488c3adb1ccd86741dc7fcb0794e2332214c0abbecddf0f142850a1dcdc3fd05
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
new file mode 100644
index 000000000000..57dd20938fc0
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch
@@ -0,0 +1,11 @@
+diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp
+--- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp	2020-06-12 14:35:04.000000000 +0200
++++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp	2020-06-13 11:18:28.822842347 +0200
+@@ -31,6 +31,7 @@
+ #include <QJsonObject>
+ #ifndef TOKEN_AUTH_ONLY
+ #include <QPainter>
++#include <QPainterPath>
+ #endif
+ 
+ #include "networkjobs.h"
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild b/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
new file mode 100644
index 000000000000..d7df80536b71
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${P/-}
+
+PATCHES=( "${FILESDIR}"/${P}-qt515.patch )
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	xdg_pkg_postinst
+}
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 256ed2b847d0..93c7eccda049 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,8 @@
 DIST rclone-1.50.0.tar.gz 18566931 BLAKE2B cfaf983ae972606b8ccc56ba505aec65bd7e6427f0b16f7e6187b079116b47eb3d297a99b505782c2bb5b64a5c8bf4e5b7beaee9dad5718ec952033ceca0945c SHA512 df805dc711ecf60b869ec957d224676643bcb6eac756470d2194338b9cc34e2a657d286d4a4308c743847fc11aa821b106888eb6ab9f04677bc70747c73fc5c1
 DIST rclone-1.51.0.tar.gz 18835242 BLAKE2B 5798a844c893e111e73ae409adcb06fd4291df3c0319bf983f2336ada45a60df253e750397bead55278cbb497c541a63498f695ce03af7b6cc1056f022ad2748 SHA512 b0881e09b75093abe4d31e95425a90513aed4a16d9e2dbf79023c9dc68875b90a1332204879530c450a16ab9cac475d967f7657d6f810a1e0f0d84b88d7de916
+DIST rclone-1.52.1.tar.gz 20029046 BLAKE2B 0dc7deebf1d362c1b7ad466991c3fc481c62d4c5803e5fa768dbe09adecfc79c2af9dcc19e7621542b464325b03be1390eff54d165c8c899c48adfac63b6cd7a SHA512 bbd305074071986cf6fb8146c634e35c28e1ea8ce2ce95507c55b95cb19eb3b1453dfb11e365bef5948978328d91df44b936b866c49db26149a17f5ca451ba15
 EBUILD rclone-1.50.0.ebuild 859 BLAKE2B c84444316be2f96809efb9e2ed04eb00e6a83f99f2b41982b96f3cfb9e268fcfd6b5f9a4c615247f026a922644365291b92d9b0327a9814e9a7258f22786b564 SHA512 0bdf451731b68b2a2be681fef6cfdbd58846939fb843310c0a3b59cb402b6cc96075395c1b5ccfb8e4dc3d088b449fcb7f538bed779ba97aa9298db52ba7cdcb
 EBUILD rclone-1.51.0.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
+EBUILD rclone-1.52.1.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
 EBUILD rclone-9999.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.52.1.ebuild b/net-misc/rclone/rclone-1.52.1.ebuild
new file mode 100644
index 000000000000..380576cdebc5
--- /dev/null
+++ b/net-misc/rclone/rclone-1.52.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/rclone/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 5a7e8e0579a4..bdc49c3377a1 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,8 @@
+AUX remmina-1.4.6-with-examples.patch 1466 BLAKE2B b2291567efa16b13e100d7b21795a497bb93d3839faa776b634e449db133e79d228d973d1d0f0117390e4e5e6b371988ea366d070cd73544f2cddc127cf17fa9 SHA512 9701f769865ecb003aee8fb16c39bb8b7f9bc28039b4f2759ef5bfe33f0c06b3f274c650be332f86d07e99ae14b1b913f89bba4c6e84e04602dedf0180caff3a
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
 DIST Remmina-v1.4.6.tar.gz 1895441 BLAKE2B 38dbda1976f3af3ad89c84eaecf50c42a2a22186dd013d30ae0cea83f5ee54af1443c196b79c1b4684e6afbc6f3d8fc8461fae18806476b8ae1a79148a2ccb12 SHA512 8b918502622957f6a1637d5d79ec605f7bf1c164f902c76a3a65dc316a8ccd11de63066182ffad4783bcb7f86d5e04ca6462f6a5d2e4256c4ae14c6f483419ea
 EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
 EBUILD remmina-1.4.5.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
-EBUILD remmina-1.4.6.ebuild 2519 BLAKE2B 0cb9245e01e3e36d022a76089cfb57d4f50681585b01e1a54f22d32c34a8b26f39721d882ee2628a442f915684ec0fbd0441caeafe34dc962535181f058b6ce8 SHA512 77134ae29285309a7e3d4e453475047d0c28110d849df984307bfff2ba00c4633e1a7cafc8593a065dd15d18c39d31ab62ece614a48f535001d7d40f66bc67c4
+EBUILD remmina-1.4.6.ebuild 2576 BLAKE2B e69f281212f854010d576642b5b8de538003c320d9c8ddaebf542e099cd6bd6cf0ba6551d4520c105b5c10a1b0ce79e12e9b768b683bc320c298ef6d53e03ca0 SHA512 457a54501dbedaa6538460710df82c8aa909e35165ed686b32d801385e14a04b9ca1071a4b06325025f1ff9adb5e57ce7e46e430f8d956626c9792ad8fd693b1
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
new file mode 100644
index 000000000000..259ef19e0fc8
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
@@ -0,0 +1,34 @@
+diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
+--- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
++++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
+@@ -42,17 +42,19 @@
+ #include <gdk/gdkx.h>
+ 
+ static RemminaPluginService *remmina_plugin_service = NULL;
++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
++
+ 
+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
++	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
+ }
+ 
+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
++	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
+ 
+ 	GtkDialog *dialog;
+ 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
+@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
++	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
+ 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
+ 	return FALSE;
+ }
diff --git a/net-misc/remmina/remmina-1.4.6.ebuild b/net-misc/remmina/remmina-1.4.6.ebuild
index f429622f2dc7..8902bb75ac42 100644
--- a/net-misc/remmina/remmina-1.4.6.ebuild
+++ b/net-misc/remmina/remmina-1.4.6.ebuild
@@ -54,12 +54,13 @@ RDEPEND="
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	xdg_environment_reset
 	cmake_src_prepare
-	xdg_src_prepare
 }
 
 src_configure() {
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index d6c631a29279..b26de190f860 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,5 @@
+AUX rsync-3.2.0-noexecstack.patch 931 BLAKE2B 92afb3233c42ae5fb08cf51c257e362fe531ece228b0fe490017714449c8f77043cbba7168224bd7f710087da1ca88468f2218fcaeefe868224071567c9ea672 SHA512 a007b365cab90bf9b6d499686fa8c3fd304075d22539e9fd04cd23ccee0e66172ec5ca0f2c8312f9b941a90e30089418546c9f43d2b2507068dd7f24a64f16b0
+AUX rsync-3.2.0-simd_check.patch 446 BLAKE2B d36350122964bc4838841d4d7b814c4e5602f225f41e5d922e18aeb97d51e77c60f952beff25908a4d478d3b245157e6c8eafe5528c7d178c72a3e82e48375e0 SHA512 b262fbb6ae9fba7d01ee0d28928e45df0ede143d81ea4d23e3401e164cfa4f06454b305a54c35a280157d910b42902b627696fccdcec63053fedd0d446d0f152
 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
@@ -5,5 +7,8 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
+DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
 EBUILD rsync-3.1.3.ebuild 2791 BLAKE2B c5996386d1e0adf52de159361d1efe245e63abe68fc44febb11b2ec607e27210c572bd4da2045142b4cc4fc5f9efd6a750da9aa4b38f6b1d194cf551e112f48d SHA512 2ef8ea9bfba4df20680d1b83aa121df54d27736c2cd7f65d04df8737bb36c2641e4f087f4b90724567d10b1262de8f6671aa80856982f74c15d28e42437fd6e7
-MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
+EBUILD rsync-3.2.0-r1.ebuild 4511 BLAKE2B 68012e3bfee86051abca8db34ed80bc6e35886e16e23f16e63b9dbb22637d46e66a2123bf21703bc78a8a229ed9d6b797ee8fa53a27883f36bff26df0f0b7188 SHA512 3b441789634815f311ed77760a4ca030c8b20568d8f5e3cd5f638c05743bf6e762de2b0fb30b64252c95a0db8d5c43e86ee7e9ef4c4261640af28e6cd66eee47
+EBUILD rsync-9999.ebuild 4455 BLAKE2B cbbc9b23733d1cca2d6d313b7438aec818199b4a85872ca5ece00d79e7932c3d037f5fafcc48313c3f56f8ecded946bb4abfe61763769e11c336cb30b2a6b5f2 SHA512 77e391b19108f82d1722e62f34619e1469d33d4c0420a683ca719c748473ec42335f2dc54c8422783ec0171ba165c6e6e2ad04b5ae9adb4bd5407e506f8ed732
+MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
new file mode 100644
index 000000000000..918346062e6a
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch
@@ -0,0 +1,24 @@
+From 75901616c5f38a9ff6ba736c8281933e8ce64b8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Sat, 20 Jun 2020 16:54:11 +0200
+Subject: [PATCH] Pass --noexecstack to assembler.
+
+This prevents Linux from rightfully complaining about an executable
+stack segment, which is widely considered a security hazard.
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 31ddc43b..60aff920 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -135,7 +135,7 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
+ 
+ lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s
+-	$(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
++	$(CC) -Wa,--noexecstack -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
+ 
+ tls$(EXEEXT): $(TLS_OBJ)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
new file mode 100644
index 000000000000..255f2792dc07
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch
@@ -0,0 +1,13 @@
+https://github.com/WayneD/rsync/pull/24
+
+--- rsync-3.2.0/configure.ac	2020-06-19 23:11:01.000000000 +0200
++++ rsync-3.2.0/configure.ac	2020-06-19 23:11:01.000000000 +0200
+@@ -207,7 +207,7 @@
+ 	if test x"$CXX" != x""; then
+ 	    CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1`
+ 	    case "$CXX_VERSION" in
+-	    g++*)
++	    *g++*)
+ 		CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'`
+ 		if test "$CXX_VERSION" -ge "5"; then
+ 		    CXX_OK=yes
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 148a18e18adc..1f39f5419f36 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -10,5 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
+		<flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
+		<flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..672e23e2d33b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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 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 ~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
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-simd_check.patch"
+	"${FILESDIR}/${P}-noexecstack.patch" #728882
+)
+
+src_prepare() {
+	default
+
+	eaclocal -I m4
+	eautoconf -o configure.sh
+	eautoheader && touch config.h.in
+}
+
+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 [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#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 OLDNEWS.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-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
new file mode 100644
index 000000000000..38d7035321aa
--- /dev/null
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -0,0 +1,152 @@
+# 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 ~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
+
+# 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 [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#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 OLDNEWS.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/smb4k/Manifest b/net-misc/smb4k/Manifest
index 7ec1e4438cfc..dc45065e16b1 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,6 +1,8 @@
 AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6
 DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
 DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
+DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
 EBUILD smb4k-3.0.4.ebuild 1932 BLAKE2B 38084c5e9420ade82d3ea8b245fee26c068e678724f38c5576d75cd4bc8652b6b7189d3466242fb8f90b800f8bf735dab4f4e3fa3120339dc5a00fda1e63eb31 SHA512 ec2d341b877717a47529096db938096f84a9b5d08802034a36c9bf9b403eff9eea8a28bff90d963d715f4ee63c6e28b4a2eda605fdcf9590281fc5b02726aa84
 EBUILD smb4k-3.0.5.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
+EBUILD smb4k-3.0.6.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
new file mode 100644
index 000000000000..a7ff9e7f655d
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.0.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
+https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="plasma"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-fs/samba[cups]
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_PLASMOID=$(usex plasma)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index b64afc75af05..99e9a2a509f7 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
-DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 986 BLAKE2B d0c603ab3772dd84b4028fb2ee47c9d54f531a949c0a02bac57022cfccb9c1350af54726e95d900174c70be1e0d3a55efa8b43f739bbd64f7e22abb32685ede3 SHA512 4043a93f84ce6a417deee3aa334e507dce78c99ba9008ef8afe13552f6dd747a2942430adbe5265256d71a79fc393b842da0be9ac64df9b1489c1bbc13474236
+DIST x11-ssh-askpass-1.2.4.1.gh.tar.gz 29740 BLAKE2B bf0aadcd4c85351c9deb4908eaeef80536d4ee123b194deef6959ff85f05005666de71c71112cc9c0083a0c5f996cb173a957c52bacade3b23ef0908d341882d SHA512 293c0bc623400d3359a920eca491930daa110685936cfcaf9eea07e439fc29de64413f4df4a18523cd8fdfce44794c55d7e3abafb904e8e90891b22d38f01a2f
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 950 BLAKE2B cb481e5eeedb393402b14e57664f28e004d2ee9c7e5ff7b9dd53f40468074c934693da1f2b5d10364283c577f61d5e09b325008e4f594816ac3e8317e3a9750a SHA512 6bf96f0fecc73acb08621501e0acd80a25a88ca99e2c1bbaaccd50a9145bffc1c8a6bbfdb1fdb4672e9e61ca789ab74869cb85ffc5b4aec57ac084db8e7b0380
 MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 466a49327b92..9ad47b423528 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -6,9 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
-HOMEPAGE="http://www.liquidmeme.net/software/x11-ssh-askpass
-	https://github.com/sigmavirus24/x11-ssh-askpass"
-SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
+HOMEPAGE="https://github.com/sigmavirus24/x11-ssh-askpass"
+SRC_URI="https://github.com/sigmavirus24/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
@@ -16,16 +15,16 @@ KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/ssh
-	x11-libs/libXt
-	x11-libs/libX11
+	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libICE"
+	x11-libs/libX11
+	x11-libs/libXt"
 DEPEND="${RDEPEND}"
-BDEPEND="x11-misc/imake
-	app-text/rman"
+BDEPEND="app-text/rman
+	x11-misc/imake"
 
 src_configure() {
-	econf --libexecdir=/usr/$(get_libdir)/misc \
+	econf --libexecdir=/usr/"$(get_libdir)"/misc \
 		--disable-installing-app-defaults
 	xmkmf || die "xmkmf failed"
 }
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a4f456214a08..96bb3992bfa0 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-dl-2020.06.06.tar.gz 3176995 BLAKE2B 0971a8f82eedf3dc6a635b90318586988ffc8a8219386e0eda8ca020fb9981ceabb4b708c0d90c38f5eab2c17daa98d73cead473e33a1ed27b726a087d9a57f7 SHA512 b3c910f8b26a11e225cfdebc3612e04010e1af027bc48b88f0b8bd36ba83f10eaed05375cbc833b421da9b377152722aa74ab936ed238957165a6b5f0149589b
-EBUILD youtube-dl-2020.06.06.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
+DIST youtube-dl-2020.06.16.1.tar.gz 3177873 BLAKE2B 8bf2df25b416c4a48b2b4a14466f15f99b1bbe0b4900c18e30bc3edab66a54b036f95025218cb584f820f3c45b2ab2e805f21e2d6548078d49c6a122fb52716d SHA512 2f0c01cd1a52293afd8c4fddc20b6f7baca94903fbe852769ad1d25740bd87e38d42ee4a275c2e3d611c639c432f6245d27f361471c6b566da03677384a04e54
+EBUILD youtube-dl-2020.06.16.1.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.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild
index 9dc88dfb1591..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index 66c9ff8a937a..d975f721fb07 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,5 @@
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
-EBUILD zsync-0.6.2-r1.ebuild 1090 BLAKE2B 06696d2011295bb4b57f9e699562488f03f6dd1e9b7ee2f551a17734bb47773220d29b1876c61d1ce90f33c05a66658860d4254852dd6341435066df074660f5 SHA512 1b1ade2408a93f8fc0028a3c8c9dfff67174e5bc89a17bea8351a6179e162ed38dcbb497dcc3c1d108c78aa5adb1f041c75b0d9a79dc10f7898d62d0ba281f11
+EBUILD zsync-0.6.2-r1.ebuild 1095 BLAKE2B 6cc0476c3a5f2ff9f22ffc2d8680b037dd85a07ce6aede4b6b5623593bc31bb7b9b18fc7ca8d632bbac4ef9961051143a077ed8f91e33986013b932b7c382ffd SHA512 f03895cafd2fd1d6a18d56b12fcdd26edf847727d73511c4043e168208e8bc7b17d01ea74c2f22e0e6d98c853553b1d085a2c2c478d7688da635d24fae29dbb5
 MISC metadata.xml 1248 BLAKE2B da1ebc159e8f07cf0237017bf86cda2dc162472539ea5b8777c0f9f12384e6728eabbf0dc0d87823c5480b6a905eb533042ef2ca9ec1b83a52f6cb9e4082bc58 SHA512 ee5763e3797b34d9b70bdada81f187c7d61cf155a0c207b6b70067a1407770dcdd2f7cce93f796fc022bed0577935d216e57f3260cf1a2a0a23672dbd610c04a
diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r1.ebuild
index 39625dc9ac89..ca66b738bda6 100644
--- a/net-misc/zsync/zsync-0.6.2-r1.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 ZLIB_S="${WORKDIR}/${ZLIB_P}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /net-misc
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)