Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/
Date: Wed, 09 May 2018 21:00:24
Message-Id: 1525899608.bd620ef713c6b0fbdbc21e803da6b68263b93980.zlogene@gentoo
1 commit: bd620ef713c6b0fbdbc21e803da6b68263b93980
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 9 20:59:39 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed May 9 21:00:08 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd620ef7
7
8 dev-embedded/sdcc: Drop old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-embedded/sdcc/Manifest | 10 --
13 dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch | 74 --------
14 dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch | 9 -
15 dev-embedded/sdcc/files/sdcc-2.9.0-build.patch | 51 ------
16 dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch | 15 --
17 dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch | 16 --
18 dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch | 209 -----------------------
19 dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild | 52 ------
20 dev-embedded/sdcc/sdcc-2.6.0.ebuild | 48 ------
21 dev-embedded/sdcc/sdcc-2.7.0.ebuild | 48 ------
22 dev-embedded/sdcc/sdcc-2.8.0.ebuild | 76 ---------
23 dev-embedded/sdcc/sdcc-2.9.0.ebuild | 96 -----------
24 12 files changed, 704 deletions(-)
25
26 diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
27 index 8a7e86568d2..ab1a89d8386 100644
28 --- a/dev-embedded/sdcc/Manifest
29 +++ b/dev-embedded/sdcc/Manifest
30 @@ -1,12 +1,2 @@
31 -DIST sdcc-doc-2.6.0.tar.gz 1026186 BLAKE2B 67c764db614240b8d870ae98c3e4eb0e85735ce42165a7c2d7fb929053008a9101d455e11d1a20ce8c4a3462200a0e7d0ba2ec5c7ea1a025d444772ac5fc1a02 SHA512 3cffb2ac4bbe65539951b134f89449341bff9f5682ec344c244b28efea5fe96c753caa873f26c75b8fc0a19f48404ae0a43f05e41eabafe66fd0f493b4065f97
32 -DIST sdcc-doc-2.7.0.tar.bz2 1211113 BLAKE2B 4435ba6e75e6037e1e267adca65ba029ccfc87a677fb7c13bc090c04a91485205def7f3e702c439b9b54514fc0fd14dd2175bcfff7c07933101b114b2fd9b6e8 SHA512 2ed6503551b7c9e3e674a3bf391e731c2fa838f3978761982ab1a072d47b449b73e6efe3b05967bcdfe623c2fc933503702912721b90df95dab9b332dfacad9a
33 -DIST sdcc-doc-2.8.0.tar.bz2 1363271 BLAKE2B 0dc5ea0d55cdfda2578324337fa43757fa256c064663b9cfbfa9eb098e8dcdc7a1472c2ab7288c478cbc515e3fd2b11acbaed49599f24376bf4bfcf537b8af02 SHA512 201fcb0ffb96649507dcb0489789e7a89cb30705e9eae3f40b6ce907df3464439488d1369f7d5557873e28bcd44a2af82bb3dab2f02adbf0d6ea88a711bb5d9b
34 -DIST sdcc-doc-2.9.0.tar.bz2 1388379 BLAKE2B 385b0a44adb55c09b54161b6f84c8c7f5b57dd3e1b525cdda7daef67dd4f75cabf62432038a30b06cd0045acf0da5c30eb1d0c76e3b35830ffc5492d54a3e25d SHA512 c0214437dada2d2acc3590d8a82b077cd841a93da7fe76cc259adea0da67e6ea0ced14dc80c5ce05261aa5d7e2f345f8cf994dafa4e38bd404b00fd6b5b2d168
35 -DIST sdcc-doc-20060502.tar.gz 1027650 BLAKE2B 104a5614870910a80ad83ee963f3e8636ca7064515905a3b05d3e80225f10bf81b05be88684cc6aaff788ae121003ff1b60a80c32081d52972e049f3ca652f38 SHA512 aba51493c76a019fb439fa8ff2f645bc519bdb9ded30a2871d51f2dd6eedc7315f826e28d5efed0eae731060c22b82071025cec5ae4407c5f6acdd2c18292ff2
36 DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
37 -DIST sdcc-src-2.6.0.tar.gz 4229518 BLAKE2B 3c30ed93154c86d8f4721917372bd850b957ed6408bf253051da42d4497637fe8c753a0a481dee07dfa51f289153936b7b5b2970e942d1aa698d01e00c9e8ab8 SHA512 d5802ad7804c771c25b72b5038cdc291d3e67a618fde6a9d03235954a6a133e0ecc42f26eabcc933806e54457e44efea81dc79ac03cb547556da41dec3eff1e6
38 -DIST sdcc-src-2.7.0.tar.bz2 3405687 BLAKE2B b7379f783cb1e805059210d46395fb5acfdd331249fef7aeeab66c6b3fcb95d77b7fa146d97b83d0c6659d83fe37734dfc4d7cb59fee3abd45d8e10271628f84 SHA512 95625aadf386f0da65f4ddb856fd7da8a333ed884e308993a0897a205561438b60d2836a60e33a849f6b6ab5dd938b822072641866596897f48fa62a4c536dd3
39 -DIST sdcc-src-2.8.0.tar.bz2 3460693 BLAKE2B 9481fa90dfa0fd0e84396f54795c78f7bc95b4f0c0220042fe5506b14193c6067f77f5a9b683fd9bebc0797a9d8c7a20f20cc7556c1853c84f39ed774a2b7f1e SHA512 91f43ea275f4c27e5c475a9dbfe5e9c7d5804a530151420473cbc65a48ca15c65a6e38628e0bf927d89cd8ddb6b6030d5d65aa9cba7963e23ac18bde42951fd5
40 -DIST sdcc-src-2.9.0.tar.bz2 3764926 BLAKE2B ec8289f5204e45e2fdd2ca379cad9e6f65749452888e3373bd073d25fda5df9dae3fe2663a1380b9d292754f318f84f506a73136f44df33d45f079ba5f5fa6c4 SHA512 0703f46db590fa3248c104d5045b0807fc18898aec13a8f5f762ff4e573f3fc199590050fd82c665ae71cd586081fe88db671dcc498770d736650be0dcf32b0e
41 -DIST sdcc-src-20060502.tar.gz 4145716 BLAKE2B 7f08dc0f04b3fc0b6b294b996901c32232547fb1d406d8bcba42b62eb4ec3db159a292c4eba18664653e30c71eddfc3efbcffbe92d1895f32085f1c90abad13c SHA512 0817f14871822874a3e4b5d8be68df56c7f19444c283d4cd4aa8436af6984631dd0f8322080380d227bbc8d931e6cbc84a81cfbced20cd56f2765cdaf1d552cd
42 DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e
43
44 diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
45 deleted file mode 100644
46 index cd920e988d9..00000000000
47 --- a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
48 +++ /dev/null
49 @@ -1,74 +0,0 @@
50 -diff -Nadur sdcc-orig/configure.in sdcc/configure.in
51 ---- sdcc-orig/configure.in 2008-04-20 15:24:14.000000000 +0200
52 -+++ sdcc/configure.in 2008-04-20 15:27:18.000000000 +0200
53 -@@ -320,17 +320,6 @@
54 - M_OR_MM=$sdcc_cv_MM
55 - AC_SUBST(M_OR_MM)
56 -
57 --# This is the first time when CFLAGS are set/modified!!
58 --adl_DD_COPT(CC, ggdb)
59 --if test "$sdcc_cv_CCggdb" = "yes"; then
60 -- CFLAGS="-ggdb ${CFLAGS}"
61 --fi
62 --
63 --adl_DD_COPT(CC, pipe)
64 --if test "$sdcc_cv_CCpipe" = "yes"; then
65 -- CFLAGS="-pipe $CFLAGS"
66 --fi
67 --
68 -
69 - # Checks for typedefs, structures, and compiler characteristics.
70 - # ===========================================================================
71 -diff -Nadur sdcc-orig/debugger/mcs51/configure.in sdcc/debugger/mcs51/configure.in
72 ---- sdcc-orig/debugger/mcs51/configure.in 2008-04-20 15:24:19.000000000 +0200
73 -+++ sdcc/debugger/mcs51/configure.in 2008-04-20 15:26:53.000000000 +0200
74 -@@ -148,17 +148,6 @@
75 - M_OR_MM=$sdcc_cv_MM
76 - AC_SUBST(M_OR_MM)
77 -
78 --# This is the first time when CFLAGS are set/modified!!
79 --adl_DD_COPT(CC, ggdb)
80 --if test "$sdcc_cv_CCggdb" = "yes"; then
81 -- CFLAGS="-ggdb ${CFLAGS}"
82 --fi
83 --
84 --adl_DD_COPT(CC, pipe)
85 --if test "$sdcc_cv_CCpipe" = "yes"; then
86 -- CFLAGS="-pipe $CFLAGS"
87 --fi
88 --
89 -
90 - # Set standard installation paths
91 - # ===========================================================================
92 -diff -Nadur sdcc-orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
93 ---- sdcc-orig/sim/ucsim/configure.in 2008-04-20 15:24:11.000000000 +0200
94 -+++ sdcc/sim/ucsim/configure.in 2008-04-20 15:26:06.000000000 +0200
95 -@@ -514,28 +514,6 @@
96 - M_OR_MM=$ucsim_cv_MM
97 - AC_SUBST(M_OR_MM)
98 -
99 --# This is the first time when CFLAGS are set/modified!!
100 --
101 --DD_COPT(CXX, ggdb)
102 --DD_COPT(CXX, gstabs)
103 --if test "$ucsim_cv_CXXgstabs" = "yes"; then
104 -- gopt="-gstabs+ -g3"
105 --elif test "$ucsim_cv_CXXggdb" = "yes"; then
106 -- gopt="-ggdb -g3"
107 --else
108 -- gopt="-g"
109 --fi
110 --if test "$CXXFLAGS"x = x ;then
111 -- CXXFLAGS="$gopt"
112 --else
113 -- CXXFLAGS="$CXXFLAGS $gopt"
114 --fi
115 --
116 --DD_COPT(CXX, pipe)
117 --if test "$ucsim_cv_CXXpipe" = "yes"; then
118 -- CXXFLAGS="$CXXFLAGS -pipe"
119 --fi
120 --
121 - PICOPT=""
122 - SHAREDLIB="no"
123 - DD_COPT_NO_IGNORE(CXX, fPIC)
124
125 diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
126 deleted file mode 100644
127 index 8d0ddf04519..00000000000
128 --- a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
129 +++ /dev/null
130 @@ -1,9 +0,0 @@
131 -diff -ur sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc sdcc/sim/ucsim/cmd.src/cmdlex.cc
132 ---- sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc 2004-07-16 19:32:30.000000000 +0300
133 -+++ sdcc/sim/ucsim/cmd.src/cmdlex.cc 2009-08-10 11:09:58.000000000 +0300
134 -@@ -1,3 +1,5 @@
135 -+#include <stdio.h>
136 -+
137 - #line 2 "cmdlex.cc"
138 -
139 - #line 4 "cmdlex.cc"
140
141 diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
142 deleted file mode 100644
143 index b944b00d83a..00000000000
144 --- a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
145 +++ /dev/null
146 @@ -1,51 +0,0 @@
147 -fix parallel build issues
148 -
149 ---- sdcc/device/lib/Makefile.in
150 -+++ sdcc/device/lib/Makefile.in
151 -@@ -347,37 +347,21 @@
152 - cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \
153 - fi
154 -
155 --$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
156 - ifeq ($(LIB_TYPE), SDCCLIB)
157 -- ../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
158 -- ../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
159 -- ../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
160 -- ../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
161 -+mklib = ../../bin/sdcclib -a $@ $^
162 - else ifeq ($(LIB_TYPE), AR)
163 -- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
164 -- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
165 -- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
166 -- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
167 -+mklib = ar -Scq $@ $^
168 - else ifeq ($(LIB_TYPE), RANLIB)
169 -- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib
170 -- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib
171 -- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib
172 -- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib
173 -+mklib = ar -Scq $@ $^ && $(top_builddir)/bin/asranlib $@
174 - else
175 -- rm -f $(SDCCPORTDIR)/libfloat.lib
176 -- for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done
177 -- cp $(OBJECTS_FLOAT) $(SDCCPORTDIR)
178 -- rm -f $(SDCCPORTDIR)/libint.lib
179 -- for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done
180 -- cp $(OBJECTS_INT) $(SDCCPORTDIR)
181 -- rm -f $(SDCCPORTDIR)/liblong.lib
182 -- for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done
183 -- cp $(OBJECTS_LONG) $(SDCCPORTDIR)
184 -- rm -f $(SDCCPORTDIR)/libsdcc.lib
185 -- for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done
186 -- cp $(OBJECTS_SDCC) $(SDCCPORTDIR)
187 -+mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@; cp $^ $(SDCCPORTDIR)
188 - endif
189 -
190 -+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib)
191 -+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib)
192 -+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib)
193 -+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib)
194 -+
195 - clean_intermediate:
196 - rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym
197 -
198
199 diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
200 deleted file mode 100644
201 index fb4ac7918c5..00000000000
202 --- a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
203 +++ /dev/null
204 @@ -1,15 +0,0 @@
205 -like fix already in upstream
206 -
207 -* sim/ucsim/cmd.src/cmdlex.cc: regenerated,
208 - fix for parch #3038644: Fix for GCC-4.4 compile error
209 -
210 ---- trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 15:21:39 5910
211 -+++ trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 17:17:09 5911
212 -@@ -85,6 +85,7 @@
213 - #include <errno.h>
214 - #include <cstdlib>
215 - #include <cstring>
216 -+#include <cstdio>
217 - /* end standard C++ headers. */
218 -
219 - #ifdef __cplusplus
220
221 diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
222 deleted file mode 100644
223 index f7ca6237cf5..00000000000
224 --- a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
225 +++ /dev/null
226 @@ -1,16 +0,0 @@
227 -upstream has reworked their code, so just do a minimal hack for the older ver
228 -
229 -http://bugs.gentoo.org/270621
230 -
231 ---- sdcc/as/link/getline.h
232 -+++ sdcc/as/link/getline.h
233 -@@ -30,6 +30,9 @@
234 -
235 - #include <stdio.h>
236 -
237 -+#undef getline /* just in case */
238 -+#define getline sdcc_getline
239 -+
240 - #ifdef __cplusplus
241 - extern "C"
242 - {
243
244 diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
245 deleted file mode 100644
246 index 58d10299aa8..00000000000
247 --- a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
248 +++ /dev/null
249 @@ -1,209 +0,0 @@
250 -fix from upstream for implicit decls
251 -
252 ---- trunk/sdcc/debugger/mcs51/sdcdb.c 2009/09/20 11:50:19 5517
253 -+++ trunk/sdcc/debugger/mcs51/sdcdb.c 2010/04/14 16:18:37 5813
254 -@@ -34,6 +34,10 @@
255 - #include <readline/readline.h>
256 - #include <readline/history.h>
257 - #endif /* HAVE_LIBREADLINE */
258 -+#ifdef HAVE_UNISTD_H
259 -+#include <unistd.h>
260 -+#endif
261 -+#include <sys/wait.h>
262 -
263 - #ifdef SDCDB_DEBUG
264 - int sdcdbDebug = 0;
265 -@@ -1609,7 +1609,7 @@ static void parseCmdLine (int argc, char **argv)
266 - }
267 -
268 - if (strncmp(argv[i],"-cd=",4) == 0) {
269 -- chdir(argv[i][4]);
270 -+ chdir(&argv[i][4]);
271 - continue;
272 - }
273 -
274 ---- trunk/sdcc/debugger/mcs51/config.h.in
275 -+++ trunk/sdcc/debugger/mcs51/config.h.in
276 -@@ -15,6 +15,10 @@
277 -
278 - #undef HAVE_LIBREADLINE
279 -
280 -+#undef HAVE_UNISTD_H
281 -+
282 -+#undef HAVE_SYS_WAIT_H
283 -+
284 - #endif
285 -
286 - /* End of config.h */
287 -
288 -fix from upstream for collision between "link" in unistd.h and local "link"
289 -
290 ---- trunk/sdcc/debugger/mcs51/symtab.h 2006/09/16 14:10:20 4379
291 -+++ trunk/sdcc/debugger/mcs51/symtab.h 2010/04/14 16:18:37 5813
292 -@@ -106,13 +106,13 @@
293 - short num_elem; /* # of elems if type==array */
294 - short ptr_const :1; /* pointer is constant */
295 - short ptr_volatile:1; /* pointer is volatile */
296 -- struct link *tspec; /* pointer type specifier */
297 -+ struct st_link *tspec; /* pointer type specifier */
298 - } declarator ;
299 -
300 - #define DECLARATOR 0
301 - #define SPECIFIER 1
302 -
303 --typedef struct link {
304 -+typedef struct st_link {
305 - unsigned class : 1 ; /* DECLARATOR or SPECIFIER */
306 - unsigned tdef : 1 ; /* current link created by */
307 - /* typedef if this flag is set*/
308 -@@ -121,8 +121,8 @@
309 - declarator d ; /* if CLASS == DECLARATOR */
310 - } select ;
311 -
312 -- struct link *next ; /* next element on the chain */
313 --} link ;
314 -+ struct st_link *next ; /* next element on the chain */
315 -+} st_link ;
316 -
317 - typedef struct symbol {
318 - char *name ;
319 -@@ -136,8 +136,8 @@
320 - unsigned addr ; /* address if the symbol */
321 - unsigned eaddr ; /* end address for functions */
322 - char addr_type ; /* which address space */
323 -- link *type ; /* start of type chain */
324 -- link *etype ; /* end of type chain */
325 -+ st_link *type ; /* start of type chain */
326 -+ st_link *etype ; /* end of type chain */
327 - char scopetype ; /* 'G' global, 'F' - file, 'L' local */
328 - char *sname ; /* if 'F' or 'L' then scope name */
329 - char *rname ; /* real name i.e. mangled beyond recognition */
330 -@@ -242,6 +242,6 @@
331 - DEFSETFUNC(moduleWithName);
332 - DEFSETFUNC(moduleWithCName);
333 - DEFSETFUNC(moduleWithAsmName);
334 --unsigned int getSize (link *);
335 -+unsigned int getSize (st_link *);
336 -
337 - #endif
338 -
339 ---- a/sdcc/debugger/mcs51/symtab.c
340 -+++ b/sdcc/debugger/mcs51/symtab.c
341 -@@ -31,7 +31,7 @@ DEFSETFUNC(symWithRName);
342 - /*------------------------------------------------------------------*/
343 - /* getSize - returns size of a type chain in bits */
344 - /*------------------------------------------------------------------*/
345 --unsigned int getSize ( link *p )
346 -+unsigned int getSize ( st_link *p )
347 - {
348 - /* if nothing return 0 */
349 - if ( ! p )
350 -@@ -127,8 +127,8 @@ static char *parseTypeInfo (symbol *sym, char *s)
351 - /* bp now points to '}' ... go past it */
352 - s = ++bp;
353 - while (*s != ')') { /* till we reach the end */
354 -- link *type;
355 -- type = Safe_calloc(1,sizeof(link));
356 -+ st_link *type;
357 -+ type = Safe_calloc(1,sizeof(st_link));
358 - if (*s == ',') s++;
359 -
360 - /* is a declarator */
361 ---- a/sdcc/debugger/mcs51/cmd.c
362 -+++ b/sdcc/debugger/mcs51/cmd.c
363 -@@ -327,8 +327,8 @@ static char *warranty=
364 - "POSSIBILITY OF SUCH DAMAGES.\n";
365 - #endif
366 -
367 --static void printTypeInfo(link *);
368 --static void printValAggregates (symbol *,link *,char,unsigned int,int);
369 -+static void printTypeInfo(st_link *);
370 -+static void printValAggregates (symbol *,st_link *,char,unsigned int,int);
371 - static int printOrSetSymValue (symbol *sym, context *cctxt,
372 - int flg, int dnum, int fmt,
373 - char *rs, char *val, char cmp);
374 -@@ -2323,7 +2323,7 @@ int cmdListSrc (char *s, context *cctxt)
375 - return 0;
376 - }
377 -
378 --static unsigned long getValBasic(symbol *sym, link *type, char *val)
379 -+static unsigned long getValBasic(symbol *sym, st_link *type, char *val)
380 - {
381 - char *s;
382 - union
383 -@@ -2347,7 +2347,7 @@ static unsigned long getValBasic(symbol *sym, link *type, char *val)
384 - {
385 - if (IS_INTEGRAL(type))
386 - {
387 -- link *etype;
388 -+ st_link *etype;
389 - if ( type->next )
390 - etype = type->next;
391 - else
392 -@@ -2460,7 +2460,7 @@ static void printFmtInteger(char *deffmt,int fmt, long val,
393 - /*-----------------------------------------------------------------*/
394 - /* printValBasic - print value of basic types */
395 - /*-----------------------------------------------------------------*/
396 --static void printValBasic(symbol *sym, link *type,
397 -+static void printValBasic(symbol *sym, st_link *type,
398 - char mem, unsigned addr,int size, int fmt)
399 - {
400 - union {
401 -@@ -2484,7 +2484,7 @@ static void printValBasic(symbol *sym, link *type,
402 - else
403 - if (IS_INTEGRAL(type))
404 - {
405 -- link *etype;
406 -+ st_link *etype;
407 - if ( type->next )
408 - etype = type->next;
409 - else
410 -@@ -2534,10 +2534,10 @@ static void printValFunc (symbol *sym, int fmt)
411 - /*-----------------------------------------------------------------*/
412 - /* printArrayValue - will print the values of array elements */
413 - /*-----------------------------------------------------------------*/
414 --static void printArrayValue (symbol *sym, link *type,
415 -+static void printArrayValue (symbol *sym, st_link *type,
416 - char space, unsigned int addr, int fmt)
417 - {
418 -- link *elem_type = type->next;
419 -+ st_link *elem_type = type->next;
420 - int i;
421 -
422 - fprintf(stdout,"{");
423 -@@ -2558,7 +2558,7 @@ static void printArrayValue (symbol *sym, link *type,
424 - /*-----------------------------------------------------------------*/
425 - /* printStructValue - prints structures elements */
426 - /*-----------------------------------------------------------------*/
427 --static void printStructValue (symbol *sym, link *type,
428 -+static void printStructValue (symbol *sym, st_link *type,
429 - char space, unsigned int addr, int fmt)
430 - {
431 - symbol *fields = SPEC_STRUCT(type)->fields;
432 -@@ -2581,7 +2581,7 @@ static void printStructValue (symbol *sym, link *type,
433 - /*-----------------------------------------------------------------*/
434 - /* printValAggregates - print value of aggregates */
435 - /*-----------------------------------------------------------------*/
436 --static void printValAggregates (symbol *sym, link *type,
437 -+static void printValAggregates (symbol *sym, st_link *type,
438 - char space,unsigned int addr, int fmt)
439 - {
440 -
441 -@@ -2606,7 +2606,7 @@ static int printOrSetSymValue (symbol *sym, context *cctxt,
442 - static char fmtChar[] = " todx ";
443 - static int stack = 1;
444 - symbol *fields;
445 -- link *type;
446 -+ st_link *type;
447 - unsigned int addr;
448 - int size, n;
449 - char *s, *s2;
450 -@@ -2808,7 +2808,7 @@ static void printStructInfo (structdef *sdef)
451 - /*-----------------------------------------------------------------*/
452 - /* printTypeInfo - print out the type information */
453 - /*-----------------------------------------------------------------*/
454 --static void printTypeInfo(link *p)
455 -+static void printTypeInfo(st_link *p)
456 - {
457 - if (!p)
458 - return ;
459
460 diff --git a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild b/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
461 deleted file mode 100644
462 index bac1374e0bf..00000000000
463 --- a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
464 +++ /dev/null
465 @@ -1,52 +0,0 @@
466 -# Copyright 1999-2018 Gentoo Foundation
467 -# Distributed under the terms of the GNU General Public License v2
468 -
469 -EAPI=0
470 -
471 -inherit eutils
472 -
473 -MY_PV=${PV/*_p/}
474 -DESCRIPTION="Small device C compiler (for various microprocessors)"
475 -HOMEPAGE="http://sdcc.sourceforge.net/"
476 -SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz
477 - doc? ( http://sdcc.sourceforge.net/snapshots/docs/${PN}-doc-${MY_PV}.tar.gz )"
478 -
479 -LICENSE="GPL-2"
480 -SLOT="0"
481 -KEYWORDS="amd64 x86"
482 -IUSE="doc"
483 -
484 -DEPEND=">=dev-embedded/gputils-0.13.2
485 - dev-libs/boehm-gc"
486 -RDEPEND="!dev-embedded/sdcc-svn
487 - !dev-embedded/sdcc-svn"
488 -
489 -S=${WORKDIR}/${PN}
490 -
491 -src_unpack() {
492 - unpack ${A}
493 - cd "${S}"
494 -
495 - # Fix conflicting variable names between Gentoo and sdcc
496 - find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g {} \; || die "sed failed"
497 - find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g {} \; || die "sed failed"
498 - find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g {} \; || die "sed failed"
499 -
500 - # --as-needed fix :
501 - sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
502 -}
503 -
504 -src_compile() {
505 - econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
506 - emake || die "emake failed"
507 -}
508 -
509 -src_install() {
510 - make DESTDIR="${D}" install || die "Install failed"
511 - dodoc ChangeLog
512 - if use doc ; then
513 - cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
514 - fi
515 - find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
516 - find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
517 -}
518
519 diff --git a/dev-embedded/sdcc/sdcc-2.6.0.ebuild b/dev-embedded/sdcc/sdcc-2.6.0.ebuild
520 deleted file mode 100644
521 index ce41e43289b..00000000000
522 --- a/dev-embedded/sdcc/sdcc-2.6.0.ebuild
523 +++ /dev/null
524 @@ -1,48 +0,0 @@
525 -# Copyright 1999-2018 Gentoo Foundation
526 -# Distributed under the terms of the GNU General Public License v2
527 -
528 -EAPI=0
529 -
530 -DESCRIPTION="Small device C compiler (for various microprocessors)"
531 -HOMEPAGE="http://sdcc.sourceforge.net/"
532 -SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz
533 - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.gz )"
534 -
535 -LICENSE="GPL-2"
536 -SLOT="0"
537 -KEYWORDS="~amd64 ~x86"
538 -IUSE="doc"
539 -
540 -DEPEND=">=dev-embedded/gputils-0.13.2
541 - dev-libs/boehm-gc"
542 -RDEPEND="!dev-embedded/sdcc-svn"
543 -
544 -S=${WORKDIR}/${PN}
545 -
546 -src_unpack() {
547 - unpack ${A}
548 - cd "${S}"
549 -
550 - # Fix conflicting variable names between Gentoo and sdcc
551 - find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g {} \; || die "sed failed"
552 - find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g {} \; || die "sed failed"
553 - find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g {} \; || die "sed failed"
554 -
555 - # --as-needed fix :
556 - sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
557 -}
558 -
559 -src_compile() {
560 - econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
561 - emake || die "emake failed"
562 -}
563 -
564 -src_install() {
565 - make DESTDIR="${D}" install || die "Install failed"
566 - dodoc ChangeLog
567 - if use doc ; then
568 - cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
569 - fi
570 - find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
571 - find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
572 -}
573
574 diff --git a/dev-embedded/sdcc/sdcc-2.7.0.ebuild b/dev-embedded/sdcc/sdcc-2.7.0.ebuild
575 deleted file mode 100644
576 index 089966f3433..00000000000
577 --- a/dev-embedded/sdcc/sdcc-2.7.0.ebuild
578 +++ /dev/null
579 @@ -1,48 +0,0 @@
580 -# Copyright 1999-2018 Gentoo Foundation
581 -# Distributed under the terms of the GNU General Public License v2
582 -
583 -EAPI=0
584 -
585 -DESCRIPTION="Small device C compiler (for various microprocessors)"
586 -HOMEPAGE="http://sdcc.sourceforge.net/"
587 -SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
588 - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
589 -
590 -LICENSE="GPL-2"
591 -SLOT="0"
592 -KEYWORDS="~amd64 ~x86"
593 -IUSE="doc"
594 -
595 -DEPEND=">=dev-embedded/gputils-0.13.2
596 - dev-libs/boehm-gc"
597 -RDEPEND="!dev-embedded/sdcc-svn"
598 -
599 -S=${WORKDIR}/${PN}
600 -
601 -src_unpack() {
602 - unpack ${A}
603 - cd "${S}"
604 -
605 - # Fix conflicting variable names between Gentoo and sdcc
606 - find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g {} \; || die "sed failed"
607 - find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g {} \; || die "sed failed"
608 - find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g {} \; || die "sed failed"
609 -
610 - # --as-needed fix :
611 - sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
612 -}
613 -
614 -src_compile() {
615 - econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
616 - emake || die "emake failed"
617 -}
618 -
619 -src_install() {
620 - make DESTDIR="${D}" install || die "Install failed"
621 - dodoc ChangeLog
622 - if use doc ; then
623 - cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
624 - fi
625 - find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
626 - find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
627 -}
628
629 diff --git a/dev-embedded/sdcc/sdcc-2.8.0.ebuild b/dev-embedded/sdcc/sdcc-2.8.0.ebuild
630 deleted file mode 100644
631 index 0694d18904a..00000000000
632 --- a/dev-embedded/sdcc/sdcc-2.8.0.ebuild
633 +++ /dev/null
634 @@ -1,76 +0,0 @@
635 -# Copyright 1999-2018 Gentoo Foundation
636 -# Distributed under the terms of the GNU General Public License v2
637 -
638 -EAPI=0
639 -
640 -inherit eutils autotools
641 -
642 -DESCRIPTION="Small device C compiler (for various microprocessors)"
643 -HOMEPAGE="http://sdcc.sourceforge.net/"
644 -SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
645 - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
646 -
647 -LICENSE="GPL-2"
648 -SLOT="0"
649 -KEYWORDS="~amd64 ~x86"
650 -IUSE="boehm-gc doc"
651 -
652 -DEPEND=">=dev-embedded/gputils-0.13.2
653 - boehm-gc? ( dev-libs/boehm-gc )"
654 -RDEPEND="!dev-embedded/sdcc-svn"
655 -
656 -S=${WORKDIR}/${PN}
657 -
658 -src_unpack() {
659 - unpack ${A}
660 - cd "${S}"
661 -
662 - # Fix conflicting variable names between Gentoo and sdcc
663 - find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g {} \; || die "sed failed"
664 - find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g {} \; || die "sed failed"
665 - find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g {} \; || die "sed failed"
666 -
667 - # Fix automagic C{,XX}FLAGS
668 - epatch "${FILESDIR}"/${P}-flags.patch
669 - epatch "${FILESDIR}"/${P}-gcc44.patch
670 -
671 - # We'll install doc manually
672 - sed -i -e '/SDCC_DOC/d' Makefile.in || die "sed failed"
673 - sed -i -e 's/all install-doc/all/' as/Makefile.in || die "sed failed"
674 - sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die "sed failed"
675 -
676 - eautoreconf
677 -}
678 -
679 -src_compile() {
680 - econf \
681 - $(use_enable boehm-gc libgc) \
682 - --disable-doc \
683 - || die "configure failed"
684 - emake || die "emake failed"
685 -}
686 -
687 -src_install() {
688 - make DESTDIR="${D}" install || die "Install failed"
689 -
690 - insinto /usr/share/doc/${PF}
691 - if use doc ; then
692 - cd "${WORKDIR}"/doc
693 - dohtml -r *.html ucsim
694 - rm -rf *.html ucsim
695 - dohtml as/asxhtm.html
696 - rm -f as/asxhtm.html
697 - rm -f INSTALL.txt
698 - else
699 - dohtml as/doc/asxhtm.html
700 - rm -f as/doc/asxhtm.html
701 - mv as/doc as/as || die "Failed to rename as/doc"
702 - doins -r as/as
703 - mv sim/ucsim/doc sim/ucsim/ucsim || die "Failed to rename sim/ucsim/doc"
704 - dohtml -r sim/ucsim/ucsim
705 - rm -f INSTALL.txt Makefile* *.mk
706 - cd doc
707 - fi
708 - doins -r *
709 - prepalldocs
710 -}
711
712 diff --git a/dev-embedded/sdcc/sdcc-2.9.0.ebuild b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
713 deleted file mode 100644
714 index 2a6ad593874..00000000000
715 --- a/dev-embedded/sdcc/sdcc-2.9.0.ebuild
716 +++ /dev/null
717 @@ -1,96 +0,0 @@
718 -# Copyright 1999-2016 Gentoo Foundation
719 -# Distributed under the terms of the GNU General Public License v2
720 -
721 -EAPI="2"
722 -
723 -inherit eutils
724 -
725 -if [[ ${PV} == "9999" ]] ; then
726 - ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
727 - inherit subversion autotools
728 - docs_compile() { return 0; }
729 -else
730 - SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
731 - doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
732 - KEYWORDS="~amd64 ~x86"
733 - docs_compile() { return 1; }
734 -fi
735 -
736 -DESCRIPTION="Small device C compiler (for various microprocessors)"
737 -HOMEPAGE="http://sdcc.sourceforge.net/"
738 -
739 -LICENSE="GPL-2"
740 -SLOT="0"
741 -IUSE="+boehm-gc doc"
742 -RESTRICT="strip"
743 -
744 -RDEPEND="sys-libs/ncurses
745 - sys-libs/readline
746 - >=dev-embedded/gputils-0.13.7
747 - boehm-gc? ( dev-libs/boehm-gc )
748 - !dev-embedded/sdcc-svn"
749 -DEPEND="${RDEPEND}"
750 -if docs_compile ; then
751 - DEPEND+="
752 - doc? (
753 - >=app-office/lyx-1.3.4
754 - dev-tex/latex2html
755 - )"
756 -fi
757 -
758 -S=${WORKDIR}/${PN}
759 -
760 -src_prepare() {
761 - # Fix conflicting variable names between Gentoo and sdcc
762 - find \
763 - '(' -name 'Makefile*.in' -o -name configure ')' \
764 - -exec sed -r -i \
765 - -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
766 - {} + || die
767 -
768 - epatch "${FILESDIR}"/${P}-gcc44.patch
769 - epatch "${FILESDIR}"/${P}-getline.patch
770 - epatch "${FILESDIR}"/${P}-headers.patch
771 - epatch "${FILESDIR}"/${P}-build.patch
772 -
773 - # We'll install doc manually
774 - sed -i -e '/SDCC_DOC/d' Makefile.in || die
775 - sed -i -e 's/all install-doc/all/' as/Makefile.in || die
776 - sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die
777 -
778 - [[ ${PV} == "9999" ]] && eautoreconf
779 -}
780 -
781 -src_configure() {
782 - ac_cv_prog_STRIP=true \
783 - econf \
784 - $(use_enable boehm-gc libgc) \
785 - $(docs_compile && use_enable doc || echo --disable-doc)
786 -}
787 -
788 -fsrc_compile() {
789 - emake || die
790 - if docs_compile && use doc ; then
791 - cd doc
792 - local d
793 - for d in cdbfileformat sdccman test_suite_spec ; do
794 - lyx -e html ${d} || die
795 - done
796 - fi
797 -}
798 -
799 -src_install() {
800 - emake DESTDIR="${D}" install || die
801 - dodoc doc/*.txt doc/*/*.txt
802 - find "${D}" -name .deps -exec rm -rf {} +
803 -
804 - if use doc ; then
805 - docs_compile || cd "${WORKDIR}"/doc
806 - dohtml -r *
807 - fi
808 -
809 - # a bunch of archives (*.a) are built & installed by gputils
810 - # for PIC processors, but they do not work with standard `ar`
811 - # & `scanelf` utils and they're not for the host.
812 - env RESTRICT="" prepstrip "${D%/}"/usr/bin
813 -}