Merge updates from master

36 files changed, 7 insertions, 661 deletions

diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 0587f2f190dd..5d52a4ec1bdc 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emulation/rex-client/metadata.xml b/app-emulation/rex-client/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-emulation/rex-client/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-emulation/rex-client/rex-client-9999.ebuild b/app-emulation/rex-client/rex-client-9999.ebuild
deleted file mode 100644
index 4b6505b6105d..000000000000
--- a/app-emulation/rex-client/rex-client-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Remote EXexcution agent"
-HOMEPAGE="http://mduft.github.io/rex/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mduft/rex.git"
-else
-	SRC_URI=""
-	KEYWORDS="~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-REX_EXE=(
-	"client/rex-exec.sh"
-	"client/rex-register.sh"
-	"client/rex-paths.sh"
-	"client/rex-remote-pconv.sh"
-	"client/winpath2unix"
-	"client/unixpath2win"
-	)
-
-src_prepare() {
-	for x in ${REX_EXE[@]}; do
-		sed \
-			-e "s,\. \${HOME}/rex-config.sh,\. ${EPREFIX}/etc/rex.conf,g" \
-			-i "${x}" || die
-	done
-}
-
-src_install() {
-	for x in ${REX_EXE[@]}; do
-		dobin "${S}"/${x}
-	done
-
-	insinto /etc
-	newins client/rex-config.sh rex.conf
-}
diff --git a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild b/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
deleted file mode 100644
index 4eca71e19ee6..000000000000
--- a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of scripts to manage KDE translation files"
-HOMEPAGE="https://github.com/vpelcak/kde-scripts"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vpelcak/kde-scripts.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	app-crypt/md5deep
-	app-i18n/pology
-	app-shells/bash:*
-	dev-vcs/subversion
-	kde-apps/poxml
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/local:${EPREFIX}/usr:" \
-		Makefile || die
-}
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
deleted file mode 100644
index cf6e8a9090b6..000000000000
--- a/app-i18n/kde-l10n-scripts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vpelcak/kde-scripts</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
index e8f009e2c51e..b54ef1708782 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.19.3.ebuild b/dev-python/numpy/numpy-1.19.3.ebuild
index aa601d57d966..c02078636b1e 100644
--- a/dev-python/numpy/numpy-1.19.3.ebuild
+++ b/dev-python/numpy/numpy-1.19.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/media-plugins/xbmc-addon-xvdr/metadata.xml b/media-plugins/xbmc-addon-xvdr/metadata.xml
deleted file mode 100644
index 6a454981266d..000000000000
--- a/media-plugins/xbmc-addon-xvdr/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pipelka/xbmc-addon-xvdr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
deleted file mode 100644
index 8f64cf07d266..000000000000
--- a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib git-r3
-
-DESCRIPTION="XBMC addon: add VDR (http://www.tvdr.de/) as a TV/PVR Backend"
-HOMEPAGE="https://github.com/pipelka/xbmc-addon-xvdr"
-EGIT_REPO_URI="https://github.com/pipelka/xbmc-addon-xvdr.git"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	export STRIP=true
-	eautoreconf
-}
-
-src_configure() {
-	econf --prefix=/usr/$(get_libdir)/xbmc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_info() {
-	einfo "This add-on requires the installed "media-lugins/vdr-xvdr" plugin on the VDR server."
-	einfo "VDR itself dosn't need any patches or modification to use all the current features."
-	einfo "IMPORTANT:"
-	einfo "Please disable *all* PVR addons *before* running the XVDR addon!"
-}
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 358d12b3149a..4cfac190293f 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
deleted file mode 100644
index 7bf85b98253c..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sysadmin@gentoo.org</email>
-    <name>Gentoo Sysadmin Project</name>
-  </maintainer>
-  <use>
-    <flag name="smart">
-      Install <pkg>sys-apps/smartmontools</pkg> required for
-      S.M.A.R.T. disk monitoring. Disabling the flag removes the
-      plugin file. This plugin also requires the sudo flag to be
-      enable.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Flameeyes/nagios-plugins-flameeyes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
deleted file mode 100644
index 351eac1d17cc..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 multilib
-
-EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git"
-SRC_URI=""
-KEYWORDS=""
-
-DESCRIPTION="Flameeyes's custom Nagios/Icinga plugins"
-HOMEPAGE="https://github.com/Flameeyes/nagios-plugins-flameeyes"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="smart samba"
-
-RDEPEND="
-	dev-perl/Monitoring-Plugin
-	sys-apps/portage
-	dev-perl/Time-Duration
-	dev-perl/TimeDate
-	smart? (
-		sys-apps/smartmontools
-		app-admin/sudo
-	)
-	samba? ( dev-perl/Filesys-SmbClient )"
-DEPEND=""
-
-src_compile() {
-	cat - > "${T}"/50${PN} <<EOF
-Cmnd_Alias NAGIOS_PLUGINS_FLAMEEYES_CMDS = /usr/sbin/smartctl
-User_Alias NAGIOS_PLUGINS_FLAMEEYES_USERS = nagios, icinga
-
-NAGIOS_PLUGINS_FLAMEEYES_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_FLAMEEYES_CMDS
-EOF
-}
-
-src_install() {
-	insinto /etc/sudoers.d
-	doins "${T}"/50${PN}
-
-	dodir /usr/$(get_libdir)/nagios/plugins/flameeyes
-	cp -Rp $(find . -type d -mindepth 1 -maxdepth 1 -not -name .git) \
-		"${D}/usr/$(get_libdir)/nagios/plugins/flameeyes" || die
-
-	dodoc README.md
-}
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
deleted file mode 100644
index 3574747f1b9d..000000000000
--- a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3
-
-DESCRIPTION="Osmocom library for A-bis interface"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-libs/ortp
-	>=net-libs/libosmocore-0.11.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-libs/libosmo-abis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
deleted file mode 100644
index d2b2772d8afa..000000000000
--- a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-KEYWORDS=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-libs/libosmocore net-libs/libosmo-abis"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-libs/libosmo-netif/metadata.xml b/net-libs/libosmo-netif/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-libs/libosmo-netif/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
deleted file mode 100644
index 8330ca2effc7..000000000000
--- a/net-misc/lcr/lcr-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Linux Call Router"
-HOMEPAGE="http://isdn.eversberg.eu/"
-EGIT_REPO_URI="git://git.misdn.eu/lcr.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn"
-
-DEPEND="
-	media-libs/opencore-amr
-	asterisk? ( net-misc/asterisk )
-	ssl? ( dev-libs/openssl )
-	gsm-bs? ( net-wireless/openbsc )
-	sip? ( net-libs/sofia-sip )
-	gsm-ms? ( net-wireless/osmocom-bb )
-"
-	#mdisn? ( net-misc/misdn )
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:' "${S}"/libgsmhr/fetch_sources.py
-	eautoreconf
-}
-
-src_configure() {
-	CXXFLAGS="$CXXFLAGS -I./include" CFLAGS="$CFLAGS -I./include" econf \
-		$(use_with asterisk) \
-		$(use_with ssl) \
-		$(use_with gsm-bs) \
-		$(use_with gsm-ms) \
-		$(use_with ss5) \
-		$(use_with sip) \
-		$(use_with misdn) \
-		$(use_enable gsmhr)
-}
-
-src_compile() {
-	emake -j1
-}
-
-pkg_postinst() {
-	use gsmhr || return
-	ewarn "You have enabled the gsmhr use flag, for the GSM half-rate"
-	ewarn "codec. This is strongly discouraged, except for testing,"
-	ewarn "because of extremely high CPU usage."
-}
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
deleted file mode 100644
index b1d1e33aef3d..000000000000
--- a/net-misc/lcr/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="asterisk">net-misc/asterisk channel driver</flag>
-		<flag name="misdn">net-misc/misdn driver</flag>
-		<flag name="gsm-bs">net-wireless/openbsc driver</flag>
-		<flag name="gsm-ms">net-wireless/osmobb driver</flag>
-		<flag name="ss5">CCITT No. 5 support</flag>
-		<flag name="sip">SIP support</flag>
-		<flag name="gsmhr">Support for GSM HR codec using reference code (very slow)</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
index ead293b1b92c..06bcef995db2 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="
diff --git a/net-misc/srf-ip-conn-srv/Manifest b/net-misc/srf-ip-conn-srv/Manifest
deleted file mode 100644
index 4ad823728926..000000000000
--- a/net-misc/srf-ip-conn-srv/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jsmn-35086597a72d.tar.gz 11056 BLAKE2B 12db2b739b910602ecef6b2417443275b10eae7baf746d77e017a5c568417e8a013531af1666d5ec7a26bb25a45d78505afea1681508964b82c8c08c5101d4da SHA512 0cec27867f3ffd39ae1040e5236b7710a0e1b31fd184da6b56aed3995379da64907dc00aa01692f244ed5ea59ec995d62bacfd3a130bd1dd59724405f24560bd
-DIST srf-ip-conn-140c9b8a8619.tar.gz 112882 BLAKE2B fd368385d5a2e54ee7d7f7aed1149120ad9249702fc0b9db9eb415adcb5da65191b23776e23d337764baad1bbdb500993f8c5590da77f33900a549cf291c3219 SHA512 6f6e6fbc1b3d17fb36ef48c530756d2c4b2bee0a0e9016355ca57ac7124ca2b18c845110d40818673b200a3700b92f6b40664d157a158979705146aad579186b
diff --git a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv b/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
deleted file mode 100644
index 4bc3f9d30f33..000000000000
--- a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [[ "$*" == *-c* ]]; then
-  /usr/bin/srf-ip-conn-srv-target "$@"
-else
-  /usr/bin/srf-ip-conn-srv-target -c /etc/srf-ip-conn-srv/config.json "$@"
-fi
diff --git a/net-misc/srf-ip-conn-srv/metadata.xml b/net-misc/srf-ip-conn-srv/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-misc/srf-ip-conn-srv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
deleted file mode 100644
index f92e83711ca8..000000000000
--- a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot git-r3 cmake-utils
-
-DESCRIPTION="SharkRF IP Connector Protocol server"
-HOMEPAGE="https://github.com/sharkrf/srf-ip-conn-srv"
-srfipcon="srf-ip-conn-140c9b8a8619"
-jsmn="jsmn-35086597a72d"
-SRC_URI="https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> ${srfipcon}.tar.gz
-		https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> ${jsmn}.tar.gz"
-EGIT_REPO_URI="https://github.com/sharkrf/srf-ip-conn-srv.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/build"
-
-CMAKE_IN_SOURCE_BUILD=true
-
-src_unpack() {
-	vcs-snapshot_src_unpack ${A}
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	#set needed paths
-	sed -i "s#\$ENV{JSMN_PATH}#${WORKDIR}/${jsmn}#" CMakeLists.txt
-	sed -i "s#\$ENV{SRF_IP_CONN_PATH}#${WORKDIR}/${srfipcon}#" CMakeLists.txt
-
-	#set cflags/ldflags
-	sed -i "s#-O4#${CFLAGS}#" CMakeLists.txt
-	sed -i "s#CMAKE_EXE_LINKER_FLAGS_RELEASE \"\"#CMAKE_EXE_LINKER_FLAGS_RELEASE \"${LDFLAGS}\"#" CMakeLists.txt
-
-	#be in a sane directory for eapply_user
-	cd "${WORKDIR}/${P}"
-	eapply_user
-}
-
-src_install() {
-	#add a default banned list to edit
-	sed -i 's#"banlist-file": ""#"banlist-file":"/etc/srf-ip-conn-srv/banlist.json"#' "${WORKDIR}/${P}/config-example.json"
-	echo "{}" > "${ED}/etc/srf-ip-conn-srv/banlist.json"
-
-	insinto /etc/srf-ip-conn-srv
-	doins "${WORKDIR}/${P}/banlist-example.json"
-	newins "${WORKDIR}/${P}/config-example.json" config.json
-	newbin Release/srf-ip-conn-srv srf-ip-conn-srv-target
-
-	dobin "${FILESDIR}/srf-ip-conn-srv"
-}
diff --git a/net-wireless/dump978/dump978-9999.ebuild b/net-wireless/dump978/dump978-9999.ebuild
deleted file mode 100644
index f84f6b174121..000000000000
--- a/net-wireless/dump978/dump978-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="simple Mode S decoder for soapysdr supported devices"
-HOMEPAGE="https://github.com/flightaware/dump978"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	#SRC_URI="https://github.com/flightaware/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-	SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=
-		net-wireless/soapysdr:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's#-Wall -Wno-psabi -Werror -O2 -g##' Makefile
-}
-
-src_install() {
-	newbin ${PN}-fa ${PN}
-	dobin skyaware978
-	dodoc README.md
-
-	insinto /usr/share/${PN}
-	newins debian/lighttpd/89-skyaware978.conf lighttpd.conf
-}
diff --git a/net-wireless/dump978/metadata.xml b/net-wireless/dump978/metadata.xml
deleted file mode 100644
index 825bf00b405a..000000000000
--- a/net-wireless/dump978/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">flightaware/dump978</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/openbsc/metadata.xml b/net-wireless/openbsc/metadata.xml
deleted file mode 100644
index 7e81667e2456..000000000000
--- a/net-wireless/openbsc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="gprs">Support GPRS via OpenGGSN</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-wireless/openbsc/openbsc-9999.ebuild b/net-wireless/openbsc/openbsc-9999.ebuild
deleted file mode 100644
index c8175a0f58f9..000000000000
--- a/net-wireless/openbsc/openbsc-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="OpenBSC, OsmoSGSN, OsmoBSC and other programs"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+gprs"
-
-DEPEND="
-	gprs? ( net-wireless/openggsn )
-	net-libs/libosmocore
-	net-libs/libosmo-abis
-	net-libs/libosmo-netif
-	dev-db/libdbi"
-RDEPEND="${DEPEND}
-	dev-db/libdbi-drivers[sqlite]
-	dev-db/sqlite:3"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-}
diff --git a/net-wireless/openggsn/metadata.xml b/net-wireless/openggsn/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-wireless/openggsn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/openggsn/openggsn-9999.ebuild b/net-wireless/openggsn/openggsn-9999.ebuild
deleted file mode 100644
index eb2dc537ed83..000000000000
--- a/net-wireless/openggsn/openggsn-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Gateway GPRS Support Node"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS"
-EGIT_REPO_URI="git://git.osmocom.org/openggsn"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-wireless/osmobts/metadata.xml b/net-wireless/osmobts/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-wireless/osmobts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/osmobts/osmobts-9999.ebuild b/net-wireless/osmobts/osmobts-9999.ebuild
deleted file mode 100644
index c88880d41de7..000000000000
--- a/net-wireless/osmobts/osmobts-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Osmocom BTS-Side code (Abis, scheduling)"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OsmoBTS"
-EGIT_REPO_URI="git://git.osmocom.org/osmo-bts.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-libs/libosmocore net-libs/libosmo-abis"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-	mkdir -p "${S}"/include/openbsc || die
-	wget -O "${S}"/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h || die
-	wget -O "${S}"/src/common/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c || die
-
-}
-
-src_configure() {
-	econf --enable-trx --with-openbsc="${S}"/include/openbsc
-}
diff --git a/net-wireless/osmocom-bb/metadata.xml b/net-wireless/osmocom-bb/metadata.xml
deleted file mode 100644
index ca60be1c4b8d..000000000000
--- a/net-wireless/osmocom-bb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="transmit">Enable transmission capabilities.</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
deleted file mode 100644
index be88f95016e4..000000000000
--- a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools flag-o-matic git-r3
-
-DESCRIPTION="OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware"
-HOMEPAGE="http://bb.osmocom.org"
-EGIT_REPO_URI="git://git.osmocom.org/osmocom-bb.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+transmit"
-
-DEPEND="net-libs/libosmocore"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use transmit && append-cflags "-DCONFIG_TX_ENABLE"
-
-	cd src/host/osmocon && eautoreconf && cd ../../.. || die
-	cd src/host/gsmmap && eautoreconf && cd ../../.. || die
-	cd src/host/layer23 && eautoreconf && cd ../../.. || die
-}
-
-src_configure() {
-	cd src/host/osmocon && econf && cd ../../.. || die
-	cd src/host/gsmmap && econf && cd ../../.. || die
-	cd src/host/layer23 && econf && cd ../../.. || die
-}
-
-src_compile() {
-	cd src/host/osmocon && emake && cd ../../.. || die
-	cd src/host/gsmmap && emake && cd ../../.. || die
-	cd src/host/layer23 && emake && cd ../../.. || die
-
-}
-
-src_install() {
-	cd src/host/osmocon && emake install DESTDIR="${D}" && cd ../../.. || die
-	cd src/host/gsmmap && emake install DESTDIR="${D}" && cd ../../.. || die
-	cd src/host/layer23 && emake install DESTDIR="${D}" && cd ../../.. || die
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 509c90833691..6d9556611681 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -438,23 +438,6 @@ www-apps/webmcp
 dev-lang/helium
 dev-haskell/lvmlib
 
-# Joonas Niilola <juippis@gentoo.org> (2020-11-03)
-# Dead upstream, or broken for a long time, not maintained in Gentoo.
-# Removal in 30 days. Bug #752462
-app-emulation/rex-client
-app-i18n/kde-l10n-scripts
-media-plugins/xbmc-addon-xvdr
-net-analyzer/nagios-plugins-flameeyes
-net-libs/libosmo-abis
-net-libs/libosmo-netif
-net-misc/lcr
-net-misc/srf-ip-conn-srv
-net-wireless/dump978
-net-wireless/openbsc
-net-wireless/openggsn
-net-wireless/osmobts
-net-wireless/osmocom-bb
-
 # Lars Wendler <polynomial-c@gentoo.org> (2020-10-30)
 # Removed public macro definitions for TRUE and FALSE which breaks lots of
 # revdeps. See tacker bug at https://bugs.gentoo.org/751919
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index 3faccdbd3f1f..b32068f1bd0c 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 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"
+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="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
index 5bb41c4b106c..57506c7cb320 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="!sys-fs/mtd