gentoo auto-resync : 11:01:2025 - 06:41:28

4 files changed, 55 insertions, 5 deletions

diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 44480adffc8e..9a6498bddec4 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,6 @@
-AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
+AUX atf-0.21-getopt-solaris.patch 232 BLAKE2B 7ac7189150120d732d5587970d4b39d5bc2cbcf2d173ebd9cf0886dad4ff1dca1780f5488504689e7cf94e879b6895a7132207bdcb1442b6759a0499f85cbf36 SHA512 358973cf61f4196cd5618dd9b4b258b9c454e8f44da2b3b36193d392ff21bf10b04f7f2e410326b61a489e5086caea75d8f7f1e9c25ae60b756b2c5159e1fc7b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 775 BLAKE2B 6a65f87318315cc20ce0b53b0ed7cb97371f297a461cd21994d6240df0f655561af125bfa6502a1bd5647ff9896f84d9c86a8fcf8c5ce6a155321341c57bc515 SHA512 068f9b31a2eb399e6b2fb05fe0804a128e1e510a81628aeec1385b97dfa419b384f2c6cf230eee61aac75fe8c8465d94cd71ad2aaecf7a8957d41dcc740dfbd5
+DIST atf-0.22.tar.gz 196918 BLAKE2B 9dcd71d71daeb6a9364382d93972254c303599b61be2ae5126136ee5e00a6af1c8d9e7d5b25964f6a21edff7ce1e2bbad43e9ed5819d7dcfa0b83b55fa664750 SHA512 2bf2e8cb379aae6b435bfe9deb6d235c1641ec4ae9604fcfe9bb90324fd298b0ee7b7be2df3dd80cb140fe777936b239a14bab766b72a5a9862c1a463cea9455
+EBUILD atf-0.21-r3.ebuild 923 BLAKE2B 032d87d38a0061d02131f404a54d5ba1a9423e8d286dc15d1f2df7fe23b2d0d228dff6bd2cbf2e52b94f0e7fc3c46369923e9b42232b755407f8982ddf50ca86 SHA512 060f8a8cca21c08b3f0679eacad1cc0415b0cf225d5155e8b676a4a260e828c9ebbbbb94738173dbabc3a1921c86fbd49f0bca7776fa0400d7180f8e225b9185
+EBUILD atf-0.22.ebuild 815 BLAKE2B df4a45de9a9a533eeae1d383e51c00fb7fdefff83587bead09213baab0f4c94a1ed7fc793bf77fd4daa57c023ef3c85c814429cbdd8a4b1f374ca1b72708403c SHA512 3c884b02d3b1b64cd12cba809e227fc6e488ee59155d568d617905fc8ab0e63593933720a29a314ef2c5f4ede176aa2b3d3d828ff827cecd84d7f1fda1a8f225
 MISC metadata.xml 323 BLAKE2B 2f38c262020949a8a288bb08482764ddd78788fdc9125d7786ed75939c9b8063d13c3ebab7a5ad5a6127f75d87aafef0c33ecbd554228ad69678b0577b75228c SHA512 cf1d75098067c39bebbd700c16f167bc0a5dcc245be8734d6ffdad10ec2a92fec71955c7c33b40bc0f85f3031e168bcdd10a69e6ca4bb9f8b72fc3020cfdd699
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r3.ebuild
index bc30e3d33c4e..a91b0d57209a 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 2017-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Libraries to write tests in C, C++ and shell"
 HOMEPAGE="https://github.com/freebsd/atf"
@@ -17,11 +17,20 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch )
 
+src_prepare() {
+	default
+	# Refresh autotools, bug 879659
+	eautoreconf
+}
+
 src_configure() {
 	# Uses std::auto_ptr (deprecated in c++11, removed in c++17)
 	append-cxxflags "-std=c++14"
 
-	default
+	local myconf=(
+		ATF_SHELL="${EPREFIX}/bin/sh"
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/dev-libs/atf/atf-0.22.ebuild b/dev-libs/atf/atf-0.22.ebuild
new file mode 100644
index 000000000000..9bccce2933ff
--- /dev/null
+++ b/dev-libs/atf/atf-0.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Libraries to write tests in C, C++ and shell"
+HOMEPAGE="https://github.com/freebsd/atf"
+SRC_URI="https://github.com/freebsd/atf/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/atf-${P}"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/atf-0.21-getopt-solaris.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		ATF_SHELL="${EPREFIX}/bin/sh"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
index d70af36ce40e..08e4fe0faadb 100644
--- a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
+++ b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
@@ -1,3 +1,5 @@
+https://github.com/freebsd/atf/pull/100
+
 On Solaris, getopt(3) is in stdio.h.
 
 --- a/atf-c/tp_test.c