Version bump. Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 13 insertions, 215 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index ab7722a58d82..86923e31e834 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.45 2014/08/31 03:06:02 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.46 2015/05/29 08:06:27 polynomial-c Exp $
+
+*memtest86-4.3.4 (29 May 2015)
+
+  29 May 2015; Lars Wendler <polynomial-c@gentoo.org> -memtest86-4.0.ebuild,
+  -memtest86-4.0s.ebuild, -memtest86-4.3.3.ebuild, -memtest86-4.3.3-r1.ebuild,
+  +memtest86-4.3.4.ebuild:
+  Version bump. Removed old.
 
 *memtest86-4.3.3-r2 (31 Aug 2014)
 
diff --git a/sys-apps/memtest86/memtest86-4.0.ebuild b/sys-apps/memtest86/memtest86-4.0.ebuild
deleted file mode 100644
index bb54475a9a03..000000000000
--- a/sys-apps/memtest86/memtest86-4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.0.ebuild,v 1.1 2011/06/15 04:55:11 jer Exp $
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="serial"
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.0-build.patch #66630
-
-	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_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 "    > title=Memtest86"
-	einfo "    > root (hd?,?)"
-	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.0s.ebuild b/sys-apps/memtest86/memtest86-4.0s.ebuild
deleted file mode 100644
index 26364ae54620..000000000000
--- a/sys-apps/memtest86/memtest86-4.0s.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.0s.ebuild,v 1.1 2012/07/02 11:00:47 flameeyes Exp $
-
-EAPI=4
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="serial"
-
-BOOTDIR=/boot/memtest86
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0-build.patch #66630
-
-	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
-
-	cat - > "${T}"/39_${PN} <<EOF
-#!/bin/sh
-exec tail -n +3 \$0
-
-menuentry "${PN} ${PV}" {
-	linux16 ${BOOTDIR}/memtest
-}
-EOF
-
-	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 "${T}"/39_${PN}
-
-	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
-}
diff --git a/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild b/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild
deleted file mode 100644
index 7f18d80dc30b..000000000000
--- a/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.3.3-r1.ebuild,v 1.1 2013/10/10 20:53:29 blueness Exp $
-
-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}"/${P}-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
-
-	cat - > "${T}"/39_${PN} <<EOF
-#!/bin/sh
-exec tail -n +3 \$0
-
-menuentry "${PN} ${PV}" {
-	linux16 ${BOOTDIR}/memtest
-}
-EOF
-
-	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 "${T}"/39_${PN}
-
-	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
-}
diff --git a/sys-apps/memtest86/memtest86-4.3.3.ebuild b/sys-apps/memtest86/memtest86-4.3.4.ebuild
index 1f6ec43c164e..78b8c98ee9b7 100644
--- a/sys-apps/memtest86/memtest86-4.3.3.ebuild
+++ b/sys-apps/memtest86/memtest86-4.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.3.3.ebuild,v 1.1 2013/10/10 18:38:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.3.4.ebuild,v 1.1 2015/05/29 08:06:27 polynomial-c Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/src"
 BOOTDIR=/boot/memtest86
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch #66630
+	epatch "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726
 
 	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
 
@@ -30,15 +30,6 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	cat - > "${T}"/39_${PN} <<EOF
-#!/bin/sh
-exec tail -n +3 \$0
-
-menuentry "${PN} ${PV}" {
-	linux16 ${BOOTDIR}/memtest
-}
-EOF
-
 	tc-export AS CC LD
 }
 
@@ -50,7 +41,7 @@ src_install() {
 	dosym memtest ${BOOTDIR}/memtest.bin
 
 	exeinto /etc/grub.d
-	doexe "${T}"/39_${PN}
+	doexe "${FILESDIR}"/39_memtest86
 
 	dodoc README README.build-process README.background
 }