3 files changed, 5 insertions, 112 deletions
diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog
index a3e76d107d3a..5208fd642293 100644
--- a/app-benchmarks/ramspeed/ChangeLog
+++ b/app-benchmarks/ramspeed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/ramspeed
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.13 2014/10/10 11:03:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.14 2014/10/10 11:06:43 jlec Exp $
+
+  10 Oct 2014; Justin Lecher <jlec@gentoo.org> -ramspeed-2.6.0.ebuild,
+  -ramspeed-3.5.0-r1.ebuild:
+  Drop old
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> ramspeed-3.5.0-r2.ebuild:
   Stable for x86, wrt bug #522924
diff --git a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
deleted file mode 100644
index b729bd1f6689..000000000000
--- a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v 1.5 2012/12/01 18:02:23 blueness Exp $
-
-EAPI=2
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Benchmarking for memory and cache"
-HOMEPAGE="http://www.alasir.com/software/ramspeed/"
-SRC_URI="http://www.alasir.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="Alasir"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sse"
-
-src_prepare(){
-	tc-export CC AS
-}
-
-src_configure(){
-	local obj
-	local arch_prefix=./
-
-	use x86 && arch_prefix=i386/
-	use amd64 && arch_prefix=amd64/
-
-	#fix the stack
-	append-ldflags -Wl,-z,noexecstack
-	obj=( ramspeed.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
-
-	if use x86; then
-		obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
-	fi
-
-	if use sse; then
-		use x86 && append-flags "-DLINUX -DI386_ASM"
-		use amd64 && append-flags "-DLINUX -DAMD64_ASM"
-		obj=( "${obj[@]}" ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
-	fi
-
-	echo "ramspeed: ${obj[@]}" > Makefile || die
-}
-
-src_install(){
-	dobin ${PN} || die
-	dodoc HISTORY README || die
-}
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild
deleted file mode 100644
index f7497dbe2426..000000000000
--- a/app-benchmarks/ramspeed/ramspeed-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/12/01 18:20:27 blueness Exp $
-
-EAPI="4"
-inherit flag-o-matic toolchain-funcs
-
-MY_PN="ramsmp"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-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"
-
-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 )
-
-	if use pic; then
-		append-ldflags -nopie
-	fi
-
-	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
-	fi
-
-	if use x86; then
-		obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
-	fi
-
-	if use sse; then
-		use x86 && append-flags "-DLINUX -DI386_ASM"
-		use amd64 && append-flags "-DLINUX -DAMD64_ASM"
-		obj=( "${obj[@]}" ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
-	fi
-
-	echo "ramsmp: ${obj[@]}" > Makefile
-}
-
-src_install(){
-	dobin ramsmp
-	dosym /usr/bin/ramsmp /usr/bin/ramspeed
-	dodoc HISTORY README
-}