gentoo auto-resync : 29:09:2022 - 09:22:29

7 files changed, 33 insertions, 53 deletions

diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index 1a7470624ff7..4b21656f7f9c 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile.patch 348 BLAKE2B 016aba350938f561865925b5ac5aea0502b5db4a9799ecf72de26a51d1c522f37a7ddcd44a6d69d50f16bd179b185103514dabb10eb74e4dadc46ffe485af107 SHA512 e795a7f4179aee9a86d546845cb16c03770a93013c83186c46a9a759edff909c4d85a40ec2091d068496c289cb5bb015026796b060e6bdec44d72fa8e13c2518
-AUX bonnie-2.0.6-includes.patch 336 BLAKE2B 438e8bbd08e98e30c74981b31c5896ab17efcea190394a260c0913a5d8e4289321d4550fa9d40072c8686629497ea1c09db50508251ec044e82489c270047674 SHA512 ed5cadebfabf1efb7e0b5289cfb67627262d83f4f9650d020755b1c47f19601b845193892c502d9947316d639b6423d52a862224f1943dcae182a151e0c72a39
-AUX bonnie_man.patch 349 BLAKE2B 9251f607a2875912d9c27228f0e3889f44a4ac013616450f8ba7cc8424065a8220560a846841f199227e65c18e770bf3ef294c391bea2c96b9bc9fac2cc50998 SHA512 38d88dcba9ef17e2de843a6123a063203c8fa1c1b654109fba3c7bee54275e6fa0ebe1f3ce8986b07891fc5cbfca4b310f71d4bc4e564a20ec199ecafb58de64
+AUX bonnie-2.0.6-clang16.patch 115 BLAKE2B 722de2a0da1abd958aee367f565d12e85e007e604c6c4d9a5d061a5ffd64167d1074a54bf5267333f809b7f18873387d0117219b962c4edbf560b9cb8e03add4 SHA512 3810638ab9edcdf56c625bde2dea5b2289e9bf2125c9ed0bc349a81c1b0744f6323438596664aaec2eaf01a45ed8727fd4d03db5573e8c105d322c6cc54d0b06
+AUX bonnie-2.0.6-includes.patch 174 BLAKE2B a36c20309c4351fd6749c7774c256048dce37a0633aef86ac3393ac3f8b1f158558b15b104fc8997f7b9fc53b4f885e9ff1da8fd522ae9a6f94a7b5b3cd7bfe0 SHA512 011fe909f1c4a49d4454dc441a202857c8bd6a48ba3ae3793ffe67444ebffcc06ffb02c71f16625d71bdf3c6bda65b0564d8fb8bf573d452ee6ae5284bd69f9c
+AUX bonnie-2.0.6-man.patch 146 BLAKE2B 214b1d0a8b383d460b97c6b9631adc90015c2320cf06a2d7997f88f4a646301711f1a2ac5c45ad86e052d534c1f4b5cfe658dceb811ffa2842a4152a35218ce1 SHA512 f5614c4263fba1b7579e072068c83f4f0251cb8dcbedea4bb228fef8b6f999e22db1854c46f7373db17e12744d7f8cab9810b946262987ebcf90f19791729e0b
 DIST bonnie-2.0.6.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
-EBUILD bonnie-2.0.6-r2.ebuild 662 BLAKE2B be75eb05cc2908f4ed6c59369c93a910b5d84f21286e2540a2f15a6529983b300567f3316df46123ba236b33af61311df364ba166d680d9393e5298b37c679b5 SHA512 fc10cb14f508a2f755baff26747ec28757e3082394e7606830c93c2ba4327e5f0b80eb531e54bad5b70a95c8adf1e41c5aec36af48d3a66af76156743ebbb0cc
+EBUILD bonnie-2.0.6-r3.ebuild 685 BLAKE2B fa65d4b4c59e946452a5e4680fd7fc45c002bf1593fc0aeffb659f20cf0fa92dda7595c96a40c5d85c05bd20754e768b008e5e7e1cd6ea2a595176191e7f1192 SHA512 96559e167aec07b400b4a118c095f72ac72b37405cb26a51fcd36018922298df1a87e78b57a71c1b228de2a88426906a1bb599a0987c2da433dd7e20b1e5d3c9
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
index 9c683b9e65ac..2ab46e265b61 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
-HOMEPAGE="http://www.textuality.com/bonnie/"
-SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.textuality.com/bonnie/"
+SRC_URI="https://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="bonnie"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}
 
 PATCHES=(
-	"${FILESDIR}"/bonnie_man.patch
-	"${FILESDIR}"/Makefile.patch
 	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
-src_configure() {
+src_compile() {
 	tc-export CC
+
+	emake -f /dev/null Bonnie
 }
 
 src_install() {
diff --git a/app-benchmarks/bonnie/files/Makefile.patch b/app-benchmarks/bonnie/files/Makefile.patch
deleted file mode 100644
index d803bd077ced..000000000000
--- a/app-benchmarks/bonnie/files/Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,9 @@
--CFLAGS = -O $(SYSFLAGS)
--
- bsd:	
- 	@echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
- 	@echo 'If you get messages about missing functions, try "make SysV."'
--	make Bonnie 
-+	$(MAKE) Bonnie 
- 
- SysV:	
--	make Bonnie 'SYSFLAGS=-DSysV'
-+	$(MAKE) Bonnie 'SYSFLAGS=-DSysV'
- 
- Bonnie:	
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch
new file mode 100644
index 000000000000..d1a3a36fa4f2
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/870559
+--- a/Bonnie.c
++++ b/Bonnie.c
+@@ -93,3 +93,3 @@
+ 
+-main(
++int main(
+   int    argc,
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
index cfefe953c6f1..8bec1e2ab04d 100644
--- a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
@@ -1,13 +1,9 @@
---- a/Bonnie.c	1996-08-28 18:23:49.000000000 +0200
-+++ b/Bonnie.c	2010-10-12 20:15:26.000000000 +0200
-@@ -29,6 +29,10 @@
- #include <fcntl.h>
- #include <sys/types.h>
+--- a/Bonnie.c
++++ b/Bonnie.c
+@@ -31,2 +31,6 @@
  #include <sys/time.h>
 +#include <time.h>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <sys/wait.h>
  #if defined(SysV)
- #include <limits.h>
- #include <sys/times.h>
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch
new file mode 100644
index 000000000000..d492ebd7c922
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch
@@ -0,0 +1,8 @@
+--- a/bonnie.1
++++ b/bonnie.1
+@@ -63 +63 @@
+-.TH Bonnie 1 "2.0.6" Textuality
++.TH bonnie 1 "2.0.6" Textuality
+@@ -67 +67 @@
+-.B Bonnie
++.B bonnie
diff --git a/app-benchmarks/bonnie/files/bonnie_man.patch b/app-benchmarks/bonnie/files/bonnie_man.patch
deleted file mode 100644
index e4b2fe0a12e3..000000000000
--- a/app-benchmarks/bonnie/files/bonnie_man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/bonnie.1	2003-01-07 14:19:29.000000000 -0600
-+++ b/bonnie.1	2003-01-07 14:20:19.000000000 -0600
-@@ -60,11 +60,11 @@
- .fi
- .in
- ..
--.TH Bonnie 1 "2.0.6" Textuality
-+.TH bonnie 1 "2.0.6" Textuality
- .SH NAME
- Bonnie - File system benchmark
- .SH "SYNOPSIS"
--.B Bonnie
-+.B bonnie
- .RI "[-d\ scratch-dir]"
- .RI "[-html]"
- .RI "[-m\ machine-label]"