gentoo resync : 02.08.2019

5 files changed, 2 insertions, 100 deletions

diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index e01c850b6a62..ffef7d4d5105 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -1,7 +1,4 @@
-AUX cpuburn-1.4a-flags.patch 250 BLAKE2B 68e402e16d1b1ce3f278ee580175ddf459993f908e2d8ad1a823b5df619cd0f52b20d2ec56966141ebbd422013b180e4d5602742b3bdb8fec00e87e554dd512e SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668
 AUX cpuburn-1.4a-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
 DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
-EBUILD cpuburn-1.4a-r1.ebuild 718 BLAKE2B 7b51ec50d043083c1a427b2cf6b4aacccfc1823c2ec5223ce1a00bb4cb43a36f9275ca15c2a22f13601bd52e2336ec348025a5cd1956b25432cdadd15489bea6 SHA512 03bcaceb4adfba9e916949bafdd978f5fc5785906cf71e2ddd594ef3d7f1d0a70399d984050d81c567e673be2fa479b4f5a26002087007ec2f9567a77e4728ed
-EBUILD cpuburn-1.4a-r2.ebuild 1372 BLAKE2B 18d9d8be980af968f1485711315921192edf8e3cc218ed0fc5a9e49256ba9c8e0749112d6752bcb2d69c70f0694d7df21144f9cace2f5bdd9ef64265936f37b7 SHA512 3819753d39addc60cf62d8f86abdc82c409b0ecb9721e57e575a4c3976ca1cb008d8fc603183631c69b8c22b543d164995e55230d449d4d04228875556b1745a
-EBUILD cpuburn-1.4a-r3.ebuild 1366 BLAKE2B 2fce1cd2956b32bcec9b911d6e055155b44546c7c2e09ea9695b54745d79445862339f837fe49661b3c69d1468ea81516c584ea5b56eb2b8059e1d923a60a60f SHA512 18dabb263242c89d43457131aee30abc6ae51c351d935adcbe11bc71226514e0ff92bd60778c369a9bbb94d2d88586bad9d9eed2d6540470bd81a10ef75a7648
+EBUILD cpuburn-1.4a-r3.ebuild 1365 BLAKE2B c343d26d9a91f5ab28a0fbfeb6a2b40c83323fd41af96fbd37b75b47e241b0b179850fae57b8a876e661e31e145054b60d9dc2057751e2d425ebc4298b0061b3 SHA512 ff1eb1724f814a1b11d2c13cb0c41116619d7940d58844927970a046ba8042ec65f9e16356aafe90f5fb8a70527fb57088eaefbef06435b5bbe1cd3e9bf0727e
 MISC metadata.xml 602 BLAKE2B eda46ae4cc60f92470dc83b419169c6daa3703f32f20a56b5c3764b7eef525a733898322f734739ca3cff379c568ffaa4754f996f5a7fe4637f7c7a3fcd23bf8 SHA512 2c6c59071ca30a6159222e37991b6b3367ba4ac6bc30e583b0ebbf537b9fac007df830fad046bc7904b0aa8e95c6e147fd983c219f97a921e5fd1d40dd593b12
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
deleted file mode 100644
index 10c2bf9df23b..000000000000
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P="${PV/./_}"
-
-DESCRIPTION="Designed to heavily load CPU chips [testing purposes]"
-HOMEPAGE="http://pages.sbcglobal.net/redelm/"
-#SRC_URI="http://pages.sbcglobal.net/redelm/cpuburn_${MY_P}_tar.gz -> ${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-variables.patch
-	use amd64 && append-flags -m32 #65719
-	tc-export CC
-}
-
-src_install() {
-	dodoc Design README
-	dobin burn{BX,K6,K7,MMX,P5,P6}
-}
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
deleted file mode 100644
index ae6d819bc65f..000000000000
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/./_}"
-
-DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
-HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
-SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="-* ~amd64 ~arm ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${P}-variables.patch" )
-
-QA_FLAGS_IGNORED="usr/bin/burnBX
-	usr/bin/burnK6
-	usr/bin/burnK7
-	usr/bin/burnMMX
-	usr/bin/burnP5
-	usr/bin/burnP6"
-
-QA_TEXTRELS="${QA_FLAGS_IGNORED}"
-
-src_prepare() {
-	default
-
-	# Respect users compiler and users CFLAGS and LDFLAGS on x86/amd64
-	# Must be always compiled in 32-bit on amd64 arch
-	# 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
-	sed -i -e '/CC :=/d' -e 's/^.*-mfloat-abi=softfp/	$(CC) $(CFLAGS) -nostdlib $(LDFLAGS)/' ARM/Makefile || die
-}
-
-src_compile() {
-	if use arm; then
-		cd "${S}"/ARM || die
-	fi
-
-	default
-}
-
-src_install() {
-	if use arm; then
-		dobin ARM/burnCortexA8 ARM/burnCortexA9
-		local DOCS=( "ARM/Design" "README" )
-	else
-		dobin burnBX burnK6 burnK7 burnMMX burnP5 burnP6
-		local DOCS=( "Design" "README" )
-	fi
-
-	einstalldocs
-}
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
index df7d1c48a385..93e6f0dda681 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
 HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
 SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="-* amd64 ~arm x86"
+KEYWORDS="-* amd64 arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch b/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch
deleted file mode 100644
index 97b8836c0af4..000000000000
--- a/app-benchmarks/cpuburn/files/cpuburn-1.4a-flags.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.orig	2001-06-16 05:39:17.000000000 +0200
-+++ Makefile	2010-10-12 20:31:38.000000000 +0200
-@@ -1,3 +1,3 @@
- all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX
- .S:
--	gcc -s -nostdlib -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -nostdlib -o $@ $<