4 files changed, 64 insertions, 50 deletions
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 6d545aab212c..274c0480731b 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.12.06.tar.xz 530940 BLAKE2B dcf1c97df38cdfd15c88fa71497477d83a0ab8e18ca506717f360b8a1f284be00163f6de956d686cdd6d479bd6fb2075ec2dc4dea55b4af4c623caf4a412e7a0 SHA512 bdfbee6c1d339dc4d288aa28b08bdaf158f49bb023b527c653e7956d80607690fe4aab763acc8c6659e822f2e225ee2be39ff60effa972b05c4c5e0fe067d6fc
+DIST stress-ng-0.17.08.tar.gz 6274899 BLAKE2B ca5c00eebbefeb5be90756faa41f8130b577ca71b78253dc4ae431df1044366e79882e0e1c0850c0102e83356203400295fad977d141dddaf234423617cec965 SHA512 3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index c2c476305376..8a4dc8829191 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
@@ -13,6 +13,9 @@
 		that exercise floating point, integer, bit manipulation and control flow
 		and over 20 virtual memory stress tests.
 	</longdescription>
+	<use>
+		<flag name="keyutils">Stress test the kernel's key generation facilities via <pkg>sys-apps/keyutils</pkg></flag>
+	</use>
 	<upstream>
 		<bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to>
 		<remote-id type="github">ColinIanKing/stress-ng</remote-id>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild
deleted file mode 100644
index 073bfbc1f4a8..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-apps/keyutils:=
-	sys-libs/libcap
-	sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-src_prepare() {
-	default
-
-	# Don't install compressed man page.
-	# Respect users CFLAGS.
-	sed -e 's/stress-ng.1.gz/stress-ng.1/' -e 's/-O2//' -i Makefile
-}
-
-src_compile() {
-	export VERBOSE=1
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.08.ebuild b/app-benchmarks/stress-ng/stress-ng-0.17.08.ebuild
new file mode 100644
index 000000000000..fcf28898a409
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.17.08.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apparmor keyutils jpeg sctp"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	apparmor? (
+		sys-apps/apparmor-utils
+		sys-libs/libapparmor
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	keyutils? ( sys-apps/keyutils:= )
+	sctp? ( net-misc/lksctp-tools )
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
+
+pkg_pretend() {
+	if use apparmor; then
+		CONFIG_CHECK="SECURITY_APPARMOR"
+		check_extra_config
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	export MAN_COMPRESS="0"
+
+	local myemakeopts=(
+		HAVE_APPARMOR="$(usex apparmor 1 0)"
+		HAVE_LIB_JPEG="$(usex jpeg 1 0)"
+		HAVE_KEYUTILS_H="$(usex keyutils 1 0)"
+		HAVE_LIB_SCTP="$(usex sctp 1 0)"
+		VERBOSE="1"
+	)
+
+	emake "${myemakeopts[@]}"
+}