[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     e8bcbfd1e258a80c3437f4b198728e049ae45d68
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 19:53:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:53:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bcbfd1

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 ....12.02-fix-build-breaking-HAVE_USTAT-typo.patch | 46 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild  | 44 ---------------------
 3 files changed, 91 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 115c7ce3290..39ed89124c2 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.12.02.tar.xz 519476 BLAKE2B a56f5e186083fdd2675a13c8ed0e128cb30f0c16787f24dff5db484dbf318d00fe2d9887947b54122e83e8aee3c203c2c8fda4adf6c7c28d0e68b357acb58641 SHA512 074baa898cce4dad898e628e86d7cf29eeef4226bdceddd7e3b05a68327f8fa98df5875434599985049e280f649d2df9a2e0fa7ff32482a800a9fb0ff0c91b7c
 DIST stress-ng-0.12.03.tar.xz 525156 BLAKE2B 76b56f01670e553acef9caef3c9aea5fb2a0594d9a26694de9aff8d3243494269c82af6d0259cb759dc4763f3faae28f1f06ce797ec07c08a2b8a9516caf7365 SHA512 372de29089645fe80d4b9c17779b7dd0f724d910c898cb181791476e64906cf7713b0cc78d33bb9d4485b02928122590d76f3af731e24923f6b26ce65f862114

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
deleted file mode 100644
index 14498b49449..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ce1fb7978c836281dd91558f2b4ab3ecee0c253c Mon Sep 17 00:00:00 2001
-From: Adrian Ratiu <adrian.ratiu@collabora.com>
-Date: Wed, 10 Feb 2021 14:28:00 +0200
-Subject: [PATCH] stress-ng.h: fix build-breaking HAVE_USTAT typo
-
-This minor typo fails builds on newer glibc because ustat.h does
-not exist anymore.
-
-Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
----
-Backported from stress-ng master commit ce1fb7978c836281d.
----
- core-shim.c | 3 ++-
- stress-ng.h | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/core-shim.c b/core-shim.c
-index e4e6189d..8af7bcc5 100644
---- a/core-shim.c
-+++ b/core-shim.c
-@@ -1390,7 +1390,8 @@ int sys_clone3(struct shim_clone_args *cl_args, size_t size)
- 
- int shim_ustat(dev_t dev, struct shim_ustat *ubuf)
- {
--#if defined(HAVE_USTAT)
-+#if defined(HAVE_USTAT) &&	\
-+     defined(HAVE_USTAT_H)
- 	return ustat(dev, (void *)ubuf);
- #elif defined(__NR_ustat)
- 	return syscall(__NR_ustat, dev, ubuf);
-diff --git a/stress-ng.h b/stress-ng.h
-index e16a08f0..9d964059 100644
---- a/stress-ng.h
-+++ b/stress-ng.h
-@@ -219,7 +219,7 @@
- #include <ucontext.h>
- #endif
- 
--#if defined(HAVE_USTAT)
-+#if defined(HAVE_USTAT_H)
- #include <ustat.h>
- #endif
- 
--- 
-2.30.0
-

diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
deleted file mode 100644
index ec872d653bd..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
+++ /dev/null
@@ -1,44 +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" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.11.23-makefile.patch"
-	"${FILESDIR}/${PN}-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch"
-)
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}