summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-06-16 06:10:03 +0000
committerJustin Lecher <jlec@gentoo.org>2014-06-16 06:10:03 +0000
commit84aaf7496b82f545ace35317f5103f41b7705a6f (patch)
tree533ef1e7c4149064c66214654e8ec20de17dcf92 /app-benchmarks
parentAdd pypy compatibility (diff)
downloadhistorical-84aaf7496b82f545ace35317f5103f41b7705a6f.tar.gz
historical-84aaf7496b82f545ace35317f5103f41b7705a6f.tar.bz2
historical-84aaf7496b82f545ace35317f5103f41b7705a6f.zip
app-benchmarks/cpuburn: Drop old; drop unnecessary emul-linux dep, #492962; add patch from debian fixing variable declaration
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/cpuburn/ChangeLog12
-rw-r--r--app-benchmarks/cpuburn/Manifest32
-rw-r--r--app-benchmarks/cpuburn/cpuburn-1.4.ebuild37
-rw-r--r--app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild32
-rw-r--r--app-benchmarks/cpuburn/cpuburn-1.4a.ebuild8
-rw-r--r--app-benchmarks/cpuburn/files/01-variables.patch40
-rw-r--r--app-benchmarks/cpuburn/metadata.xml4
7 files changed, 113 insertions, 52 deletions
diff --git a/app-benchmarks/cpuburn/ChangeLog b/app-benchmarks/cpuburn/ChangeLog
index b74f66ec4dce..729693ebb633 100644
--- a/app-benchmarks/cpuburn/ChangeLog
+++ b/app-benchmarks/cpuburn/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-benchmarks/cpuburn
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/ChangeLog,v 1.19 2012/02/15 18:38:53 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/ChangeLog,v 1.20 2014/06/16 06:10:02 jlec Exp $
+
+*cpuburn-1.4a-r1 (16 Jun 2014)
+
+ 16 Jun 2014; Justin Lecher <jlec@gentoo.org> -cpuburn-1.4.ebuild,
+ cpuburn-1.4a.ebuild, +cpuburn-1.4a-r1.ebuild, +files/01-variables.patch,
+ metadata.xml:
+ Drop old; drop unnecessary emul-linux dep, #492962; add patch from debian
+ fixing variable declaration
15 Feb 2012; Justin Lecher <jlec@gentoo.org> cpuburn-1.4a.ebuild:
Mirror the src tarball as upstream is dead, move to EAPI=4
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index 7099e20144d9..f780e9e2a6a3 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX 01-variables.patch 879 SHA256 7022b7191746cc5a159fe4db7de556f8f36b95e9e2aa6d214a80c179f55c61dc SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7 WHIRLPOOL ac124c94bc81252946151fe87b31597dd9c9bc509c4285de482a0c318aed35c810df7b8b8baecebdc58825ddea06bb241838d3a09b86035dc3cf8ca50b3be09c
AUX cpuburn-1.4a-flags.patch 250 SHA256 478217b059d351cde2d16b57d6c058abbdcf02b68d12d572212f173c845c85ff SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668 WHIRLPOOL d92639812dfd181f57365be7973fe6a09a07a7713d3692fb44fd7e53ef466c8cd4c337ff4016f71855dc47d35172d343e8ad040906221839ad014a999a5108ea
DIST cpuburn-1.4a.tar.gz 9277 SHA256 eb191ce9bfbf453d30c218c3419573df102a3588f96c4a43686c84bb9da4bed6 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce WHIRLPOOL e119aeaf3453357125fb0f203fdbd0bb68f52479213d6cf6462fcaf53636cb4a13b16f5350cc4b9a382ff9ccc362535f362f6b5b78165c683dcd432e281c7b46
-DIST cpuburn_1_4_tar.gz 7373 SHA256 1b2a1672f455545a28d0f038737e792e8c3b97789f2029f765847fc2a807244a SHA512 28211de05869785d515e9b5994f5d95d41c0f4b429a1469b20b59a0cd804d5b291c5c8fc74d5c403444c98c8a6ebd156f37713c4461e343793305cc416385daa WHIRLPOOL 128e0ebc20d4c6b01938fba138edb9ed5cb6d4c0eefd242c4c137a79494660049786a7f1bc0ace4081c6efcbd4039aba749335721b47697445bd3f3978969ef3
-EBUILD cpuburn-1.4.ebuild 928 SHA256 5148c06c3106dfb90565e94897b2c878c469d3fd52eabd4f87ed15b9c98331e4 SHA512 2e4cb809ba799198eedf627cf3c73408e0cbee8f161477469238c0c56db8a6da66937352f102e43c29a100293e39c8b25b2046c162a78cafb29bfd1738c763a2 WHIRLPOOL 539fd15194c40dbfafc78a5a69b41d430cbc0d4bd8f558e8b351ff501038564a0ac08f8956c52a8c451b1e5d3b7c2c049682792e6a0537209ab4b40c6848d17b
-EBUILD cpuburn-1.4a.ebuild 893 SHA256 9f41ec6f7234b35c0d5b21dd129ef1048840377816d880137e3520a2735e88d3 SHA512 9eea69371df7835888db8a140cd77c92f55379c64250c343633e2b1fac1453a110f34a597af7be5eef953c17d712c2ddbd7366f1f1cc3fdd0ba07674d8b448be WHIRLPOOL 67c7c618f20373c2f27ac1683e8b8f64dfab1fbf3b01dff3baeb2823eced7729ab37a1a54a9f2bc7af0a35f47186ad53623d92e89c34f82e02e2e15d60f1af76
-MISC ChangeLog 1902 SHA256 fd63cf708bb6af23d7b7ce604282a2bbc2c1d415321c63d1fc87bcc86082a136 SHA512 f6141cc3894c1e80c3615d1ce74c73c41f9cc8957589e6a61b1b6f8776cd704baf1487b5f883e6e0ef0c3e07863e2cad5e39eec67e794e3cdb14252fa2a9675b WHIRLPOOL 6aa4b0b4814f13538ad51598657bc658cfe4afa8ea0a68f4a606f8e6a7542de1f9e6f96218454952ca24007795db1bf58d8c42c5e1f22585998c1066a03cad22
-MISC metadata.xml 400 SHA256 9aba080fab1b7bc1a6551b484688d991365d9685cb36dca67a0370e26c4ad002 SHA512 ba29a4cf2d56aa36b7c36cdbf30f2fd0d895e35baaa317e1217db809554d200ccd2fa0095af2302456445765914af4520f3ecb0d0eb5b1a98caa05ab66d58aa8 WHIRLPOOL 10c8f3c18a6b4ca648e670d8f00d38868088371b675e605e9ccf55fcfc08569fd9b766ab4c2cb207872e462aab676aa493d83070e27dbbd5f4da0ee068d85033
+EBUILD cpuburn-1.4a-r1.ebuild 838 SHA256 13d72917bf9add78167d543f9f6679df28f86aded3a37767d41d84348da853a7 SHA512 153dc7ed5b959b52e91510dc87f5a73bb8414d95868c4d2640a20afba0f09e737afdc32c9820b2409aab17736bb48abe30562b2b58247c6d3c3a03da4ca10f6c WHIRLPOOL ef5a49c842b3b5c94bd1df0958f5b5458a7f59d668a3008a262a9a3b13e3070223ffc7630b0145115ab0c691e4af6d17cd6d567afe6a42dc51cee2f83cddfef4
+EBUILD cpuburn-1.4a.ebuild 792 SHA256 f644fae80c77ee3e4bd60f26d9e23dbf9e8f5045a35002e15c8a785af7139702 SHA512 348c0ceda05a56590227dfda4d84b44a0fa3e572fac8fbd03aee851417473a9faae7169f93cafcf5926be1fcdf4ee354ad6ac4379e5b0b3185b224a592383ee3 WHIRLPOOL 255987d4197610e1e7b0ab25e05dd88b073fdd404eaf539c239aab5aec7190cbba102e3bf109a4144b75d389f816169b55c5c61ea198263df46281644b648920
+MISC ChangeLog 2200 SHA256 2249ee12338483faf6cd5d2782150a78d897a9e27caf5a6c50f2369697ec19db SHA512 d18fa6b34b26cdc7860ce184fc4ad0e55ef4cd2537f489c6726da0f7decf67a4ea95c7b067150ea231b77ecaa640c75e860e2321bafcb745327be72a9db79061 WHIRLPOOL 7ff22c431c6cabcc5e477d9c8315f9bf298a7b23209ed410d8c38a1550f42f7f0e728956ec2d39f27b6469d9434a95dcf6f647a4cc5d2d6fafec31da280c81b3
+MISC metadata.xml 402 SHA256 6e5b2b72e2f0003a6dd858f6202d7772963b6dc7fab11f6f2490a9d02eff714a SHA512 5fb5e677beb605dadbb229a049c3c0156cd18223624e35b99f79a9d14c0a2e818a9dbefd751e4f3ce6a208e31134af45cc19e45fed3a818e9536758cd8c0a96a WHIRLPOOL b840a5f5def37e2e97155f2e20ecbe512eb83870d8f0ae5ed0bcebcb4250aca598b67020d8c489b0c2ee3a136f17940d98ec1094e04f0e807132bcd8b865b0f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJTnoo4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirigEP/jC5JlZjrV+aR6vpFZKthmyH
+aj+xkOmvyWFkWbP+LjQETUHmsRxg17S8Ln4MrH2Vbsp5riV5IM0wPDBW6AHTLrqR
+ZylKmus+qvPPT/pwUIOuGC2IPHx6xmUHDrYFMHFJYeqmeEtNb1WYGMyT9lHVF4g0
+ZwrJNkYM9kwaERCWMSnNX8kFGW1wwE60u88IjC5+NBXnXRd3erCPhLJwLwaq0Q/t
+W4fbaxwDzBImkZ+a4BVYs6OUT9e2Cf7BORne3Nqgqg7krH9+9dNgmkqNDLUhn/Eu
+nMPps0mHzLPppzIgUU3AX4gqF8TpMzgJ04bx30Lz9hg/SizBtQKHBnu3za4Vu4Xr
+QWsdbRNqB5MU2h8NPVxs5+lezB+8wWF4vy6vDnTVZimQMWi0E2li9FDXE14DdD2Z
+EnY144XzskKHnjxiNvB9eUPYLHsbRePxLGDUqE5AMKS6go2RDtYjZodyiLfqiG4d
+gEhrFtp6WaawY6QObE85gNrAD/TZ2ZglzioMi2Wxkx2/kkoKuj1wppoDlps+JyVk
+xOQnSFsuOQTpaqfbhBA02dLivnxcQ67Y5jE/KCvMEG+Fe5wlsKOasgfj51EDY+qN
+JEjpYHZU0R+OocTNH1ugPXuEBR/1XRxDv52UfNF7A5id+eOQifZMghyaBs3MnNJc
+4Np3/Ulb+D/7Ky/Pe13h
+=2Q0o
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4.ebuild
deleted file mode 100644
index 8fa7c27770ec..000000000000
--- a/app-benchmarks/cpuburn/cpuburn-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/cpuburn-1.4.ebuild,v 1.15 2009/10/12 19:02:05 halcy0n Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="sys-devel/gcc"
-RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
-
-src_unpack() {
- # for some reason he has it _tar instead of .tar ...
- unpack ${A}
- tar -xf cpuburn_${MY_P}_tar || die
-
- if use amd64 ; then #65719
- cd "${S}"
- sed -i 's:gcc -s:gcc -m32 -s:' Makefile || die "sed failed"
- fi
-}
-
-src_compile() {
- emake || die
-}
-
-src_install() {
- dodoc Design README
- dobin burn{BX,K6,K7,MMX,P5,P6} || die
-}
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
new file mode 100644
index 000000000000..2d6a3b31493d
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/cpuburn-1.4a-r1.ebuild,v 1.1 2014/06/16 06:10:02 jlec Exp $
+
+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="http://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}"/01-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.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild
index 6cae7326decf..ceb0cc4af411 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild,v 1.4 2012/02/15 18:38:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/cpuburn-1.4a.ebuild,v 1.5 2014/06/16 06:10:02 jlec Exp $
EAPI=4
@@ -18,11 +18,7 @@ SLOT="0"
KEYWORDS="-* amd64 x86"
IUSE=""
-RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
-DEPEND=""
-
src_prepare() {
- cp -av Makefile{,.orig}
epatch "${FILESDIR}"/${P}-flags.patch
use amd64 && append-flags -m32 #65719
tc-export CC
diff --git a/app-benchmarks/cpuburn/files/01-variables.patch b/app-benchmarks/cpuburn/files/01-variables.patch
new file mode 100644
index 000000000000..3e8b666c29ec
--- /dev/null
+++ b/app-benchmarks/cpuburn/files/01-variables.patch
@@ -0,0 +1,40 @@
+--- cpuburn-1.4a.orig/burnK7.S
++++ cpuburn-1.4a/burnK7.S
+@@ -74,6 +74,7 @@ int_exit:
+ push %eax
+ int $0x80
+ #endif
++.data # Data allocation
+ .align 32,0
+ .fill 64
+ half: .long 0x7fffffff,0
+--- cpuburn-1.4a.orig/burnP5.S
++++ cpuburn-1.4a/burnP5.S
+@@ -77,6 +77,7 @@ crunch:
+ #else
+ int $0x80
+ #endif
++.data # Data allocation
+ .align 32,0
+ half: .long 0xffffffff,0x3fdfffff
+ one: .long 0xffffffff,0x3fefffff
+--- cpuburn-1.4a.orig/burnP6.S
++++ cpuburn-1.4a/burnP6.S
+@@ -69,6 +69,7 @@ int_exit: # error abort
+ push %eax # *BSD syscall
+ int $0x80
+ #endif
++.data # Data allocation
+ .align 32,0
+ half: .long 0x7fffffff,0
+ e: .long 0xffffffff,0x3fdfffff
+--- cpuburn-1.4a.orig/burnK6.S
++++ cpuburn-1.4a/burnK6.S
+@@ -68,6 +68,7 @@ int_exit:
+ push %eax
+ int $0x80
+ #endif
++.data # Data allocation
+ .align 32,0
+ half: .long 0x7fffffff,0
+ e: .long 0xffffffff,0x3fdfffff
diff --git a/app-benchmarks/cpuburn/metadata.xml b/app-benchmarks/cpuburn/metadata.xml
index a45e31d61182..afc8cb4d2030 100644
--- a/app-benchmarks/cpuburn/metadata.xml
+++ b/app-benchmarks/cpuburn/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>benchmarks</herd>
- <longdescription>
+ <herd>benchmarks</herd>
+ <longdescription>
CPUBurn is the ultimate stability testing tool for overclockers. The
program heats up any x86 CPU to the maximum possible operating
temperature that is achievable by using ordinary software.