Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/
Date: Tue, 16 Aug 2022 15:15:03
Message-Id: 1660662865.9122354e4e15579295adef3b96fe117974da3878.bkohler@gentoo
1 commit: 9122354e4e15579295adef3b96fe117974da3878
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 16 15:14:25 2022 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 16 15:14:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9122354e
7
8 sys-apps/memtest86+: drop 6.00_beta2
9
10 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
11
12 sys-apps/memtest86+/Manifest | 1 -
13 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 78 ------------------------
14 2 files changed, 79 deletions(-)
15
16 diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
17 index a6650a1c9a2c..830771aa97df 100644
18 --- a/sys-apps/memtest86+/Manifest
19 +++ b/sys-apps/memtest86+/Manifest
20 @@ -1,3 +1,2 @@
21 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
22 -DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
23 DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25
24
25 diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
26 deleted file mode 100644
27 index eb5778e25fdf..000000000000
28 --- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
29 +++ /dev/null
30 @@ -1,78 +0,0 @@
31 -# Copyright 2022 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=8
35 -
36 -inherit mount-boot toolchain-funcs
37 -
38 -MY_PV=${PV/_/-}
39 -
40 -DESCRIPTION="Memory tester based on PCMemTest"
41 -HOMEPAGE="https://www.memtest.org/"
42 -SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~x86"
47 -IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
48 -
49 -ISODEPS="
50 - dev-libs/libisoburn
51 - sys-fs/dosfstools
52 - sys-fs/mtools
53 -"
54 -BDEPEND="
55 - iso32? ( ${ISODEPS} )
56 - iso64? ( ${ISODEPS} )
57 -"
58 -
59 -S=${WORKDIR}/memtest86plus-${MY_PV}
60 -
61 -src_prepare() {
62 - sed -i \
63 - -e 's#/sbin/mkdosfs#mkfs.vfat#' \
64 - -e 's/^AS = as/AS +=/' \
65 - -e '/^CC/d' \
66 - -e 's/objcopy/$(OBJCOPY)/' \
67 - -e 's/shell size/shell $(SIZE)/' \
68 - build{32,64}/Makefile || die
69 - default
70 -}
71 -
72 -src_compile() {
73 - tc-export OBJCOPY
74 - export SIZE=$(tc-getPROG SIZE size)
75 - pushd build32
76 - use bios32 && emake memtest.bin
77 - use efi32 && emake memtest.efi
78 - use iso32 && emake iso
79 - popd
80 -
81 - pushd build64
82 - use bios64 && emake memtest.bin
83 - use efi64 && emake memtest.efi
84 - use iso64 && emake iso
85 - popd
86 -}
87 -
88 -install_memtest_images() {
89 - use bios32 && newins build32/memtest.bin memtest32.bios
90 - use bios64 && newins build64/memtest.bin memtest64.bios
91 - use efi32 && newins build32/memtest.efi memtest.efi32
92 - use efi64 && newins build64/memtest.efi memtest.efi64
93 -}
94 -
95 -src_install() {
96 - default
97 - if use boot; then
98 - exeinto /etc/grub.d/
99 - newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
100 - insinto /boot/memtest86plus
101 - install_memtest_images
102 - fi
103 -
104 - insinto /usr/share/${PN}
105 - install_memtest_images
106 - use iso32 && newins build32/memtest.iso memtest32.iso
107 - use iso64 && newins build64/memtest.iso memtest64.iso
108 -}