Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/
Date: Wed, 14 Feb 2018 16:40:05
Message-Id: 1518615319.25f5e1c6e21e184fc6323d3d098693a4edd6b63a.kensington@gentoo
1 commit: 25f5e1c6e21e184fc6323d3d098693a4edd6b63a
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 13:35:04 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 13:35:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f5e1c6
7
8 sys-devel/dev86: remove 0.16.19
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-devel/dev86/Manifest | 1 -
13 sys-devel/dev86/dev86-0.16.19.ebuild | 77 -----------------------
14 sys-devel/dev86/files/dev86-0.16.19-memmove.patch | 17 -----
15 3 files changed, 95 deletions(-)
16
17 diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
18 index 1c024ea7023..4b159bf8244 100644
19 --- a/sys-devel/dev86/Manifest
20 +++ b/sys-devel/dev86/Manifest
21 @@ -1,2 +1 @@
22 -DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
23 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
24
25 diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild
26 deleted file mode 100644
27 index 835423c7e4d..00000000000
28 --- a/sys-devel/dev86/dev86-0.16.19.ebuild
29 +++ /dev/null
30 @@ -1,77 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI="4"
35 -
36 -inherit eutils multilib
37 -
38 -DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
39 -HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
40 -SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
41 -
42 -LICENSE="GPL-2"
43 -SLOT="0"
44 -KEYWORDS="amd64 x86"
45 -IUSE=""
46 -
47 -RDEPEND="sys-devel/bin86"
48 -DEPEND="${RDEPEND}
49 - dev-util/gperf"
50 -
51 -STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
52 -
53 -src_prepare() {
54 - # elksemu doesn't compile under amd64
55 - if use amd64; then
56 - einfo "Not compiling elksemu on amd64"
57 - sed -i \
58 - -e 's,alt-libs elksemu,alt-libs,' \
59 - -e 's,install-lib install-emu,install-lib,' \
60 - makefile.in || die
61 - fi
62 -
63 - epatch "${FILESDIR}"/dev86-pic.patch
64 - epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
65 - epatch "${FILESDIR}"/${PN}-0.16.19-memmove.patch #354351
66 - sed -i \
67 - -e "s:-O2 -g:${CFLAGS}:" \
68 - -e '/INEXE=/s:-s::' \
69 - makefile.in || die
70 - sed -i \
71 - -e "s:/lib/:/$(get_libdir)/:" \
72 - bcc/bcc.c || die
73 - sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
74 - sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
75 -}
76 -
77 -src_compile() {
78 - # Don't mess with CPPFLAGS as they tend to break compilation
79 - # (bug #343655).
80 - CPPFLAGS=""
81 -
82 - # First `make` is also a config, so set all the path vars here
83 - emake -j1 \
84 - DIST="${D}" \
85 - CC="$(tc-getCC)" \
86 - LIBDIR="/usr/$(get_libdir)/bcc" \
87 - INCLDIR="/usr/$(get_libdir)/bcc"
88 -
89 - export PATH=${S}/bin:${PATH}
90 - cd bin
91 - ln -s ncc bcc
92 - cd ..
93 - cd bootblocks
94 - ln -s ../bcc/version.h .
95 - emake DIST="${D}"
96 -}
97 -
98 -src_install() {
99 - emake -j1 install-all DIST="${D}"
100 - dobin bootblocks/makeboot
101 - # remove all the stuff supplied by bin86
102 - cd "${D}"
103 - rm usr/bin/{as,ld,nm,objdump,size}86 || die
104 - rm usr/man/man1/{as,ld}86.1 || die
105 - dodir /usr/share/man
106 - mv usr/man usr/share/
107 -}
108
109 diff --git a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch b/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
110 deleted file mode 100644
111 index 12df3f67262..00000000000
112 --- a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
113 +++ /dev/null
114 @@ -1,17 +0,0 @@
115 -https://bugs.gentoo.org/354351
116 -
117 -fix sniped from Debian:
118 -* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
119 - by memmove (closes: #591133).
120 -
121 ---- copt/copt.c
122 -+++ copt/copt.c
123 -@@ -174,7 +174,7 @@
124 - /* Delete leading white spaces */
125 - for (cp = buf; *cp && isspace(*cp); cp++) ;
126 - if (cp != buf && *cp)
127 -- strcpy(buf, cp);
128 -+ memmove(buf, cp, strlen(cp) + 1);
129 -
130 - return(buf);
131 - }