gentoo resync : 20.03.2022

3 files changed, 5 insertions, 58 deletions

diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 0cfeaf7d2d84..0f9b80283cd3 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,7 +1,5 @@
-DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
-DIST bats-1.4.1.tar.gz 98964 BLAKE2B e7cb70d2d0f448e4336ccf1fe51e93730a7179a782247e28ee906eb576fc02305aeeb2a580b5d34220daf8dfd2ee1d3269fb86a386fdf00483bd3b234df3b75e SHA512 3b00af13ac97d38349f09db79179e170e2b37c5364815e0e1fb957e6593a564d291bb50c54776088dd5784ef8cd597f0c332ec3a574bcef65e3083a5f2fc1f0e
 DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a
-EBUILD bats-1.3.0.ebuild 1051 BLAKE2B 0cfd22da9b36402da3917c5b3f37fa1c586db0f8e776e8db5cdd82d179eb087570b53b5376deabf62346e5c07774c4991fa76e4f2d3feee9c25279308ce430cc SHA512 94f4ef6ad77720bb5c868596acc962b9855791dd341d1e275b4b1eafb85c61f324522f2504199c979247ab3cf0c5c26adf2ad60e9bb981a2bab657c95d5360b6
-EBUILD bats-1.4.1.ebuild 1182 BLAKE2B d734dd2e2e032a69020267f7c734185ddbd022d75fa48a66225cd400dfeec66afe5249a19de7a38692ef3f368a42abae90d60c838f2369a57f71a2c1457552bf SHA512 175c7d4671350fe14ff4bccf5c0c7aeddaf0cccd42c4d98ff92a5889c5c5c9dd9956f03adca447e35b883b2b98519daf793e586ac57023d7cb1fa2b84e95468f
+DIST bats-1.6.0.tar.gz 116367 BLAKE2B 7c3cd055edb476b6d62ddb28b23c5d0f3ddc07aba3b6ff736fc5a89f8a29856fec4e662d84d1c6094d1317d66b2e2666c269b275a6a0f8a7f4784387599ccffb SHA512 b5477d83339294651341734fa2eea54e73ca35e198260eab80cf3313b20904550e57b3471471fd3abfe0c4e02e360c713a87b3ee5e14468d89f3257445e6bb35
 EBUILD bats-1.5.0.ebuild 940 BLAKE2B 9fdf34273c68f2d82d16cbc3809aa7818faf70e803c07847e514eff13ddbc422e11909fe7d41a579fe26a6e6865170e395b9375f3fc736b81f6576ecf0e6348b SHA512 ce82c52c31455b5e203fa3df5d9f707f5319be21be8bc1fd5db97917d5a89a8c60fa14a099f6f6f23535a5d4e1bffd69a6ba5e3332a953200869395e34bc8ffc
+EBUILD bats-1.6.0.ebuild 957 BLAKE2B 9707917933340fca86319f67b7f65d69f1fc7d8dab595a94beff4c2d5b483b50a1658096d367f055697ae28268d0240df8ce6768a9fbf0a468b39ffa656a6a9e SHA512 d6e3b67ce89a95691ad0eccad946fb79c661591ac33aac5e24295bc2f4d22daa56aaef8a3e36223122040f6fb2f8344e5b491e71f2335b72df0fe09c8aee117f
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
deleted file mode 100644
index 2ce4d2225efd..000000000000
--- a/dev-util/bats/bats-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-	# "parallelity factor is met exactly" fails in portage, disable
-	sed -i -e 's/@test "parallelity factor is met exactly" {$/@test "parallelity factor is met exactly" { skip "gentoo"/' test/parallel.bats || die
-}
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/bats/bats-1.4.1.ebuild b/dev-util/bats/bats-1.6.0.ebuild
index 86390c1dbd6b..c61588e2322b 100644
--- a/dev-util/bats/bats-1.4.1.ebuild
+++ b/dev-util/bats/bats-1.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multiprocessing optfeature
 
@@ -12,19 +12,13 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="app-shells/bash:*"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-	default
-	# "parallelity factor is met exactly" fails in portage, disable
-	sed -i -e 's/@test "parallelity factor is met exactly" {$/@test "parallelity factor is met exactly" { skip "gentoo"/' test/parallel.bats || die
-}
-
 src_test() {
 	local my_jobs=$(makeopts_jobs)
 	if ! command -v parallel >/dev/null; then