From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 app-benchmarks/bashmark/Manifest                   |  6 +++---
 app-benchmarks/bashmark/bashmark-0.6.2.ebuild      | 23 +++++++++++++---------
 .../bashmark/files/bashmark-0.6.2-as-needed.patch  |  5 ++---
 .../bashmark/files/bashmark-0.6.2-gcc43.patch      | 15 ++++++--------
 4 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'app-benchmarks/bashmark')

diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
index e97c8e924187..bae6fd26c08b 100644
--- a/app-benchmarks/bashmark/Manifest
+++ b/app-benchmarks/bashmark/Manifest
@@ -1,6 +1,6 @@
-AUX bashmark-0.6.2-as-needed.patch 362 BLAKE2B 6d6f5697f1da32395fb454ffe844b72799b7294559d8d390958a73b119159dd8ec138ed8ea34537349761c9b13820347b5f5657589f90125eac554f2a550edb5 SHA512 123afc84ec7131492054d28d6e41f32730328298fcb5f13055a56277d1c286352a3ff70d759fb307dc960fba413ad31102f04bf5b5df55d6052743d26b7bcad4
-AUX bashmark-0.6.2-gcc43.patch 2034 BLAKE2B c931cc7edea7fe1bd2d8939564896c352a4a33eb078e54214c20f9d56c5be533bb23787ad1240d7716dd55475ce67b09f611a3ed176810696ae9e248eae471c2 SHA512 48d1d0b2924d3640e8939f44989528a9a83fb56e436da21abb9301bbbbed28dbf2fa5e46b6631ac09531ed1ef218da685d21d5b3aeb48f147d56a1aa161bf09c
+AUX bashmark-0.6.2-as-needed.patch 197 BLAKE2B bc30f5592c51fbadcecd8371e353106fc887090b13c443610b79872efee4e271b0e5ad907e34c9b0a6a4a34a1023389e71253e557e8ff0f4cf462ff1f06e8433 SHA512 4b157186b888a28465bb3fb9fac957118daf45410fb9cfbbfe92b60a598e1a1a218bbafdac9152ee4649bcffa8de5874e1228740257ddafc772a1dd876ac61b2
+AUX bashmark-0.6.2-gcc43.patch 1517 BLAKE2B b125d0f92e679043a053cc36156cb3403fbabc7bb63381a56023442fbcb736b1816c3c2260ce0d40d17e557b15c6424f8ae7f08c67981ac26cd688eae98c8412 SHA512 0c8ab6ba0d6fd6be03ff0225d8d34aa4f52b3279836bcf2d5ecb15d3906864786d2bc4c4a0de4c16a28aea8b8cb4e401223a90bfa12cb1ba8ba95d9be8f98428
 AUX bashmark-0.6.2-gcc47.patch 631 BLAKE2B fbb465dfc0f5b68337bf15be09413209b4c6dc3cad1b11379723252320c96b26b4b6eaa7b16eda511201d9ee71aefd25368042587915edafd02184792dd9e843 SHA512 60b1c1dd529d7dcac0893f1cc5d74e5fdcecb2bfd5735e33c6445d9fbaa843258b9aaaee9627ba98db1f8237f4567b8868f4be483b681b130d5a34943d2d24b6
 DIST bashmark-0.6.2.tar.bz2 21944 BLAKE2B 63c6241dfe67dbd3961d7712a5b4c2f611846e3e5a7bfa1796ff14f03610d8db0a7f71239a4eec9eaba53c09274d12f320aa30d5ffc7462ff1a186b19c456256 SHA512 43935b44c1b871d724aca0e1a6dfd99c73c29ec276c4127186e8dc6c7b27d57554b8b32a7e2372cd0b78eb584df7ee169f51f47e6666f61eaacbe35c5d4074f8
-EBUILD bashmark-0.6.2.ebuild 541 BLAKE2B 1a9a38a97eba174c653492e1ae790dfb9c7bf23d9ecfde35e376e62733185454c69e4a53c6d2af2d74ce06793dd45f051174868ab1150d42e95021d0cd2c7945 SHA512 cfdce168c7343f0903b4bd5cb66bfdf7383d5f00263d1b2aba335d9535fbeb5023b30b3a9eb860ec7d7d139c0316fd8db16c7e95d40897205da42811a59d67c7
+EBUILD bashmark-0.6.2.ebuild 558 BLAKE2B b9c6ebf513b7fc55095e748d4b2cc3716f806196bfe46b23eccd4c16c01889040b8c8737006dce9af39b48850845bc2f4afbab0025b2241f9ef5de5da5ef6d8d SHA512 05d37650edae417985c67d2e22fd576c5028a155813c2f8fc0ec7477323f5fc845f468caf4572d80c1bdf4a67bfc91207f113b7a3289ad5bbd54b8d5f342cf8d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
index c50dd20f0339..6b8964a76be9 100644
--- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
+++ b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Geno's cross platform benchmarking suite"
 HOMEPAGE="http://bashmark.coders-net.de"
-
 SRC_URI="http://bashmark.coders-net.de/download/src/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
+
+src_configure() {
+	tc-export CXX
+
+	default
 }
 
 src_install() {
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
index 6c01fd934e5d..7af9843a9bcc 100644
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch
@@ -1,6 +1,5 @@
-diff -ru bashmark-0.6.2-orig/makefile bashmark-0.6.2/makefile
---- bashmark-0.6.2-orig/makefile	2007-10-08 23:01:06.000000000 +0300
-+++ bashmark-0.6.2/makefile	2007-10-08 23:01:22.000000000 +0300
+--- a/makefile
++++ b/makefile
 @@ -10,7 +10,7 @@
  BIN = bashmark
  
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
index 625abdab397b..02bded6c4765 100644
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch
@@ -1,6 +1,5 @@
-diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
---- bashmark-0.6.2.orig/Benchmark.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/Benchmark.cpp	2008-06-29 11:54:02.000000000 +0200
+--- a/Benchmark.cpp
++++ b/Benchmark.cpp
 @@ -15,11 +15,11 @@
   *                                                                         *
   * You should have received a copy of the GNU General Public License       *
@@ -14,9 +13,8 @@ diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp
  #include "Main.hpp"
  
  
-diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
---- bashmark-0.6.2.orig/main.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/main.cpp	2008-06-29 11:56:40.000000000 +0200
+--- a/main.cpp
++++ b/main.cpp
 @@ -17,10 +17,11 @@
   * along with this software; if not, write to the Free Software            *
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
@@ -29,9 +27,8 @@ diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp
  
  #include "Output.hpp"
  #include "Sysinfo.hpp"
-diff -NrU5 bashmark-0.6.2.orig/Sysinfo.cpp bashmark-0.6.2/Sysinfo.cpp
---- bashmark-0.6.2.orig/Sysinfo.cpp	2008-06-29 11:53:07.000000000 +0200
-+++ bashmark-0.6.2/Sysinfo.cpp	2008-06-29 11:55:58.000000000 +0200
+--- a/Sysinfo.cpp
++++ b/Sysinfo.cpp
 @@ -15,11 +15,12 @@
   *                                                                         *
   * You should have received a copy of the GNU General Public License       *
-- 
cgit v1.2.3