[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mike Frysinger]

commit:     7f23083963d43401a3bd5375624d31c16c050188
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 23:23:36 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 23:24:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f230839

sys-apps/memtest+: drop version 5.01

The 5.01-r1 version is used for ~arch and we'll want to stabilize that
when the day comes, so drop the 5.01 version to keep updates simple.

 sys-apps/memtest86+/memtest86+-5.01.ebuild | 90 ------------------------------
 1 file changed, 90 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01.ebuild b/sys-apps/memtest86+/memtest86+-5.01.ebuild
deleted file mode 100644
index 88def26..0000000
--- a/sys-apps/memtest86+/memtest86+-5.01.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -e "s/scp memtest.bin root@192.168.0.12:\/srv\/tftp\/mt86plus//g" -i Makefile
-	epatch "${FILESDIR}/${P}-gcc-473.patch" \
-		   "${FILESDIR}/${P}-hardcoded_cc.patch"
-
-	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
-}
-
-menuentry "${PN} ${PV} (netbsd)" {
-	insmod bsd
-	knetbsd ${BOOTDIR}/memtest.netbsd
-}
-EOF
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${T}"/39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-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.d/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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mike Frysinger]

commit:     a43bc15ed29f659a2b70164b032fb686fcdc2869
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 15:29:04 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 15:29:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43bc15e

sys-apps/memtest86+: avoid use of gold linker #580212

 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 7470da9783..d4f269e0c4 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -39,7 +39,10 @@ src_prepare() {
 			config.h \
 			|| die "sed failed"
 	fi
+}
 
+src_configure() {
+	tc-ld-disable-gold #580212
 	tc-export AS CC LD
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mike Frysinger]

commit:     b3ca615823c5b0ec731a4e0045c80492690d9597
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 23:28:01 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:36:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ca6158

sys-apps/memtest86+: add USE=iso for building+installing a bootable ISO image

 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 13 +++++++++++--
 sys-apps/memtest86+/metadata.xml              |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 88964bdaa1a..2b3c9eba4f6 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -12,14 +12,14 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
+IUSE="floppy iso serial"
 
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
 
 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
-DEPEND=""
+DEPEND="iso? ( app-cdr/cdrtools )"
 
 src_prepare() {
 	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
@@ -32,6 +32,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
 	epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
 
+	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
 	if use serial ; then
 		sed -i \
 			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
@@ -45,10 +46,18 @@ src_configure() {
 	tc-export AS CC LD
 }
 
+src_compile() {
+	emake
+	if use iso ; then
+		./makeiso.sh || die
+	fi
+}
+
 src_test() { :; }
 
 src_install() {
 	insinto ${BOOTDIR}
+	use iso && newins mt*.iso memtest.iso
 	newins memtest.bin memtest
 	newins memtest memtest.netbsd
 	dosym memtest ${BOOTDIR}/memtest.bin

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index f10d5787ac5..fc17238d117 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -8,5 +8,6 @@
 <use>
 	<flag name="serial">Compile with serial console support</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
+	<flag name="iso">Compile an ISO image</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mike Frysinger]

commit:     e0dbbc96316a0e9f8074e9e7074a58cc651e0667
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 07:45:11 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 07:45:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dbbc96

sys-apps/memtest86+: update bootloader details #612676

 sys-apps/memtest86+/memtest86+-5.01-r3.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
index 36d52d85693..54b1ab6e21d 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
@@ -61,7 +61,7 @@ src_install() {
 	doins memtest memtest.bin
 
 	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
+	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
 
 	dodoc README README.build-process FAQ changelog
 
@@ -73,10 +73,9 @@ src_install() {
 
 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 "memtest86+ has been installed in ${BOOTDIR}/"
+	elog "You may wish to update your bootloader configs by adding these lines:"
 	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
 	elog "   as /etc/grub.d/39_${PN}"
 	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
@@ -86,5 +85,6 @@ pkg_postinst() {
 	elog " - For lilo:"
 	elog "    > image  = ${BOOTDIR}/memtest.bin"
 	elog "    > label  = ${PN}"
-	elog
+	elog ""
+	elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Agostino Sarubbo]

commit:     94be4405a7eb7bf72727124828150029e44fba3b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:13:40 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:13:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94be4405

sys-apps/memtest86+: amd64 stable wrt bug #609100

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 2b3c9eba4f6..510138aaf52 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="floppy iso serial"
 
 BOOTDIR=/boot/memtest86plus

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Agostino Sarubbo]

commit:     a8cbda8ceef723595ce1d3c78a3e44af6730c16e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:24:41 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:26:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cbda8c

sys-apps/memtest86+: x86 stable wrt bug #609100

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 510138aaf52..70ce682ffff 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="floppy iso serial"
 
 BOOTDIR=/boot/memtest86plus

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Aaron Bauman]

commit:     8119f00b6bb8e7df006dc1ca642f5a8bfe1a88e4
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 00:02:39 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 02:58:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8119f00b

sys-apps/memtest86+: drop old EAPI

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/memtest86+/Manifest               |  2 -
 sys-apps/memtest86+/memtest86+-2.01.ebuild | 57 ----------------------
 sys-apps/memtest86+/memtest86+-4.00.ebuild | 76 ------------------------------
 3 files changed, 135 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 28945ab7200..e971494b5a7 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,2 @@
-DIST memtest86+-2.01.tar.gz 165984 BLAKE2B 6d339755472515734a74216d50d9b5f716439ffeb710cc11cec466b60d1ae0679e28fc10e0fb9a173e853193a998be88459f9fca8b2cac07cb108667d8a36844 SHA512 fb8fd8f7e3f597701a031189c18bd95247fe1fc936838359411a32a24fb8845a0012ebd2e02bb399fad1fab0f493dbe475a3e646c272d10e6343af4646d8347b
-DIST memtest86+-4.00.tar.gz 270327 BLAKE2B af33ecc65e2418d84a008f659c1c5fa5949c2b16963da08c1f15cfc89681c6900d46d9f3d15d9beb545eedbb641c174c37a53b1a6ebef63a7b9ff9d7034f28b8 SHA512 3d2075ec5fe18ce356f75bf473aa189ba6153269c63be263f13e7d553f468a57f147f1e62dad16ad9ec4fb57724e1c67c69eeffb33db3e1f6300357f26b586ba
 DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7

diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
deleted file mode 100644
index 2051cc102de..00000000000
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${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}-2.01-hardcoded_cc.patch
-	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	if use serial ; then
-		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	doins memtest.bin || die
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86plus/"
-	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=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest.bin"
-
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest.bin"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}

diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
deleted file mode 100644
index 354fe5b3134..00000000000
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-QA_PRESTRIPPED=/boot/memtest86plus/memtest
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy serial"
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.00-hardcoded_cc.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	sed -i -e's/$(LD) -s /$(LD) /' Makefile
-	sed -i -e's,0x10000,0x100000,' memtest.lds
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	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=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Richard Farina]

commit:     6ce05dd6b231bcd06f833fb0449eab39b11fce1e
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 19:50:37 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 19:54:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce05dd6

sys-apps/memtest86+: install to /usr/share/${PN}

make the files available without forcing mount of /boot,
mostly for the purposes of catalyst. committed with permission
of floppym

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...6+-5.01-r3.ebuild => memtest86+-5.01-r4.ebuild} | 66 +++++++++++++++-------
 sys-apps/memtest86+/metadata.xml                   |  3 +-
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
similarity index 56%
rename from sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
rename to sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 54b1ab6e21d..e9528e637a8 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit mount-boot eutils toolchain-funcs
 
@@ -12,15 +12,19 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy iso serial"
+IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest"
+QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
 src_prepare() {
 	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
 	epatch "${FILESDIR}/${P}-gcc-473.patch" \
@@ -39,6 +43,7 @@ src_prepare() {
 			config.h \
 			|| die "sed failed"
 	fi
+	default
 }
 
 src_configure() {
@@ -56,7 +61,12 @@ src_compile() {
 src_test() { :; }
 
 src_install() {
-	insinto "${BOOTDIR}"
+	if use boot; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
 	use iso && newins mt*.iso memtest.iso
 	doins memtest memtest.bin
 
@@ -71,20 +81,34 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
 pkg_postinst() {
-	mount-boot_pkg_postinst
-
-	elog "memtest86+ has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest.bin"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest.bin"
-	elog "    > label  = ${PN}"
-	elog ""
-	elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs by adding these lines:"
+		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+		elog "   as /etc/grub.d/39_${PN}"
+		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+		elog "    > title=${PN}"
+		elog "    > root (hd?,?)"
+		elog "    > kernel ${BOOTDIR}/memtest.bin"
+		elog " - For lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
 }

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index fc17238d117..1745d86466f 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -6,8 +6,9 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="serial">Compile with serial console support</flag>
+	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
 	<flag name="iso">Compile an ISO image</flag>
+	<flag name="serial">Compile with serial console support</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Thomas Deutschmann]

commit:     5ab8a514e989f39b21ef97033902ff15e07934cf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 22:18:31 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 22:18:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab8a514

sys-apps/memtest86+: x86 stable (bug #662948)

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index e9528e637a8..1e94fe93168 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mikle Kolyada]

commit:     5a802d81c6f16901c6da9eeae3876006baa6b369
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 21:56:14 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 21:56:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a802d81

sys-apps/memtest86+: amd64 stable wrt bug #662948

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 1e94fe93168..ad766837ca1 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Mikle Kolyada]

commit:     a5e9af0e169be3e4481fc1902d5198409f3db304
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 07:43:23 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 07:43:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e9af0e

sys-apps/memtest86+: Drop non-existing dep

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-4.20-r1.ebuild | 4 ++--
 sys-apps/memtest86+/memtest86+-4.20-r3.ebuild | 4 ++--
 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 4 ++--
 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
index b7a2c8ac38b..ef79c442e7a 100644
--- a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE="floppy serial"
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND=""
 
 src_prepare() {

diff --git a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
index 6c1705fa9a2..5ad27dd25b9 100644
--- a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE="floppy serial"
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND=""
 
 src_prepare() {

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 70ce682ffff..47ecffb4628 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,7 +18,7 @@ BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
 src_prepare() {

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index ad766837ca1..08cf34af541 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ BOOTDIR="/boot/memtest86plus"
 QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Aaron Bauman]

commit:     0495f2956d381e02ea0ec4f37c0df6fb7284fb5a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 19:47:02 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 19:58:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0495f295

sys-apps/memtest86+: drop old EAPI

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sys-apps/memtest86+/Manifest                  |  1 -
 sys-apps/memtest86+/memtest86+-4.20-r1.ebuild | 87 -------------------------
 sys-apps/memtest86+/memtest86+-4.20-r3.ebuild | 73 ---------------------
 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 92 ---------------------------
 4 files changed, 253 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index e971494b5a7..95326fdd945 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1 @@
-DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7

diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
deleted file mode 100644
index ef79c442e7a..00000000000
--- a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
-
-	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
-}
-
-menuentry "${PN} ${PV} (netbsd)" {
-	insmod bsd
-	knetbsd ${BOOTDIR}/memtest.netbsd
-}
-EOF
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${T}"/39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-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.d/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.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
deleted file mode 100644
index 5ad27dd25b9..00000000000
--- a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
-
-	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
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-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.d/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+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
deleted file mode 100644
index 47ecffb4628..00000000000
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy iso serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="iso? ( app-cdr/cdrtools )"
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	epatch "${FILESDIR}/${P}-gcc-473.patch" \
-		   "${FILESDIR}/${P}-hardcoded_cc.patch"
-	epatch "${FILESDIR}"/${P}-no-scp.patch
-	epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
-	epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
-	epatch "${FILESDIR}"/${P}-no-clean.patch #557890
-	epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
-	epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
-
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	use iso && newins mt*.iso memtest.iso
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-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.d/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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     8c27c4adb3d465c4dcd44085d9ce05938009b3b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 14:00:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 19:01:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c27c4ad

sys-apps/memtest86+: eutils->epatch

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 4 ++--
 sys-apps/memtest86+/memtest86+-5.01-r5.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 08cf34af541..d10fc874b00 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit mount-boot eutils toolchain-funcs
+inherit mount-boot epatch toolchain-funcs
 
 DESCRIPTION="Memory tester based on memtest86"
 HOMEPAGE="http://www.memtest.org/"

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
index 35c3e1085fa..28e4fdcc454 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit mount-boot eutils toolchain-funcs
+inherit mount-boot epatch toolchain-funcs
 
 DESCRIPTION="Memory tester based on memtest86"
 HOMEPAGE="http://www.memtest.org/"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Agostino Sarubbo]

commit:     43655f583133d059dc9ad56f75bf9b209aee89d7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 22:25:54 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 23 22:27:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43655f58

sys-apps/memtest86+: amd64 stable wrt bug #791631

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
index 28e4fdcc454..4ae0c9e5ea1 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Agostino Sarubbo]

commit:     94b8f8d59845056dc5f776c683d0945706b54a71
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 23:03:39 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 23 23:03:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b8f8d5

sys-apps/memtest86+: x86 stable wrt bug #791631

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
index 4ae0c9e5ea1..e47609b69d5 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[David Seifert]

commit:     1de888535d7c255762e0fbcd50a119ac53f31f54
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 08:33:14 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:33:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de88853

sys-apps/memtest86+: drop 5.01-r4

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 114 --------------------------
 1 file changed, 114 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
deleted file mode 100644
index d10fc874b00..00000000000
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit mount-boot epatch toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="iso? ( app-cdr/cdrtools )"
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	epatch "${FILESDIR}/${P}-gcc-473.patch" \
-		   "${FILESDIR}/${P}-hardcoded_cc.patch"
-	epatch "${FILESDIR}"/${P}-no-scp.patch
-	epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
-	epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
-	epatch "${FILESDIR}"/${P}-no-clean.patch #557890
-	epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
-	epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
-
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs by adding these lines:"
-		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-		elog "   as /etc/grub.d/39_${PN}"
-		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-		elog "    > title=${PN}"
-		elog "    > root (hd?,?)"
-		elog "    > kernel ${BOOTDIR}/memtest.bin"
-		elog " - For lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Lars Wendler]

commit:     5640462aca8e127a04d6cf13696b83c16bc0a763
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 13:21:46 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 13:22:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5640462a

sys-apps/memtest86+: update EAPI 6 -> 7

Minor ebuild tweaks

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b.ebuild b/sys-apps/memtest86+/memtest86+-5.31b.ebuild
index 5e14a51127a..8397e450b0d 100644
--- a/sys-apps/memtest86+/memtest86+-5.31b.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.31b.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit mount-boot eutils toolchain-funcs
 
@@ -19,7 +19,8 @@ QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
 RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="iso? ( app-cdr/cdrtools )"
+DEPEND="${RDEPEND}"
+BDEPEND="iso? ( app-cdr/cdrtools )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc-473.patch"
@@ -38,10 +39,8 @@ src_prepare() {
 	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
 
 	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
+		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h || die "sed failed"
 	fi
 	default
 }
@@ -61,7 +60,7 @@ src_compile() {
 src_test() { :; }
 
 src_install() {
-	if use boot; then
+	if use boot ; then
 		insinto "${BOOTDIR}"
 		doins memtest memtest.bin
 	fi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     18108d245260122c70fb587a4eac2f5bb9486b28
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 14:45:07 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 14:56:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18108d24

sys-apps/memtest86+: update postinst bootloader messages

Closes: https://bugs.gentoo.org/727252
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
index b56de8634e5..837f2657465 100644
--- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
@@ -90,14 +90,10 @@ pkg_postinst() {
 		mount-boot_pkg_postinst
 
 		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs by adding these lines:"
-		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-		elog "   as /etc/grub.d/39_${PN}"
-		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-		elog "    > title=${PN}"
-		elog "    > root (hd?,?)"
-		elog "    > kernel ${BOOTDIR}/memtest.bin"
-		elog " - For lilo:"
+		elog "You may wish to update your bootloader configs:"
+		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
+		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
+		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
 		elog "    > image  = ${BOOTDIR}/memtest.bin"
 		elog "    > label  = ${PN}"
 		elog ""

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     dbcddac461dd1c09921eef5f2b8fcdb7ac142077
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 14:55:19 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 14:56:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcddac4

sys-apps/memtest86+: warn of EFI incompatibility

Closes: https://bugs.gentoo.org/698892

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
index 837f2657465..f1d2ec75917 100644
--- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
@@ -99,6 +99,10 @@ pkg_postinst() {
 		elog ""
 		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
 	fi
+
+	if use boot && [ -e /sys/firmware/efi ]; then
+		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
+	fi
 }
 
 pkg_prerm() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[David Seifert]

commit:     69c646af21395ad5101b8e172067363e57ea331b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 11:27:54 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 11:27:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c646af

sys-apps/memtest86+: drop 5.31b

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b.ebuild | 113 ----------------------------
 1 file changed, 113 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b.ebuild b/sys-apps/memtest86+/memtest86+-5.31b.ebuild
deleted file mode 100644
index 49977f115b9..00000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs by adding these lines:"
-		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-		elog "   as /etc/grub.d/39_${PN}"
-		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-		elog "    > title=${PN}"
-		elog "    > root (hd?,?)"
-		elog "    > kernel ${BOOTDIR}/memtest.bin"
-		elog " - For lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     e8b0a81cd8c7f235b2dc86ec8e505f750139509f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 16:05:56 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 16:16:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b0a81c

sys-apps/memtest86+: take package

Previously ack'd by base-system members

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 8fcf6696aae3..359afa21d566 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
+<maintainer type="person">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
 </maintainer>
 <use>
 	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     aee0712e4c0cf7c15440ebfca9eff372ce93d2b1
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 16:13:41 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 16:16:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee0712e

sys-apps/memtest86+: attempt fix for "oversized on x86_64"

Fix from https://bugzilla.redhat.com/show_bug.cgi?id=620846#c10

Bug: https://bugs.gentoo.org/613196

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild | 116 +++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
new file mode 100644
index 000000000000..3962c3e9f986
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+boot floppy iso serial"
+
+BOOTDIR="/boot/memtest86plus"
+QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+
+RDEPEND="floppy? ( sys-fs/mtools )"
+DEPEND="${RDEPEND}"
+BDEPEND="iso? ( app-cdr/cdrtools )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-473.patch"
+	"${FILESDIR}/${P}-hardcoded_cc.patch"
+	"${FILESDIR}/${P}-no-clean.patch" #557890
+	"${FILESDIR}/${P}-objcopy.patch"
+	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
+	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
+)
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
+
+	if use serial ; then
+		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h || die "sed failed"
+	fi
+	#613196
+	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
+	default
+}
+
+src_configure() {
+	tc-ld-disable-gold #580212
+	tc-export AS CC LD
+}
+
+src_compile() {
+	emake OBJCOPY="$(tc-getOBJCOPY)"
+	if use iso ; then
+		./makeiso.sh || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	if use boot ; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
+	use iso && newins mt*.iso memtest.iso
+	doins memtest memtest.bin
+
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs:"
+		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
+		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
+		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+
+	if use boot && [ -e /sys/firmware/efi ]; then
+		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     e31b337e39136bb119ac45d63e1dcbb99ba55790
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 15:48:36 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 16:13:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31b337e

sys-apps/memtest86+: drop old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild | 114 ------------------------
 sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild | 116 -------------------------
 2 files changed, 230 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
deleted file mode 100644
index f1d2ec759176..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
deleted file mode 100644
index 3962c3e9f986..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	#613196
-	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     35c3e3f5281fd552b72336e05dfbf248848b4159
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 12:23:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 12:23:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c3e3f5

sys-apps/memtest86+: Stabilize 5.31b-r3 x86, #831406

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
index 0f4d42d4cf5b..77e7831ed564 100644
--- a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     ef60a261d6241e8625164fa6049e14d16be3ea0e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 12:23:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 12:23:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef60a261

sys-apps/memtest86+: Stabilize 5.31b-r3 amd64, #831406

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
index 2b8bb4cbb296..0f4d42d4cf5b 100644
--- a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     bee01f461af14c353ba5e9c38bc4c8fcf9632132
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 16:03:58 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 16:04:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee01f46

sys-apps/memtest86+: keyword 6.00_beta2 for ~amd64, ~x86

Closes: https://bugs.gentoo.org/851264

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index 0463eb856f04..2107fd4d4b8f 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     9848a4c79182a5c4c3738c5559fcc36c0b55a08d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 15:09:55 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 15:42:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9848a4c7

sys-apps/memtest86+: fix minor use-conditional typo

Closes: https://bugs.gentoo.org/855143

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index 2107fd4d4b8f..add994f6a7ec 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -44,7 +44,7 @@ src_compile() {
 	pushd build64
 		use bios64 && emake memtest.bin
 		use efi64 && emake memtest.efi
-		use iso32 && emake iso
+		use iso64 && emake iso
 	popd
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     8408b03ac54f257822ef6a180ec7dd7fe46167f3
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 15:35:44 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 15:36:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8408b03a

sys-apps/memtest86+: fix direct objcopy call, re-organize seds

Closes: https://bugs.gentoo.org/855167

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index add994f6a7ec..9738d6afa80e 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit mount-boot
+inherit mount-boot toolchain-funcs
 
 MY_PV=${PV/_/-}
 
@@ -29,12 +29,17 @@ BDEPEND="
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
 src_prepare() {
-	sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die
-	sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		build{32,64}/Makefile || die
 	default
 }
 
 src_compile() {
+	tc-export OBJCOPY
 	pushd build32
 		use bios32 && emake memtest.bin
 		use efi32 && emake memtest.efi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     ab4fb22897c589dd3c33e7de4f99c10eade2ec9d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 12:00:43 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 12:01:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab4fb228

sys-apps/memtest86+: fix direct size call

Closes: https://bugs.gentoo.org/855587

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index 9738d6afa80e..eb5778e25fdf 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -34,12 +34,14 @@ src_prepare() {
 		-e 's/^AS = as/AS +=/' \
 		-e '/^CC/d' \
 		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
 		build{32,64}/Makefile || die
 	default
 }
 
 src_compile() {
 	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
 	pushd build32
 		use bios32 && emake memtest.bin
 		use efi32 && emake memtest.efi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     bf82a3afbc0644119166467cba6261d93594810e
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 13:45:53 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 13:47:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf82a3af

sys-apps/memtest86+: add 6.00_beta3

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest                     |  1 +
 sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild | 78 ++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 30e66ca497f9..a6650a1c9a2c 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,3 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
+DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild
new file mode 100644
index 000000000000..eb5778e25fdf
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     9122354e4e15579295adef3b96fe117974da3878
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 15:14:25 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 15:14:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9122354e

sys-apps/memtest86+: drop 6.00_beta2

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest                     |  1 -
 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 78 ------------------------
 2 files changed, 79 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a6650a1c9a2c..830771aa97df 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,3 +1,2 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
-DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
 DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
deleted file mode 100644
index eb5778e25fdf..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     0def347951fcf06b101886535fad2b6d85d84a8f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 12:59:22 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 12:59:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0def3479

sys-apps/memtest86+: add 6.00

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  1 +
 sys-apps/memtest86+/memtest86+-6.00.ebuild | 78 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 830771aa97df..1376f06967a0 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,3 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
 DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25

diff --git a/sys-apps/memtest86+/memtest86+-6.00.ebuild b/sys-apps/memtest86+/memtest86+-6.00.ebuild
new file mode 100644
index 000000000000..eb5778e25fdf
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.00.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     a4f8971b846b6ae2c64b95f70d7821769bc38672
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 18:01:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 18:01:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f8971b

sys-apps/memtest86+: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index dd0c79050ba4..814c43bc7044 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -17,4 +17,7 @@
 	<flag name="iso64">Compile a 64bit ISO image</flag>
 	<flag name="serial">Compile with serial console support</flag>
 </use>
+<upstream>
+	<remote-id type="github">memtest86plus/memtest86plus</remote-id>
+</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     94c16400de92395124243d987c5e45814b8acf0d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 15:36:33 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 15:36:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c16400

sys-apps/memtest86+: drop 6.00_beta3

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest                     |  1 -
 sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild | 78 ------------------------
 2 files changed, 79 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 1376f06967a0..7741e5497cfd 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,3 +1,2 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
-DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25

diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild
deleted file mode 100644
index eb5778e25fdf..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     fb464dce38190949116e61f79822e170319b7d68
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 00:51:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 00:51:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb464dce

sys-apps/memtest86+: Stabilize 6.00 x86, #883453

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.00.ebuild b/sys-apps/memtest86+/memtest86+-6.00.ebuild
index eb5778e25fdf..6e6c92c0f1ce 100644
--- a/sys-apps/memtest86+/memtest86+-6.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     ec41caf4cfc2b4d298129ff78daee2be3875012f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 00:51:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 00:51:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec41caf4

sys-apps/memtest86+: Stabilize 6.00 amd64, #883453

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.00.ebuild b/sys-apps/memtest86+/memtest86+-6.00.ebuild
index 6e6c92c0f1ce..ca182c9a4719 100644
--- a/sys-apps/memtest86+/memtest86+-6.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     346143d341e738b8e0bb59a763eb11e4588495fe
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 15:58:50 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 15:58:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346143d3

sys-apps/memtest86+: add 6.01

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  1 +
 sys-apps/memtest86+/memtest86+-6.01.ebuild | 78 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 7741e5497cfd..6ce961d8ffb4 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,3 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
+DIST memtest86+-6.01.tar.gz 224548 BLAKE2B 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 SHA512 a80256e2cfdad927d55a2f67d65255f90e911e8bfb59d9da841482ddeca7f3cf767b029c299aca8076c9bd2b9ee71671bb768b551a7ea041009bb89ebec927dc

diff --git a/sys-apps/memtest86+/memtest86+-6.01.ebuild b/sys-apps/memtest86+/memtest86+-6.01.ebuild
new file mode 100644
index 000000000000..eb5778e25fdf
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.01.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     ac92bfcb77d9ca3b57502e86bb7c149c0be3c226
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 12:48:52 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 13:02:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac92bfcb

sys-apps/memtest86+: stabilize 6.01 for amd64, x86

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.01.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.01.ebuild b/sys-apps/memtest86+/memtest86+-6.01.ebuild
index eb5778e25fdf..9eeab59f5362 100644
--- a/sys-apps/memtest86+/memtest86+-6.01.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     e5862e0cebb03110a03b15002720d77392ef450a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 13:34:29 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 13:35:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5862e0c

sys-apps/memtest86+: add 6.10

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  1 +
 sys-apps/memtest86+/memtest86+-6.10.ebuild | 78 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 6ce961d8ffb4..406298970976 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,3 +1,4 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
 DIST memtest86+-6.01.tar.gz 224548 BLAKE2B 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 SHA512 a80256e2cfdad927d55a2f67d65255f90e911e8bfb59d9da841482ddeca7f3cf767b029c299aca8076c9bd2b9ee71671bb768b551a7ea041009bb89ebec927dc
+DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42

diff --git a/sys-apps/memtest86+/memtest86+-6.10.ebuild b/sys-apps/memtest86+/memtest86+-6.10.ebuild
new file mode 100644
index 000000000000..ba53cf25aeee
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Arthur Zamarin]

commit:     99dec66be0938c40914ba6ac271612bafb3cd202
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 16:12:42 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 16:12:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dec66b

sys-apps/memtest86+: Stabilize 6.10 amd64, #903583

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.10.ebuild b/sys-apps/memtest86+/memtest86+-6.10.ebuild
index ba53cf25aeee..0269bfc4a7ca 100644
--- a/sys-apps/memtest86+/memtest86+-6.10.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Sam James]

commit:     24082d7128dd97687f4f127c11a8d5e2d5f0689c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 16:42:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 16:42:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24082d71

sys-apps/memtest86+: Stabilize 6.10 x86, #903583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.10.ebuild b/sys-apps/memtest86+/memtest86+-6.10.ebuild
index 0269bfc4a7ca..9eeab59f5362 100644
--- a/sys-apps/memtest86+/memtest86+-6.10.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     e42787189df1f37a734967fc06ffbc679054ae3a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:57:21 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:57:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4278718

sys-apps/memtest86+: drop 6.00, 6.01

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  2 -
 sys-apps/memtest86+/memtest86+-6.00.ebuild | 78 ------------------------------
 sys-apps/memtest86+/memtest86+-6.01.ebuild | 78 ------------------------------
 3 files changed, 158 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 406298970976..be3f4b764570 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,2 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
-DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
-DIST memtest86+-6.01.tar.gz 224548 BLAKE2B 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 SHA512 a80256e2cfdad927d55a2f67d65255f90e911e8bfb59d9da841482ddeca7f3cf767b029c299aca8076c9bd2b9ee71671bb768b551a7ea041009bb89ebec927dc
 DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42

diff --git a/sys-apps/memtest86+/memtest86+-6.00.ebuild b/sys-apps/memtest86+/memtest86+-6.00.ebuild
deleted file mode 100644
index ca182c9a4719..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.00.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

diff --git a/sys-apps/memtest86+/memtest86+-6.01.ebuild b/sys-apps/memtest86+/memtest86+-6.01.ebuild
deleted file mode 100644
index 9eeab59f5362..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.01.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     f8dd85e572a653b76c3035ab22afc0cec5841360
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 14:37:29 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 10 18:02:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8dd85e5

sys-apps/memtest86+: add 6.20

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  1 +
 sys-apps/memtest86+/memtest86+-6.20.ebuild | 78 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index be3f4b764570..a49e75d87f01 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,3 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
+DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0

diff --git a/sys-apps/memtest86+/memtest86+-6.20.ebuild b/sys-apps/memtest86+/memtest86+-6.20.ebuild
new file mode 100644
index 000000000000..ba53cf25aeee
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.20.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     0bd36e9baa9fc74731fc4ca2356d0ef576616612
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 13:05:13 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 19 13:05:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd36e9b

sys-apps/memtest86+: clean up USE descriptions

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 814c43bc7044..43e3311c9323 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -8,14 +8,11 @@
 <use>
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
-	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
+	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
 	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
 	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
-	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
-	<flag name="iso">Compile an ISO image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
-	<flag name="serial">Compile with serial console support</flag>
 </use>
 <upstream>
 	<remote-id type="github">memtest86plus/memtest86plus</remote-id>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     438ec162875909a0ca9a26d2b5e4f01a8bcef76e
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 13:16:23 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 19 13:16:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438ec162

sys-apps/memtest86+: don't use mount-boot functions on USE=-boot

Closes: https://bugs.gentoo.org/861749

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 90 +++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
new file mode 100644
index 000000000000..3af084f4510a
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pk_prerm
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     d70d0bf1719c88a7bd1cea94593295a244e14c10
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 13:59:46 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 13:00:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70d0bf1

sys-apps/memtest86+: stabilize 6.20-r1 for amd64, x86

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 3af084f4510a..91f60527b58c 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Andrew Ammerlaan]

commit:     aa80e1657779407b696b1ba416febdee944aa2b2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 08:42:18 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 07:48:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa80e165

sys-apps/memtest86+: use secureboot.eclass to sign efi exec

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 91f60527b58c..878d88fd8c30 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit mount-boot toolchain-funcs
+inherit mount-boot secureboot toolchain-funcs
 
 MY_PV=${PV/_/-}
 
@@ -28,6 +28,12 @@ BDEPEND="
 
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
+pkg_setup() {
+	if use efi32 || use efi64; then
+		secureboot_pkg_setup
+	fi
+}
+
 src_prepare() {
 	sed -i \
 		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
@@ -75,6 +81,10 @@ src_install() {
 	install_memtest_images
 	use iso32 && newins build32/memtest.iso memtest32.iso
 	use iso64 && newins build64/memtest.iso memtest64.iso
+
+	if use efi32 || use efi64; then
+		secureboot_auto_sign --in-place
+	fi
 }
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     852b78a4a8bc221f98ea8e295f68c5210d1deda8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 12:15:36 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 12:23:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852b78a4

sys-apps/memtest86+: drop 6.10, 6.20

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |  1 -
 sys-apps/memtest86+/memtest86+-6.10.ebuild | 78 ------------------------------
 sys-apps/memtest86+/memtest86+-6.20.ebuild | 78 ------------------------------
 3 files changed, 157 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 443b509c1c6f..a6d005be4107 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1 @@
-DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0

diff --git a/sys-apps/memtest86+/memtest86+-6.10.ebuild b/sys-apps/memtest86+/memtest86+-6.10.ebuild
deleted file mode 100644
index 9eeab59f5362..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.10.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

diff --git a/sys-apps/memtest86+/memtest86+-6.20.ebuild b/sys-apps/memtest86+/memtest86+-6.20.ebuild
deleted file mode 100644
index ba53cf25aeee..000000000000
--- a/sys-apps/memtest86+/memtest86+-6.20.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit mount-boot toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Memory tester based on PCMemTest"
-HOMEPAGE="https://www.memtest.org/"
-SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
-
-ISODEPS="
-	dev-libs/libisoburn
-	sys-fs/dosfstools
-	sys-fs/mtools
-"
-BDEPEND="
-	iso32? ( ${ISODEPS} )
-	iso64? ( ${ISODEPS} )
-"
-
-S=${WORKDIR}/memtest86plus-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
-		-e 's/^AS = as/AS +=/' \
-		-e '/^CC/d' \
-		-e 's/objcopy/$(OBJCOPY)/' \
-		-e 's/shell size/shell $(SIZE)/' \
-		build{32,64}/Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export OBJCOPY
-	export SIZE=$(tc-getPROG SIZE size)
-	pushd build32
-		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
-		use iso32 && emake iso
-	popd
-
-	pushd build64
-		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
-		use iso64 && emake iso
-	popd
-}
-
-install_memtest_images() {
-	use bios32 && newins build32/memtest.bin memtest32.bios
-	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
-}
-
-src_install() {
-	default
-	if use boot; then
-		exeinto /etc/grub.d/
-		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
-		insinto /boot/memtest86plus
-		install_memtest_images
-	fi
-
-	insinto /usr/share/${PN}
-	install_memtest_images
-	use iso32 && newins build32/memtest.iso memtest32.iso
-	use iso64 && newins build64/memtest.iso memtest64.iso
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     75d0bb1110ed26a90f3e346bf6305ebac9346117
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 14:05:53 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 14:08:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d0bb11

sys-apps/memtest86+: fix pkg_prerm typo

Closes: https://bugs.gentoo.org/920831

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 878d88fd8c30..87d164cf9ec0 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -96,5 +96,5 @@ pkg_preinst() {
 }
 
 pkg_prerm() {
-	use boot && mount-boot_pk_prerm
+	use boot && mount-boot_pkg_prerm
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Andrew Ammerlaan]

commit:     4cab02b9d854308b1471f74c083bd1db253a4ddf
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 17:13:02 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:19:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cab02b9

sys-apps/memtest86+: rename USE=efi* to USE=uefi*

Closes: https://github.com/gentoo/gentoo/pull/31881/
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-6.20-r1.ebuild | 16 ++++++++--------
 sys-apps/memtest86+/metadata.xml              |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 87d164cf9ec0..5ca6984446ce 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
 
 ISODEPS="
 	dev-libs/libisoburn
@@ -29,7 +29,7 @@ BDEPEND="
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
 pkg_setup() {
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_pkg_setup
 	fi
 }
@@ -50,13 +50,13 @@ src_compile() {
 	export SIZE=$(tc-getPROG SIZE size)
 	pushd build32
 		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
+		use uefi32 && emake memtest.efi
 		use iso32 && emake iso
 	popd
 
 	pushd build64
 		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
+		use uefi64 && emake memtest.efi
 		use iso64 && emake iso
 	popd
 }
@@ -64,8 +64,8 @@ src_compile() {
 install_memtest_images() {
 	use bios32 && newins build32/memtest.bin memtest32.bios
 	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
+	use uefi32 && newins build32/memtest.efi memtest.efi32
+	use uefi64 && newins build64/memtest.efi memtest.efi64
 }
 
 src_install() {
@@ -82,7 +82,7 @@ src_install() {
 	use iso32 && newins build32/memtest.iso memtest32.iso
 	use iso64 && newins build64/memtest.iso memtest64.iso
 
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_auto_sign --in-place
 	fi
 }

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 43e3311c9323..f79f06ed9067 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -9,8 +9,8 @@
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
 	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
-	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
-	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
+	<flag name="uefi32">Compile a EFI32-bootable 32bit memtest image</flag>
+	<flag name="uefi64">Compile a UEFI-bootable 64bit memtest image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
 </use>

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     97a624ef63d675dd06c71125cc4c46cbc2b87168
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 21:00:14 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 21:00:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a624ef

sys-apps/memtest86+: add 7.00

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/Manifest               |   1 +
 sys-apps/memtest86+/memtest86+-7.00.ebuild | 100 +++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a6d005be4107..0cdbeac150a6 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1 +1,2 @@
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
+DIST memtest86+-7.00.tar.gz 244385 BLAKE2B 608f4e31ddaee01d828cb1574086196c26f5e96c5049806ac3ab174ddf669db8cdcb8f336bec5a1ce74439d96fca505fea81311a06581bb43a8034156a4f8165 SHA512 1325ee08b280404fb47d37b62d65e51de21dd09b96bef29ece193072b09ff3c6eea8657b2e7c98801bf81ba4288c2bff580a91eb45d5a93744b0a273652266c4

diff --git a/sys-apps/memtest86+/memtest86+-7.00.ebuild b/sys-apps/memtest86+/memtest86+-7.00.ebuild
new file mode 100644
index 000000000000..88b05cadc68a
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-7.00.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot secureboot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+pkg_setup() {
+	if use uefi32 || use uefi64; then
+		secureboot_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/= objcopy/?= $(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use uefi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use uefi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use uefi32 && newins build32/memtest.efi memtest.efi32
+	use uefi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+
+	if use uefi32 || use uefi64; then
+		secureboot_auto_sign --in-place
+	fi
+}
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/

[Ben Kohler]

commit:     bb58e23c2bc491e3fe5bd38700b06ddaea8fedb6
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 15:17:54 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 15:17:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb58e23c

sys-apps/memtest86+: stabilize 7.00 for amd64, x86

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/memtest86+-7.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/memtest86+-7.00.ebuild b/sys-apps/memtest86+/memtest86+-7.00.ebuild
index 88b05cadc68a..166f6138e149 100644
--- a/sys-apps/memtest86+/memtest86+-7.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-7.00.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
 
 ISODEPS="