1 |
commit: 8119f00b6bb8e7df006dc1ca642f5a8bfe1a88e4 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 3 00:02:39 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 3 02:58:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8119f00b |
7 |
|
8 |
sys-apps/memtest86+: drop old EAPI |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
sys-apps/memtest86+/Manifest | 2 - |
13 |
sys-apps/memtest86+/memtest86+-2.01.ebuild | 57 ---------------------- |
14 |
sys-apps/memtest86+/memtest86+-4.00.ebuild | 76 ------------------------------ |
15 |
3 files changed, 135 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest |
18 |
index 28945ab7200..e971494b5a7 100644 |
19 |
--- a/sys-apps/memtest86+/Manifest |
20 |
+++ b/sys-apps/memtest86+/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST memtest86+-2.01.tar.gz 165984 BLAKE2B 6d339755472515734a74216d50d9b5f716439ffeb710cc11cec466b60d1ae0679e28fc10e0fb9a173e853193a998be88459f9fca8b2cac07cb108667d8a36844 SHA512 fb8fd8f7e3f597701a031189c18bd95247fe1fc936838359411a32a24fb8845a0012ebd2e02bb399fad1fab0f493dbe475a3e646c272d10e6343af4646d8347b |
23 |
-DIST memtest86+-4.00.tar.gz 270327 BLAKE2B af33ecc65e2418d84a008f659c1c5fa5949c2b16963da08c1f15cfc89681c6900d46d9f3d15d9beb545eedbb641c174c37a53b1a6ebef63a7b9ff9d7034f28b8 SHA512 3d2075ec5fe18ce356f75bf473aa189ba6153269c63be263f13e7d553f468a57f147f1e62dad16ad9ec4fb57724e1c67c69eeffb33db3e1f6300357f26b586ba |
24 |
DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441 |
25 |
DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7 |
26 |
|
27 |
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild |
28 |
deleted file mode 100644 |
29 |
index 2051cc102de..00000000000 |
30 |
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,57 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=0 |
37 |
- |
38 |
-inherit mount-boot eutils |
39 |
- |
40 |
-DESCRIPTION="Memory tester based on memtest86" |
41 |
-HOMEPAGE="http://www.memtest.org/" |
42 |
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="GPL-2" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="-* amd64 x86" |
47 |
-IUSE="serial" |
48 |
-RESTRICT="test" |
49 |
- |
50 |
-DEPEND="" |
51 |
- |
52 |
-src_unpack() { |
53 |
- unpack ${A} |
54 |
- cd "${S}" |
55 |
- |
56 |
- epatch "${FILESDIR}"/${PN}-2.01-hardcoded_cc.patch |
57 |
- epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch |
58 |
- |
59 |
- if use serial ; then |
60 |
- sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h |
61 |
- fi |
62 |
-} |
63 |
- |
64 |
-src_compile() { |
65 |
- emake || die |
66 |
-} |
67 |
- |
68 |
-src_install() { |
69 |
- insinto /boot/memtest86plus |
70 |
- doins memtest.bin || die |
71 |
- dodoc README README.build-process |
72 |
-} |
73 |
- |
74 |
-pkg_postinst() { |
75 |
- einfo |
76 |
- einfo "memtest.bin has been installed in /boot/memtest86plus/" |
77 |
- einfo "You may wish to update your bootloader configs" |
78 |
- einfo "by adding these lines:" |
79 |
- |
80 |
- einfo " - For grub: (replace '?' with correct numbers for your boot partition)" |
81 |
- einfo " > title=Memtest86Plus" |
82 |
- einfo " > root (hd?,?)" |
83 |
- einfo " > kernel /boot/memtest86plus/memtest.bin" |
84 |
- |
85 |
- einfo " - For lilo:" |
86 |
- einfo " > image = /boot/memtest86plus/memtest.bin" |
87 |
- einfo " > label = Memtest86Plus" |
88 |
- einfo |
89 |
-} |
90 |
|
91 |
diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild |
92 |
deleted file mode 100644 |
93 |
index 354fe5b3134..00000000000 |
94 |
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild |
95 |
+++ /dev/null |
96 |
@@ -1,76 +0,0 @@ |
97 |
-# Copyright 1999-2018 Gentoo Foundation |
98 |
-# Distributed under the terms of the GNU General Public License v2 |
99 |
- |
100 |
-EAPI=0 |
101 |
- |
102 |
-QA_PRESTRIPPED=/boot/memtest86plus/memtest |
103 |
- |
104 |
-inherit mount-boot eutils |
105 |
- |
106 |
-DESCRIPTION="Memory tester based on memtest86" |
107 |
-HOMEPAGE="http://www.memtest.org/" |
108 |
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" |
109 |
- |
110 |
-LICENSE="GPL-2" |
111 |
-SLOT="0" |
112 |
-KEYWORDS="-* amd64 x86" |
113 |
-IUSE="floppy serial" |
114 |
-RESTRICT="test" |
115 |
- |
116 |
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )" |
117 |
-DEPEND="${RDEPEND}" |
118 |
- |
119 |
-src_unpack() { |
120 |
- unpack ${A} |
121 |
- cd "${S}" |
122 |
- |
123 |
- epatch "${FILESDIR}"/${PN}-4.00-hardcoded_cc.patch |
124 |
- |
125 |
- # Merged upstream |
126 |
- #epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch |
127 |
- |
128 |
- sed -i -e's/$(LD) -s /$(LD) /' Makefile |
129 |
- sed -i -e's,0x10000,0x100000,' memtest.lds |
130 |
- |
131 |
- if use serial ; then |
132 |
- sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h |
133 |
- fi |
134 |
-} |
135 |
- |
136 |
-src_compile() { |
137 |
- emake || die |
138 |
-} |
139 |
- |
140 |
-src_install() { |
141 |
- insinto /boot/memtest86plus |
142 |
- newins memtest.bin memtest || die |
143 |
- newins memtest memtest.netbsd || die |
144 |
- dosym memtest /boot/memtest86plus/memtest.bin |
145 |
- dodoc README README.build-process |
146 |
- |
147 |
- if use floppy ; then |
148 |
- dobin "${FILESDIR}"/make-memtest86+-boot-floppy |
149 |
- doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 |
150 |
- fi |
151 |
-} |
152 |
- |
153 |
-pkg_postinst() { |
154 |
- mount-boot_pkg_postinst |
155 |
- einfo |
156 |
- einfo "memtest has been installed in /boot/memtest86plus/" |
157 |
- einfo "You may wish to update your bootloader configs" |
158 |
- einfo "by adding these lines:" |
159 |
- einfo " - For grub: (replace '?' with correct numbers for your boot partition)" |
160 |
- einfo " > title=Memtest86Plus" |
161 |
- einfo " > root (hd?,?)" |
162 |
- einfo " > kernel /boot/memtest86plus/memtest" |
163 |
- einfo " or try this if you get grub error 28:" |
164 |
- einfo " > title=Memtest86Plus" |
165 |
- einfo " > root (hd?,?)" |
166 |
- einfo " > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd" |
167 |
- einfo |
168 |
- einfo " - For lilo:" |
169 |
- einfo " > image = /boot/memtest86plus/memtest" |
170 |
- einfo " > label = Memtest86Plus" |
171 |
- einfo |
172 |
-} |