gentoo resync : 20.03.2021

5 files changed, 44 insertions, 59 deletions

diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 209be8cdb0b8..7cb4d02fbb58 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,7 +1,5 @@
-DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
-DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
-EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 659 BLAKE2B 0944a49ce57ad39b193d05750e32a9bae8f8b8e2e7c9ffd9750b8a8650049a16932b3876ae174d5c2049d3a58c749583b82335d7097c4bb9d56bc425307a8d30 SHA512 f625785af87a23e9431d4f126ff847804c412f2cd20b88aaa31f10b9486d39375f07de312bc142f22ed07e537af36e64b65562eafb11d2aaa18b36bae2bb021e
+DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
-MISC metadata.xml 929 BLAKE2B 5bda8ae72f30ead09a4bdf81bcfd22632ddc01e3d247a56359c91d27dcd936e53d39951ee54d450a0e3485fab6cb76de79cd8e87d01e8e902aa425230b2e0d63 SHA512 99855dfdc7822edb3a93dc53ebab1230fd2ca72997c53641c7731fa7b9edc605cddf9b59594c26e37f0d16e691c541ae1046fbb593b7eb0dd92ea0b2f59d34dd
+EBUILD bats-1.3.0.ebuild 810 BLAKE2B f8d0e14431c65d7aaa3e2a76e749f749f14c6b14edde00c1c98a2ad3605b8f07d933db365ff9387d4939529e41f37056b08cbb2ae7fe8958dde099b781853cbe SHA512 620116401fe1d831669c93317fd04a45db787be2d2dc83a66718e95c0b5e5471536f4050551f12fb6e1435b4bdc95fda2ff00485f98beb6c1de4b0e79e231307
+MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-0.4.0.ebuild b/dev-util/bats/bats-0.4.0.ebuild
deleted file mode 100644
index 0af7a00bf20f..000000000000
--- a/dev-util/bats/bats-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	einstalldocs
-
-	dobin libexec/*
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
deleted file mode 100644
index bc519b1c1a97..000000000000
--- a/dev-util/bats/bats-0.4.0_p20170219.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMITHASH="03608115df2071fff4eaaff1605768c275e5f81f"
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-
-S="${WORKDIR}/bats-${COMMITHASH}"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/bats
-	doexe libexec/*
-	dosym ../libexec/bats/bats /usr/bin/bats
-
-	dodoc README.md
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
new file mode 100644
index 000000000000..0cc0631f5528
--- /dev/null
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# 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 ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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/metadata.xml b/dev-util/bats/metadata.xml
index af9f791400de..f96261ed3f64 100644
--- a/dev-util/bats/metadata.xml
+++ b/dev-util/bats/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henning@hennsch.de</email>
 		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>