gentoo resync : 15.06.2021

3 files changed, 10 insertions, 64 deletions

diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 566a6d082538..57af54f01a87 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,5 +1,3 @@
-DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
 DIST tini-0.19.0.tar.gz 32369 BLAKE2B 5d86f6299b92152063974e6ecd347e1a2ba90f0188f2a702ddb6c814fc1c9723062481fe560caa89e9f74883017ee833566adf1eb1f11fe625671eced47f3296 SHA512 1fa85b56e2c6085ea474f251928e7a40510d92aeef60b3c145b0496969c1b5df86835d143cb91ef5b4bf4da63fa8a56947cc39a4276e4b72faa57276d432b292
-EBUILD tini-0.18.0.ebuild 1426 BLAKE2B 016e2475b6297cf6bf1cc2d6ff24f4a27fe456d41c6bdb8f76eda0e976ecb556e0b598d5c39225aa1f54e6e3533b3ebd182e9914ad9ca0164cbc2debd3e63472 SHA512 2bba6d17d43b7276d2372f20d2a975e6cb8749d572a4dc22f69975bb2930557fac35cf7d218377d638b1a63a3d8b7f89bdbe5123f0a13537b91a52b9a38cefbf
-EBUILD tini-0.19.0.ebuild 1397 BLAKE2B 9497829168bbc95af1cbf6f9e1a587702388e2111de73b6d161b32a970e356578ccb14f6993e5dba27a01838f8b07a58c846887288ad1a72cd7e1e95887c5d41 SHA512 34f19202bdfdc5b031785845988b652c6c03508eef4d5be4eb5f93644066d4439c8e01dde421ffa8710f922c2cded00f8c303d2e5667969f5c7d005023047a11
+EBUILD tini-0.19.0-r1.ebuild 1628 BLAKE2B bc6b59ecfd8a47645666d1a5ec5c81c983862bf1de483db88e025fd999821d6756ae871519c26f7492d983b3969681efab2f24e73e9cc60a5ef90ab9302e65c1 SHA512 9c414f7de0bbf666a9880bdec0b402dc036d25e52d4ea9c45bcafed3d0e92911cdd50735d244089cd4d61b3e3c29a50a0fb814dd81fa529322933ec2d6bc4346
 MISC metadata.xml 558 BLAKE2B 7fd719d731c968125776805299e964567907ca7cae8a94c717218fdf8caa73d6f333a8bb22c36e0bec273f48504a55f91081e09474abc90440b50bcd760f53aa SHA512 dfbadc5994b3c7b4d8a27fd207c9f1836a21633218dee0252f938448f3c14f3c41d1f35c0604aecbc9f14117b27cd995451800c61dd41875be3becffb53d33f3
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild
deleted file mode 100644
index d892a5882f55..000000000000
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-DESCRIPTION="A tiny but valid init for containers"
-HOMEPAGE="https://github.com/krallin/tini"
-SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-IUSE="+args +static"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local sed_args=(
-		# Do not strip binary
-		-e 's/-Wl,-s")$/")/'
-
-		# Remove -Werror and -pedantic-errors in order to allow macro
-		# redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not
-		# trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2)
-		# in CMakeLists.txt (bug 626438).
-		-e "s/ -Werror / /"
-		-e "s/ -pedantic-errors / /"
-	)
-
-	sed -i "${sed_args[@]}" \
-		-e "s/git.*status --porcelain.*/true/" \
-		-e "s/git.*log -n 1.*/true/" \
-		-e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use args || mycmakeargs+=(-DMINIMAL=ON)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use static; then
-		mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die
-	else
-		rm "${ED}"/usr/bin/${PN}-static || die
-	fi
-}
diff --git a/sys-process/tini/tini-0.19.0.ebuild b/sys-process/tini/tini-0.19.0-r1.ebuild
index 9dad0ff99226..fe80f91738db 100644
--- a/sys-process/tini/tini-0.19.0.ebuild
+++ b/sys-process/tini/tini-0.19.0-r1.ebuild
@@ -5,17 +5,24 @@ EAPI=7
 
 inherit cmake flag-o-matic
 
-GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
+# guard against forgetfulness, https://bugs.gentoo.org/795936
+GIT_COMMIT_0190="de40ad007797e0dcd8b7126f27bb87401d224240"
+GIT_COMMIT="GIT_COMMIT_${PV//./}"
+GIT_COMMIT="${!GIT_COMMIT}"
+
 DESCRIPTION="A tiny but valid init for containers"
 HOMEPAGE="https://github.com/krallin/tini"
 SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="+args +static"
 
 src_prepare() {
+
+	[[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump"
+
 	cmake_src_prepare
 
 	local sed_args=(