Merge updates from master

7 files changed, 4 insertions, 81 deletions

diff --git a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r1.ebuild b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r1.ebuild
deleted file mode 100644
index 8c8c9d10e1d8..000000000000
--- a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=0.97
-inherit perl-module
-
-DESCRIPTION="Graceful exit for large children"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# mod_perl < 2.0.5 bundles Apache-SizeLimit
-RDEPEND="dev-perl/Linux-Pid
-	!<www-apache/mod_perl-2.0.5
-	>=www-apache/mod_perl-2.0.5"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Apache-Test-1.360.0
-		!www-apache/mpm_itk
-	)"
-
-SRC_TEST="do"
diff --git a/dev-python/eradicate/eradicate-2.0.0.ebuild b/dev-python/eradicate/eradicate-2.0.0.ebuild
index 03564502a4f5..87c27cec73bf 100644
--- a/dev-python/eradicate/eradicate-2.0.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/mando/mando-0.6.4-r1.ebuild b/dev-python/mando/mando-0.6.4-r1.ebuild
index 09e392b67fed..108026015193 100644
--- a/dev-python/mando/mando-0.6.4-r1.ebuild
+++ b/dev-python/mando/mando-0.6.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylama/pylama-8.3.6.ebuild b/dev-python/pylama/pylama-8.3.6.ebuild
index 54ab7daf7064..2207624ca9f8 100644
--- a/dev-python/pylama/pylama-8.3.6.ebuild
+++ b/dev-python/pylama/pylama-8.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/radon/radon-5.1.0.ebuild b/dev-python/radon/radon-5.1.0.ebuild
index 512e61bd84ec..e091e56c523d 100644
--- a/dev-python/radon/radon-5.1.0.ebuild
+++ b/dev-python/radon/radon-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index d8a3c63108ee..aeaf57a37d82 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,4 +1,2 @@
-DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
-DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
 DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5
 DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
deleted file mode 100644
index f84a2283a7fa..000000000000
--- a/media-video/movit/movit-1.6.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy[egl]
-	>=sci-libs/fftw-3
-	media-libs/libsdl2
-	"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}