1 |
commit: 0495f2956d381e02ea0ec4f37c0df6fb7284fb5a |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 13 19:47:02 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 13 19:58:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0495f295 |
7 |
|
8 |
sys-apps/memtest86+: drop old EAPI |
9 |
|
10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
11 |
|
12 |
sys-apps/memtest86+/Manifest | 1 - |
13 |
sys-apps/memtest86+/memtest86+-4.20-r1.ebuild | 87 ------------------------- |
14 |
sys-apps/memtest86+/memtest86+-4.20-r3.ebuild | 73 --------------------- |
15 |
sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 92 --------------------------- |
16 |
4 files changed, 253 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest |
19 |
index e971494b5a7..95326fdd945 100644 |
20 |
--- a/sys-apps/memtest86+/Manifest |
21 |
+++ b/sys-apps/memtest86+/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441 |
24 |
DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7 |
25 |
|
26 |
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index ef79c442e7a..00000000000 |
29 |
--- a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,87 +0,0 @@ |
32 |
-# Copyright 1999-2019 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=4 |
36 |
- |
37 |
-inherit mount-boot eutils toolchain-funcs |
38 |
- |
39 |
-DESCRIPTION="Memory tester based on memtest86" |
40 |
-HOMEPAGE="http://www.memtest.org/" |
41 |
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="GPL-2" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="-* amd64 x86" |
46 |
-IUSE="floppy serial" |
47 |
- |
48 |
-BOOTDIR=/boot/memtest86plus |
49 |
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" |
50 |
- |
51 |
-RDEPEND="floppy? ( sys-fs/mtools )" |
52 |
-DEPEND="" |
53 |
- |
54 |
-src_prepare() { |
55 |
- epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch |
56 |
- |
57 |
- sed -i -e 's,0x10000,0x100000,' memtest.lds || die |
58 |
- |
59 |
- if use serial ; then |
60 |
- sed -i \ |
61 |
- -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ |
62 |
- config.h \ |
63 |
- || die "sed failed" |
64 |
- fi |
65 |
- |
66 |
- cat - > "${T}"/39_${PN} <<EOF |
67 |
-#!/bin/sh |
68 |
-exec tail -n +3 \$0 |
69 |
- |
70 |
-menuentry "${PN} ${PV}" { |
71 |
- linux16 ${BOOTDIR}/memtest |
72 |
-} |
73 |
- |
74 |
-menuentry "${PN} ${PV} (netbsd)" { |
75 |
- insmod bsd |
76 |
- knetbsd ${BOOTDIR}/memtest.netbsd |
77 |
-} |
78 |
-EOF |
79 |
- |
80 |
- tc-export AS CC LD |
81 |
-} |
82 |
- |
83 |
-src_test() { :; } |
84 |
- |
85 |
-src_install() { |
86 |
- insinto ${BOOTDIR} |
87 |
- newins memtest.bin memtest |
88 |
- newins memtest memtest.netbsd |
89 |
- dosym memtest ${BOOTDIR}/memtest.bin |
90 |
- |
91 |
- exeinto /etc/grub.d |
92 |
- doexe "${T}"/39_${PN} |
93 |
- |
94 |
- dodoc README README.build-process FAQ changelog |
95 |
- |
96 |
- if use floppy ; then |
97 |
- dobin "${FILESDIR}"/make-memtest86+-boot-floppy |
98 |
- doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-pkg_postinst() { |
103 |
- mount-boot_pkg_postinst |
104 |
- elog |
105 |
- elog "memtest has been installed in ${BOOTDIR}/" |
106 |
- elog "You may wish to update your bootloader configs" |
107 |
- elog "by adding these lines:" |
108 |
- elog " - For grub2 just run grub-mkconfig, a configuration file is installed" |
109 |
- elog " as /etc/grub.d/39_${PN}" |
110 |
- elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" |
111 |
- elog " > title=${PN}" |
112 |
- elog " > root (hd?,?)" |
113 |
- elog " > kernel ${BOOTDIR}/memtest" |
114 |
- elog " - For lilo:" |
115 |
- elog " > image = ${BOOTDIR}/memtest" |
116 |
- elog " > label = ${PN}" |
117 |
- elog |
118 |
-} |
119 |
|
120 |
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild |
121 |
deleted file mode 100644 |
122 |
index 5ad27dd25b9..00000000000 |
123 |
--- a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,73 +0,0 @@ |
126 |
-# Copyright 1999-2019 Gentoo Authors |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI=4 |
130 |
- |
131 |
-inherit mount-boot eutils toolchain-funcs |
132 |
- |
133 |
-DESCRIPTION="Memory tester based on memtest86" |
134 |
-HOMEPAGE="http://www.memtest.org/" |
135 |
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" |
136 |
- |
137 |
-LICENSE="GPL-2" |
138 |
-SLOT="0" |
139 |
-KEYWORDS="-* ~amd64 ~x86" |
140 |
-IUSE="floppy serial" |
141 |
- |
142 |
-BOOTDIR=/boot/memtest86plus |
143 |
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" |
144 |
- |
145 |
-RDEPEND="floppy? ( sys-fs/mtools )" |
146 |
-DEPEND="" |
147 |
- |
148 |
-src_prepare() { |
149 |
- epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch |
150 |
- |
151 |
- sed -i -e 's,0x10000,0x100000,' memtest.lds || die |
152 |
- |
153 |
- if use serial ; then |
154 |
- sed -i \ |
155 |
- -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ |
156 |
- config.h \ |
157 |
- || die "sed failed" |
158 |
- fi |
159 |
- |
160 |
- tc-export AS CC LD |
161 |
-} |
162 |
- |
163 |
-src_test() { :; } |
164 |
- |
165 |
-src_install() { |
166 |
- insinto ${BOOTDIR} |
167 |
- newins memtest.bin memtest |
168 |
- newins memtest memtest.netbsd |
169 |
- dosym memtest ${BOOTDIR}/memtest.bin |
170 |
- |
171 |
- exeinto /etc/grub.d |
172 |
- doexe "${FILESDIR}"/39_memtest86+ |
173 |
- |
174 |
- dodoc README README.build-process FAQ changelog |
175 |
- |
176 |
- if use floppy ; then |
177 |
- dobin "${FILESDIR}"/make-memtest86+-boot-floppy |
178 |
- doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 |
179 |
- fi |
180 |
-} |
181 |
- |
182 |
-pkg_postinst() { |
183 |
- mount-boot_pkg_postinst |
184 |
- elog |
185 |
- elog "memtest has been installed in ${BOOTDIR}/" |
186 |
- elog "You may wish to update your bootloader configs" |
187 |
- elog "by adding these lines:" |
188 |
- elog " - For grub2 just run grub-mkconfig, a configuration file is installed" |
189 |
- elog " as /etc/grub.d/39_${PN}" |
190 |
- elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" |
191 |
- elog " > title=${PN}" |
192 |
- elog " > root (hd?,?)" |
193 |
- elog " > kernel ${BOOTDIR}/memtest" |
194 |
- elog " - For lilo:" |
195 |
- elog " > image = ${BOOTDIR}/memtest" |
196 |
- elog " > label = ${PN}" |
197 |
- elog |
198 |
-} |
199 |
|
200 |
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild |
201 |
deleted file mode 100644 |
202 |
index 47ecffb4628..00000000000 |
203 |
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild |
204 |
+++ /dev/null |
205 |
@@ -1,92 +0,0 @@ |
206 |
-# Copyright 1999-2019 Gentoo Authors |
207 |
-# Distributed under the terms of the GNU General Public License v2 |
208 |
- |
209 |
-EAPI=4 |
210 |
- |
211 |
-inherit mount-boot eutils toolchain-funcs |
212 |
- |
213 |
-DESCRIPTION="Memory tester based on memtest86" |
214 |
-HOMEPAGE="http://www.memtest.org/" |
215 |
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" |
216 |
- |
217 |
-LICENSE="GPL-2" |
218 |
-SLOT="0" |
219 |
-KEYWORDS="-* amd64 x86" |
220 |
-IUSE="floppy iso serial" |
221 |
- |
222 |
-BOOTDIR=/boot/memtest86plus |
223 |
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" |
224 |
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd" |
225 |
- |
226 |
-RDEPEND="floppy? ( sys-fs/mtools )" |
227 |
-DEPEND="iso? ( app-cdr/cdrtools )" |
228 |
- |
229 |
-src_prepare() { |
230 |
- sed -i -e 's,0x10000,0x100000,' memtest.lds || die |
231 |
- epatch "${FILESDIR}/${P}-gcc-473.patch" \ |
232 |
- "${FILESDIR}/${P}-hardcoded_cc.patch" |
233 |
- epatch "${FILESDIR}"/${P}-no-scp.patch |
234 |
- epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 |
235 |
- epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 |
236 |
- epatch "${FILESDIR}"/${P}-no-clean.patch #557890 |
237 |
- epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638 |
238 |
- epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974 |
239 |
- |
240 |
- sed -i 's:genisoimage:mkisofs:' makeiso.sh || die |
241 |
- if use serial ; then |
242 |
- sed -i \ |
243 |
- -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ |
244 |
- config.h \ |
245 |
- || die "sed failed" |
246 |
- fi |
247 |
-} |
248 |
- |
249 |
-src_configure() { |
250 |
- tc-ld-disable-gold #580212 |
251 |
- tc-export AS CC LD |
252 |
-} |
253 |
- |
254 |
-src_compile() { |
255 |
- emake |
256 |
- if use iso ; then |
257 |
- ./makeiso.sh || die |
258 |
- fi |
259 |
-} |
260 |
- |
261 |
-src_test() { :; } |
262 |
- |
263 |
-src_install() { |
264 |
- insinto ${BOOTDIR} |
265 |
- use iso && newins mt*.iso memtest.iso |
266 |
- newins memtest.bin memtest |
267 |
- newins memtest memtest.netbsd |
268 |
- dosym memtest ${BOOTDIR}/memtest.bin |
269 |
- |
270 |
- exeinto /etc/grub.d |
271 |
- doexe "${FILESDIR}"/39_memtest86+ |
272 |
- |
273 |
- dodoc README README.build-process FAQ changelog |
274 |
- |
275 |
- if use floppy ; then |
276 |
- dobin "${FILESDIR}"/make-memtest86+-boot-floppy |
277 |
- doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 |
278 |
- fi |
279 |
-} |
280 |
- |
281 |
-pkg_postinst() { |
282 |
- mount-boot_pkg_postinst |
283 |
- elog |
284 |
- elog "memtest has been installed in ${BOOTDIR}/" |
285 |
- elog "You may wish to update your bootloader configs" |
286 |
- elog "by adding these lines:" |
287 |
- elog " - For grub2 just run grub-mkconfig, a configuration file is installed" |
288 |
- elog " as /etc/grub.d/39_${PN}" |
289 |
- elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" |
290 |
- elog " > title=${PN}" |
291 |
- elog " > root (hd?,?)" |
292 |
- elog " > kernel ${BOOTDIR}/memtest" |
293 |
- elog " - For lilo:" |
294 |
- elog " > image = ${BOOTDIR}/memtest" |
295 |
- elog " > label = ${PN}" |
296 |
- elog |
297 |
-} |