app-benchmarks/ramspeed: Take package, bump to EAPI=5

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 83 insertions, 16 deletions

diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog
index 0e7bfdc131c3..9689fbb90d7c 100644
--- a/app-benchmarks/ramspeed/ChangeLog
+++ b/app-benchmarks/ramspeed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/ramspeed
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.10 2013/06/02 10:53:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.11 2013/06/02 11:23:45 jlec Exp $
+
+*ramspeed-3.5.0-r2 (02 Jun 2013)
+
+  02 Jun 2013; Justin Lecher <jlec@gentoo.org> +ramspeed-3.5.0-r2.ebuild,
+  metadata.xml:
+  Take package, bump to EAPI=5
 
   02 Jun 2013; Pacho Ramos <pacho@gentoo.org> -ramspeed-3.5.0.ebuild,
   metadata.xml:
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index 9c9acca9e694..301759fa932a 100644
--- a/app-benchmarks/ramspeed/Manifest
+++ b/app-benchmarks/ramspeed/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ramsmp-3.5.0.tar.gz 79481 SHA256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e WHIRLPOOL 2e35adb0aa58a2d5ec81d64ab50bcfc3a7c831798aa13c62d80d2bfb907dcb048087047fd68fe9e7ccbd838848235bca5ee44ba6b203ac07c9945a7ea88a7447
 DIST ramspeed-2.6.0.tar.gz 77531 SHA256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 SHA512 9866e5525e0a9df1ab6a0e92085addfed50a987fb335d9127835ca0fb890f7614ad51bec15b7148648bbce8b4709b4f45114a51585bf0e881be56402934abdc4 WHIRLPOOL 04ab501739fa1ff9efd9c8fd371ddad9d907b38eae1e14d0228f28e955ccbdb944545ec2805cc33a3b27bdbe87bafd661ebd4ccebdb1faddb225ba8920063c57
 EBUILD ramspeed-2.6.0.ebuild 1173 SHA256 98fa701c7c63ef5354bc1a829d7f3569d5c6778dc7bd9393c286db2ec929cb85 SHA512 2197eda573b43749e2d03aded553101e5fd6f1bafbcccb85eca5900b9151a38b4b76242fd6ba4ca49c16fc0e6f5eb442558d528c2e804ed1276b9c0fa089c41f WHIRLPOOL fc64d32e7f0bbac3ced8c7f3a6d95354ef5b3f11fa6b161a47449a3fbae7fd92d93d123441e9c364860fd6b924421a779bd582231e4d27cccd8828e024fb3493
 EBUILD ramspeed-3.5.0-r1.ebuild 1490 SHA256 de0389a77de06ce0967eed223a4ea4936249ffbb7cf8a09e1fbfde9a327dc794 SHA512 6906c86666c49850d9dc34703fe4ce38253a9866e73c26dcd4c4d6c38f60b538fcc6b292b4c62bf9f41f99e67d2b5db22d524880131a23b6e101a9851a86cafa WHIRLPOOL 2819c6c71ca53774713ff0bfab0f8d6e04539c94f0cd2502f323bf418ecc0970401c50afa011d96d47d67ba1e9a5e9feb2b89de2427aa042096030150525066c
-MISC ChangeLog 1700 SHA256 cdc02164f7d85d1151b6e67f165dcfad316685a05ec5980c2884c7184149ea22 SHA512 57f028f7795895387d786939b00305b16a23b483967238920178709ea15565f383f51f2651f446d63fe410748f108cf46fddbed14f95095d6229157a6058dedc WHIRLPOOL 10a2999c3ec7528d3675e393de73f31497d064bda8a9a2850c16938171a50eb7052510d60e734f27cb6f8b0b789c35899884d1b8058a4417a9d2e51b24a5e313
-MISC metadata.xml 363 SHA256 825aa11dbcebcf58d9cc747707561debcded7aee6d9e020bc80e122f7bba3b62 SHA512 47058be873e49f1ce8266275407c900a02ae04a417424684b9ccc10900bce1a5594f411b1191221f5f2849fd40d46372e5c3c13ec8121a3d619b8525ede2fe98 WHIRLPOOL 5415909312118d3ed481e7218450b4cfc9cbbad9978124c1c3d234842a359d0711c32a9cb39135af513f41f65426aaee9235e182fe7a4e894bb79754b9e11805
+EBUILD ramspeed-3.5.0-r2.ebuild 1438 SHA256 ae60d5caf4bc8a49e358bed4bd52565d352cf5fd4123692873b0fb9ad4a55406 SHA512 dc8d73ab9668002b05929172cca27268d40412e592e28556ef656e4aed4d24583f2e2e4148e8de33906dd07c60766066b7b4129a5a8f2f25edbbb4df7730e907 WHIRLPOOL 7d660738357b9561e1ac5c079de5b5edf1165b840d46d531bc8c050d38df4565c7890bf109e19091e3b9f043bd2cddba62e7fdf78eccbe04de397ffe2531a9a4
+MISC ChangeLog 1855 SHA256 1836945e091011daef95c1eb55fe9bff207ffa5c59fab4f50376f0d6e853f00c SHA512 b7b2675aee14c1cc280a27e7c2a819843c1bc59b306b1d6f2c819cdba1bea70e7da4e3fd309ef8047ad78255b234cffea2ac57bcd59c6ca70beef5d4da98c600 WHIRLPOOL ec867170b51d806e20a28e6631f53c6fff97c21c0ebd226fb1064cca6d29999986bd96369eb1b87c017a2bd82c54f529344a45cb75f2e7578d31373f426921ec
+MISC metadata.xml 340 SHA256 4bca187b812047401fab27def4f9a24102f66ae1ceb38b36d3075c6f816b2a74 SHA512 c2c03cf19477f55d9734108cdf9cf20795e53f903fac6ae8ec250800280feec9c43581aac0e01750681ce6e9e461a725df1eabc8890eb2a544eddd48ef615805 WHIRLPOOL 46518e1ae9080edd9f00f947bce3f60771e5314a9d2951ef50faa7734d1b077b0f7cafe4ddcd6411df7f22a6250dbb5e674e93deccdaace2b86f61318b6c9fc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGrJBgACgkQCaWpQKGI+9R/0gCcCZ/810eM+0uQwwq9FR2yYaN2
-QpkAni9HUJfZl3s8A8vg5/10V4UJ+g9E
-=IAgC
+iEYEAREKAAYFAlGrK0IACgkQgAnW8HDreRaOuwCcC2VbqdNyOpAdpdQzRvEZyKBQ
+xXMAniAdnMLMlO3hEmx4hMXu+trjeFx/
+=YIH3
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/ramspeed/metadata.xml b/app-benchmarks/ramspeed/metadata.xml
index c4697c5602cf..2283e9816ae7 100644
--- a/app-benchmarks/ramspeed/metadata.xml
+++ b/app-benchmarks/ramspeed/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
-	<use>
-		<flag name='pic'>Force shared libraries to be built as PIC (this is slower)</flag>
-	</use>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <use>
+    <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
new file mode 100644
index 000000000000..5c6e003475d4
--- /dev/null
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild,v 1.1 2013/06/02 11:23:45 jlec Exp $
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="ramsmp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Benchmarking for memory and cache"
+HOMEPAGE="http://www.alasir.com/software/ramspeed/"
+SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Alasir"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sse pic"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	local obj
+	local arch_prefix=./
+
+	use x86 && arch_prefix=i386/
+	use amd64 && arch_prefix=amd64/
+
+	tc-export CC AS
+
+	#fix the stack
+	append-ldflags -Wl,-z,noexecstack
+	obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
+
+	use pic && append-ldflags -nopie
+
+	if use amd64; then
+		sed -i \
+			-e 's/call.*free/call\tfree@PLT/' \
+			-e 's/call.*gettimeofday/call\tgettimeofday@PLT/' \
+			-e 's/call.*malloc/call\tmalloc@PLT/' \
+			${arch_prefix}/*.s || die
+	fi
+
+	use x86 && obj+=( ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
+
+	if use sse; then
+		use x86 && append-flags "-DLINUX -DI386_ASM"
+		use amd64 && append-flags "-DLINUX -DAMD64_ASM"
+		obj+=( ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
+	fi
+
+	echo "ramsmp: ${obj[@]}" > Makefile
+}
+
+src_install(){
+	dobin ramsmp
+	dosym ramsmp /usr/bin/ramspeed
+	dodoc HISTORY README
+}