commit: 58844a558b8223245bf32c6b61fb122830ec861a
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Oct 28 18:44:06 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 18:16:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58844a55
app-benchmarks/cpuburn: bump to EAPI=7
Also renamed patch, to match name.
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild | 4 ++--
app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild | 4 ++--
.../{cpuburn-1.4a-r2.ebuild => cpuburn-1.4a-r3.ebuild} | 14 ++++++++------
.../{01-variables.patch => cpuburn-1.4a-variables.patch} | 0
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
index 3a72f5ced7c..10c2bf9df23 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,7 +20,7 @@ IUSE=""
src_prepare() {
epatch \
"${FILESDIR}"/${P}-flags.patch \
- "${FILESDIR}"/01-variables.patch
+ "${FILESDIR}"/${P}-variables.patch
use amd64 && append-flags -m32 #65719
tc-export CC
}
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
index db1f520822b..ae6d819bc65 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ KEYWORDS="-* ~amd64 ~arm ~x86"
LICENSE="GPL-2"
SLOT="0"
-PATCHES=( "${FILESDIR}/01-variables.patch" )
+PATCHES=( "${FILESDIR}/${P}-variables.patch" )
QA_FLAGS_IGNORED="usr/bin/burnBX
usr/bin/burnK6
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
similarity index 85%
copy from app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
copy to app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
index db1f520822b..1933ce1f6a6 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="7"
MY_PV="${PV/./_}"
@@ -13,14 +13,16 @@ KEYWORDS="-* ~amd64 ~arm ~x86"
LICENSE="GPL-2"
SLOT="0"
-PATCHES=( "${FILESDIR}/01-variables.patch" )
+PATCHES=( "${FILESDIR}/${P}-variables.patch" )
-QA_FLAGS_IGNORED="usr/bin/burnBX
+QA_FLAGS_IGNORED="
+ usr/bin/burnBX
usr/bin/burnK6
usr/bin/burnK7
usr/bin/burnMMX
usr/bin/burnP5
- usr/bin/burnP6"
+ usr/bin/burnP6
+"
QA_TEXTRELS="${QA_FLAGS_IGNORED}"
@@ -32,7 +34,7 @@ src_prepare() {
# See https://bugs.gentoo.org/65719
sed -i -e 's/gcc -s/$(CC) $(CFLAGS) -m32 $(LDFLAGS)/' Makefile || die
- # Respect users compiler and users CFLAGS and LDFLAGS on arm
+ # Respect users compiler, CFLAGS and LDFLAGS on arm
sed -i -e '/CC :=/d' -e 's/^.*-mfloat-abi=softfp/ $(CC) $(CFLAGS)
-nostdlib $(LDFLAGS)/' ARM/Makefile || die
}
diff --git a/app-benchmarks/cpuburn/files/01-variables.patch
b/app-benchmarks/cpuburn/files/cpuburn-1.4a-variables.patch
similarity index 100%
rename from app-benchmarks/cpuburn/files/01-variables.patch
rename to app-benchmarks/cpuburn/files/cpuburn-1.4a-variables.patch
