gentoo resync : 20.03.2022

3 files changed, 2 insertions, 28 deletions

diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index 02c108f0f0ff..d5846dd365b4 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,4 +1,3 @@
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
-EBUILD unittest-or-fail-1-r1.ebuild 851 BLAKE2B 3f046d354de0bed37a7a800afe5e6b3a02c5d977214b9553eead0da257c6c7a0781368f249f3d9ce9ad8cc52baf0f4b2d7bb548714382c2d172d2fa8baac8760 SHA512 e1089e7e4be6590214d283783727f083eff8982724b7c4d87099cadd03e9e4f92b04f5935118fa00fd26b6d79a3aa95bd0d45225817d7ce0d5d64281d9034a2f
-EBUILD unittest-or-fail-1.ebuild 833 BLAKE2B f9b234dde5611921d9affee30c40bfbed9320ad2129d8403041ea52c594c995ace1e7624843cd1bc6a8a5c9d6ac3824e7a95c2bfeff1d3fa326a76cf84a4df85 SHA512 6ea5dea2655328c5911989f2f457bf9b2ad31e76f34c08ed2af9c07dc7227bf2f16750a95dd0489fcaf0a6a7bd38f491df6a4b8089b066f4b3cdaa1a2cd875ed
+EBUILD unittest-or-fail-1-r1.ebuild 843 BLAKE2B d062094a965ba4276131b5f987d624530d432e4db4220ccb08789ad3de4beaf7ae4f872acf40f117495eab68116b6789c753ebdbd1a63aaeeb7f240238aec3e3 SHA512 ebfcabcb3853c9a7ecdba29d31ebcdcb3836a14751d9aeaa255c05ac00ec5840c25788b87fa549201bac31e9994f501970cc79dd549a30e55d12358e1b0765d2
 MISC metadata.xml 373 BLAKE2B 3ad42807c91c3c0d7cbba503afc38ae94534c8fed72986c171a16f5e8a59630570b647aff0ae0237cd95a9ef8a202e022aa95cd7161f310b84cf75867aedfc54 SHA512 9f4e48a463886ae1b99fc6d16451e580ed8e861248233c0aed47d874323ffe9bf3a9b11079640f9e15f17d34950a0dcc80b93113ca623fb35e419ddca3851783
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild
index f12c75497b62..d4f4c26bd57c 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
deleted file mode 100644
index b77f5a5cfc0a..000000000000
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Run unittests or fail if no tests were found"
-HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
-SRC_URI="
-	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Warning: do not use distutils_enable_tests to avoid a circular
-# dependency on itself!
-python_test() {
-	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
-		die "Tests failed with ${EPYTHON}"
-}