6 files changed, 0 insertions, 174 deletions
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 69d723ffb5da..4fb5bc3f157d 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,3 +1 @@
-DIST memtest86-3.3.tar.gz 137922 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c SHA512 1fafd8466f5b47200e05dfb4c5726e9c076aa7f6ad7241c7ad07dc5fcd14123f557e63353a5902a6a32dc215f27d4063644bd6184650ebb72bf8d7eaab77f60e WHIRLPOOL b8237fc7ac93980021637e7a2ed2300eb8822ea1c51359e466692fea43f96b33550ac39815bd1a689f406e0d41d4ab91a6f1e8d8759378c59c9aebb1b80e50cb
-DIST memtest86-4.3.6-src.tar.gz 125475 SHA256 bbe2e2d13cd9f8a39232bd4f0fa70e01e1614515aeae7fac08755628a8d77361 SHA512 42f4478deca9550692ca36d704037b7eb85ca979a6d0f3f0ee3ed88cdfc7b10652340fc986135c3bf4403b6b6f5355f838a3cb1030758f68b2327bb1ff7030f0 WHIRLPOOL 166415dd84b8cc23958255058277d8a0ed67e351e506dfad6a119d207d436b72d7deff20db116b89bf2c82400e9a22b77554f20344cd1a838b5933671f95a53d
 DIST memtest86-4.3.7-src.tar.gz 125583 SHA256 784bf81107a8f8dbf06eadf5d8cc9f57a3249cade67c0635fea8b0e8691a96e7 SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644 WHIRLPOOL 55283adb62b47f95e689e61e3bebdb65c51712b2d54e4cae0b012ffc4bb11f68309ad2a6ed31c911586e4e5ea5261d117fa827265935ce6e4f7341c58e5dc833
diff --git a/sys-apps/memtest86/files/memtest86-3.2-solar.patch b/sys-apps/memtest86/files/memtest86-3.2-solar.patch
deleted file mode 100644
index fa7effbeaac4..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.2-solar.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	2004-11-12 07:16:25.000000000 -0500
-+++ Makefile	2005-01-10 21:35:19.000000000 -0500
-@@ -12,7 +12,7 @@
- #
- # gcc compiler options, these settings should suffice
- #
--CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
-+CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
- 
- AS=as -32
- 
-@@ -21,10 +21,13 @@
- all: memtest.bin memtest
- 
- reloc.o: reloc.c
--	$(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c
-+	$(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c -fno-stack-protector
-+
-+random.o:
-+	$(CC)  -c $(CCFLAGS) -fPIC random.c
- 
- test.o: test.c test.h defs.h config.h
--	$(CC) -c $(CCFLAGS) test.c
-+	$(CC) -c $(CCFLAGS) -fno-PIC test.c
- 
- main.o: main.c test.h defs.h
- 	$(CC) -c $(CCFLAGS) -fPIC main.c
diff --git a/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch
deleted file mode 100644
index 68fd355b2e08..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-i can only guess at what this test was trying to accomplish ...
-
-ive submitted this upstream
-
---- main.c
-+++ main.c
-@@ -465,7 +465,7 @@
- 	}
- 	compute_segments(window);
- 	window = 0;
--	for (v->pass_ticks=0, i=0; i<DEFTESTS != NULL; i++) {
-+	for (v->pass_ticks=0, i=0; i<DEFTESTS; i++) {
- 
- 		/* Test to see if this test is selected for execution */
- 		if (v->testsel >= 0) {
diff --git a/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch
deleted file mode 100644
index 397b2c8bbee7..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-sent upstream already ...
-
---- memtest_shared.lds
-+++ memtest_shared.lds
-@@ -19,6 +19,7 @@
- 	.dynsym     : { *(.dynsym) }
- 	.dynstr     : { *(.dynstr) }
- 	.hash       : { *(.hash) }
-+	.gnu.hash   : { *(.gnu.hash) }
- 	.dynamic    : { *(.dynamic) }
- 
- 	.rel.text    : { *(.rel.text   .rel.text.*) }
diff --git a/sys-apps/memtest86/memtest86-3.3.ebuild b/sys-apps/memtest86/memtest86-3.3.ebuild
deleted file mode 100644
index ce4b8e9626aa..000000000000
--- a/sys-apps/memtest86/memtest86-3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mount-boot eutils
-
-DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-3.2-solar.patch #66630
-	epatch "${FILESDIR}"/${P}-funky-test.patch
-	epatch "${FILESDIR}"/${P}-gnu-hash.patch
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-}
-
-src_install() {
-	insinto /boot/memtest86
-	doins memtest.bin || die "doins failed"
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > root (hd?,?)"
-	einfo "    > title=Memtest86"
-	einfo "    > kernel /boot/memtest86/memtest.bin"
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86/memtest.bin"
-	einfo "    > label  = Memtest86"
-	einfo
-}
diff --git a/sys-apps/memtest86/memtest86-4.3.6.ebuild b/sys-apps/memtest86/memtest86-4.3.6.ebuild
deleted file mode 100644
index b24d4d7ce609..000000000000
--- a/sys-apps/memtest86/memtest86-4.3.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="serial"
-S="${WORKDIR}/src"
-
-BOOTDIR=/boot/memtest86
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726
-
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86
-
-	dodoc README README.build-process README.background
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}