Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/simh/files/, app-emulation/simh/
Date: Tue, 03 Nov 2015 20:54:23
Message-Id: 1446584041.1cc400664f573e5f2852cacdc0c39feff7095f17.mrueg@gentoo
1 commit: 1cc400664f573e5f2852cacdc0c39feff7095f17
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 3 20:54:01 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 3 20:54:01 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc40066
7
8 app-emulation/simh: Remove old
9
10 Package-Manager: portage-2.2.23
11
12 app-emulation/simh/Manifest | 2 -
13 app-emulation/simh/files/makefile.patch | 11 --
14 app-emulation/simh/files/simh-3.8.1-asneeded.patch | 168 ---------------------
15 app-emulation/simh/files/simh-3.8.1-makefile.patch | 11 --
16 app-emulation/simh/simh-3.3.0.ebuild | 49 ------
17 app-emulation/simh/simh-3.8.1.ebuild | 55 -------
18 6 files changed, 296 deletions(-)
19
20 diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
21 index e30b80e..197372c 100644
22 --- a/app-emulation/simh/Manifest
23 +++ b/app-emulation/simh/Manifest
24 @@ -1,3 +1 @@
25 -DIST simhv33-0.zip 2153444 SHA256 28fcdc8443f6e2460193eb6ed8d41be95d75226490926219a0dfd5028eaf051c SHA512 33d9dd4652f7a240a6f2d14be53dbb00bb03cf02e753d8e80defa4c83916ff28b79a2058d0ec0cc8b8eaf8c1c280d05c01e444e7b6087ccdc04fb3ec691f07ee WHIRLPOOL 683fe1dd5baf4504ea5b1b549a08f7b621831ca3b242ca5b1e40d326ceb2bda0e6db5630ecf43535c81706879b63d60e6d86dd409346f65ec5a477109c92646e
26 -DIST simhv38-1.zip 2954982 SHA256 4fe294fa5285b1d6d0bd69f60889c00e518ce2be5f00abc2bd4adfa8daa85b06 SHA512 b9ff1c2a9d52df98ca99f243dd89102f3afa9018d03990cefecb1fbf1c9d5244cc00335ada7d190d6890f81db9cd4606b02ab1b620854b8de7b2f489a74f1bdb WHIRLPOOL 7c30e3be18a82a7f9316f9d0c33601c34173ceb052d19c1126068a04df3ca9df339898cb44a4d110de4676717f5dfeebc18b306586f046176b805126175002a0
27 DIST simhv39-0.zip 3103657 SHA256 e49b259b66ad6311ca9066dee3d3693cd915106a6938a52ed685cdbada8eda3b SHA512 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6 WHIRLPOOL 3b324046169df5b0378dfb00520c80b4372d2b7bd717484151e00dc17a8e60b42daaf8f8fd200cbf25ab693271783d9b307f4d34985de0f33bd68e484b92b2de
28
29 diff --git a/app-emulation/simh/files/makefile.patch b/app-emulation/simh/files/makefile.patch
30 deleted file mode 100644
31 index 15cd440..0000000
32 --- a/app-emulation/simh/files/makefile.patch
33 +++ /dev/null
34 @@ -1,11 +0,0 @@
35 ---- simh/makefile 2004-12-09 15:37:34.823634965 +0000
36 -+++ simh.new/makefile 2004-12-09 15:38:34.401562833 +0000
37 -@@ -13,7 +13,7 @@
38 - CC = gcc -std=c99 -O2 -g -lm $(OS_CCDEFS) -I .
39 - ifeq ($(USE_NETWORK),)
40 - else
41 --NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
42 -+NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
43 - endif
44 - else
45 - #Win32 Environments
46
47 diff --git a/app-emulation/simh/files/simh-3.8.1-asneeded.patch b/app-emulation/simh/files/simh-3.8.1-asneeded.patch
48 deleted file mode 100644
49 index 8843d34..0000000
50 --- a/app-emulation/simh/files/simh-3.8.1-asneeded.patch
51 +++ /dev/null
52 @@ -1,168 +0,0 @@
53 ---- makefile.orig 2010-09-07 15:30:17.000000000 -0400
54 -+++ makefile 2010-09-07 15:31:37.000000000 -0400
55 -@@ -12,7 +12,8 @@
56 - OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
57 - endif
58 - endif
59 -- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
60 -+ CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I . $(CFLAGS)
61 -+ LIBS = -lm -lrt
62 - ifeq ($(USE_NETWORK),)
63 - else
64 - NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
65 -@@ -274,129 +275,129 @@
66 - pdp1 : ${BIN}pdp1${EXE}
67 -
68 - ${BIN}pdp1${EXE} : ${PDP1} ${SIM}
69 -- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
70 -+ ${CC} $(LDFLAGS) ${PDP1} ${SIM} ${PDP1_OPT} -o $@ $(LIBS)
71 -
72 - pdp4 : ${BIN}pdp4${EXE}
73 -
74 - ${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
75 -- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
76 -+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ $(LIBS)
77 -
78 - pdp7 : ${BIN}pdp7${EXE}
79 -
80 - ${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
81 -- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
82 -+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ $(LIBS)
83 -
84 - pdp8 : ${BIN}pdp8${EXE}
85 -
86 - ${BIN}pdp8${EXE} : ${PDP8} ${SIM}
87 -- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
88 -+ ${CC} $(LDFLAGS) ${PDP8} ${SIM} ${PDP8_OPT} -o $@ $(LIBS)
89 -
90 - pdp9 : ${BIN}pdp9${EXE}
91 -
92 - ${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
93 -- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
94 -+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ $(LIBS)
95 -
96 - pdp15 : ${BIN}pdp15${EXE}
97 -
98 - ${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
99 -- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
100 -+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ $(LIBS)
101 -
102 - pdp10 : ${BIN}pdp10${EXE}
103 -
104 - ${BIN}pdp10${EXE} : ${PDP10} ${SIM}
105 -- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
106 -+ ${CC} $(LDFLAGS) ${PDP10} ${SIM} ${PDP10_OPT} -o $@ $(LIBS)
107 -
108 - pdp11 : ${BIN}pdp11${EXE}
109 -
110 - ${BIN}pdp11${EXE} : ${PDP11} ${SIM}
111 -- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
112 -+ ${CC} $(LDFLAGS) ${PDP11} ${SIM} ${PDP11_OPT} -o $@ $(LIBS)
113 -
114 - vax : ${BIN}vax${EXE}
115 -
116 - ${BIN}vax${EXE} : ${VAX} ${SIM}
117 -- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
118 -+ ${CC} $(LDFLAGS) ${VAX} ${SIM} ${VAX_OPT} -o $@ $(LIBS)
119 -
120 - vax780 : ${BIN}vax780${EXE}
121 -
122 - ${BIN}vax780${EXE} : ${VAX780} ${SIM}
123 -- ${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
124 -+ ${CC} $(LDFLAGS) ${VAX780} ${SIM} ${VAX780_OPT} -o $@ $(LIBS)
125 -
126 - nova : ${BIN}nova${EXE}
127 -
128 - ${BIN}nova${EXE} : ${NOVA} ${SIM}
129 -- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
130 -+ ${CC} $(LDFLAGS) ${NOVA} ${SIM} ${NOVA_OPT} -o $@ $(LIBS)
131 -
132 - eclipse : ${BIN}eclipse${EXE}
133 -
134 - ${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
135 -- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
136 -+ ${CC} $(LDFLAGS) ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ $(LIBS)
137 -
138 - h316 : ${BIN}h316${EXE}
139 -
140 - ${BIN}h316${EXE} : ${H316} ${SIM}
141 -- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
142 -+ ${CC} $(LDFLAGS) ${H316} ${SIM} ${H316_OPT} -o $@ $(LIBS)
143 -
144 - hp2100 : ${BIN}hp2100${EXE}
145 -
146 - ${BIN}hp2100${EXE} : ${HP2100} ${SIM}
147 -- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
148 -+ ${CC} $(LDFLAGS) ${HP2100} ${SIM} ${HP2100_OPT} -o $@ $(LIBS)
149 -
150 - i1401 : ${BIN}i1401${EXE}
151 -
152 - ${BIN}i1401${EXE} : ${I1401} ${SIM}
153 -- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
154 -+ ${CC} $(LDFLAGS) ${I1401} ${SIM} ${I1401_OPT} -o $@ $(LIBS)
155 -
156 - i1620 : ${BIN}i1620${EXE}
157 -
158 - ${BIN}i1620${EXE} : ${I1620} ${SIM}
159 -- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
160 -+ ${CC} $(LDFLAGS) ${I1620} ${SIM} ${I1620_OPT} -o $@ $(LIBS)
161 -
162 - i7094 : ${BIN}i7094${EXE}
163 -
164 - ${BIN}i7094${EXE} : ${I7094} ${SIM}
165 -- ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
166 -+ ${CC} $(LDFLAGS) ${I7094} ${SIM} ${I7094_OPT} -o $@ $(LIBS)
167 -
168 - ibm1130 : ${BIN}ibm1130${EXE}
169 -
170 - ${BIN}ibm1130${EXE} : ${IBM1130}
171 -- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
172 -+ ${CC} $(LDFLAGS) ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ $(LIBS)
173 -
174 - s3 : ${BIN}s3${EXE}
175 -
176 - ${BIN}s3${EXE} : ${S3} ${SIM}
177 -- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
178 -+ ${CC} $(LDFLAGS) ${S3} ${SIM} ${S3_OPT} -o $@ $(LIBS)
179 -
180 - altair : ${BIN}altair${EXE}
181 -
182 - ${BIN}altair${EXE} : ${ALTAIR} ${SIM}
183 -- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
184 -+ ${CC} $(LDFLAGS) ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ $(LIBS)
185 -
186 - altairz80 : ${BIN}altairz80${EXE}
187 -
188 - ${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM}
189 -- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
190 -+ ${CC} $(LDFLAGS) ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ $(LIBS)
191 -
192 - gri : ${BIN}gri${EXE}
193 -
194 - ${BIN}gri${EXE} : ${GRI} ${SIM}
195 -- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
196 -+ ${CC} $(LDFLAGS) ${GRI} ${SIM} ${GRI_OPT} -o $@ $(LIBS)
197 -
198 - lgp : ${BIN}lgp${EXE}
199 -
200 - ${BIN}lgp${EXE} : ${LGP} ${SIM}
201 -- ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
202 -+ ${CC} $(LDFLAGS) ${LGP} ${SIM} ${LGP_OPT} -o $@ $(LIBS)
203 -
204 - id16 : ${BIN}id16${EXE}
205 -
206 - ${BIN}id16${EXE} : ${ID16} ${SIM}
207 -- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
208 -+ ${CC} $(LDFLAGS) ${ID16} ${SIM} ${ID16_OPT} -o $@ $(LIBS)
209 -
210 - id32 : ${BIN}id32${EXE}
211 -
212 - ${BIN}id32${EXE} : ${ID32} ${SIM}
213 -- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
214 -+ ${CC} $(LDFLAGS) ${ID32} ${SIM} ${ID32_OPT} -o $@ $(LIBS)
215 -
216 - sds : ${BIN}sds${EXE}
217 -
218 - ${BIN}sds${EXE} : ${SDS} ${SIM}
219 -- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
220 -+ ${CC} $(LDFLAGS) ${SDS} ${SIM} ${SDS_OPT} -o $@ $(LIBS)
221
222 diff --git a/app-emulation/simh/files/simh-3.8.1-makefile.patch b/app-emulation/simh/files/simh-3.8.1-makefile.patch
223 deleted file mode 100644
224 index 612a4af..0000000
225 --- a/app-emulation/simh/files/simh-3.8.1-makefile.patch
226 +++ /dev/null
227 @@ -1,11 +0,0 @@
228 ---- makefile.orig 2010-09-07 15:05:01.000000000 -0400
229 -+++ makefile 2010-09-07 15:05:19.000000000 -0400
230 -@@ -15,7 +15,7 @@
231 - CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
232 - ifeq ($(USE_NETWORK),)
233 - else
234 -- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
235 -+ NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
236 - endif
237 - else
238 - #Win32 Environments
239
240 diff --git a/app-emulation/simh/simh-3.3.0.ebuild b/app-emulation/simh/simh-3.3.0.ebuild
241 deleted file mode 100644
242 index ac5ffef..0000000
243 --- a/app-emulation/simh/simh-3.3.0.ebuild
244 +++ /dev/null
245 @@ -1,49 +0,0 @@
246 -# Copyright 1999-2013 Gentoo Foundation
247 -# Distributed under the terms of the GNU General Public License v2
248 -# $Id$
249 -
250 -inherit eutils versionator
251 -
252 -MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)"
253 -DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
254 -HOMEPAGE="http://simh.trailing-edge.com/"
255 -SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
256 -
257 -LICENSE="MIT"
258 -SLOT="0"
259 -KEYWORDS="x86"
260 -
261 -RDEPEND="net-libs/libpcap"
262 -DEPEND="${RDEPEND}
263 - app-arch/unzip"
264 -
265 -S="${WORKDIR}"
266 -
267 -MAKEOPTS="USE_NETWORK=1 ${MAKEOPTS}"
268 -
269 -src_unpack() {
270 - mkdir "${WORKDIR}/BIN"
271 - unpack ${A}
272 -
273 - # convert makefile from dos format to unix format
274 - sed -i 's/.$//' makefile
275 -
276 - epatch "${FILESDIR}/makefile.patch"
277 -}
278 -
279 -src_compile() {
280 - emake || die "make failed"
281 -}
282 -
283 -src_install() {
284 - cd "${S}/BIN"
285 - for BINFILE in *; do
286 - newbin ${BINFILE} "simh-${BINFILE}"
287 - done
288 -
289 - cd "${S}"
290 - dodir /usr/share/simh
291 - insinto /usr/share/simh
292 - doins VAX/*.bin
293 - dodoc *.txt */*.txt
294 -}
295
296 diff --git a/app-emulation/simh/simh-3.8.1.ebuild b/app-emulation/simh/simh-3.8.1.ebuild
297 deleted file mode 100644
298 index 8cc23cd..0000000
299 --- a/app-emulation/simh/simh-3.8.1.ebuild
300 +++ /dev/null
301 @@ -1,55 +0,0 @@
302 -# Copyright 1999-2012 Gentoo Foundation
303 -# Distributed under the terms of the GNU General Public License v2
304 -# $Id$
305 -
306 -inherit eutils toolchain-funcs versionator
307 -
308 -MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)"
309 -DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
310 -HOMEPAGE="http://simh.trailing-edge.com/"
311 -SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
312 -
313 -LICENSE="MIT"
314 -SLOT="0"
315 -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
316 -IUSE=""
317 -
318 -RDEPEND="net-libs/libpcap"
319 -DEPEND="${RDEPEND}
320 - app-arch/unzip"
321 -
322 -S=${WORKDIR}
323 -
324 -MAKEOPTS="USE_NETWORK=1 ${MAKEOPTS}"
325 -
326 -src_unpack() {
327 - mkdir "${WORKDIR}/BIN"
328 - unpack ${A}
329 -
330 - # convert makefile from dos format to unix format
331 - edos2unix makefile
332 -
333 - epatch "${FILESDIR}/${P}-makefile.patch" \
334 - "${FILESDIR}/${P}-asneeded.patch"
335 -
336 - # fix linking on Darwin
337 - [[ ${CHOST} == *-darwin* ]] && sed -i 's/-lrt//g' makefile
338 -}
339 -
340 -src_compile() {
341 - tc-export CC
342 - emake || die "make failed"
343 -}
344 -
345 -src_install() {
346 - cd "${S}/BIN"
347 - for BINFILE in *; do
348 - newbin ${BINFILE} "simh-${BINFILE}"
349 - done
350 -
351 - cd "${S}"
352 - dodir /usr/share/simh
353 - insinto /usr/share/simh
354 - doins VAX/*.bin
355 - dodoc *.txt */*.txt
356 -}