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
-}

Reply via email to