[gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/
@ 2018-05-09 21:00 Mikle Kolyada
  0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2018-05-09 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     bd620ef713c6b0fbdbc21e803da6b68263b93980
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 20:59:39 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May  9 21:00:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd620ef7

dev-embedded/sdcc: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-embedded/sdcc/Manifest                       |  10 --
 dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch   |  74 --------
 dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch   |   9 -
 dev-embedded/sdcc/files/sdcc-2.9.0-build.patch   |  51 ------
 dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch   |  15 --
 dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch |  16 --
 dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch | 209 -----------------------
 dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild    |  52 ------
 dev-embedded/sdcc/sdcc-2.6.0.ebuild              |  48 ------
 dev-embedded/sdcc/sdcc-2.7.0.ebuild              |  48 ------
 dev-embedded/sdcc/sdcc-2.8.0.ebuild              |  76 ---------
 dev-embedded/sdcc/sdcc-2.9.0.ebuild              |  96 -----------
 12 files changed, 704 deletions(-)

diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 8a7e86568d2..ab1a89d8386 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,12 +1,2 @@
-DIST sdcc-doc-2.6.0.tar.gz 1026186 BLAKE2B 67c764db614240b8d870ae98c3e4eb0e85735ce42165a7c2d7fb929053008a9101d455e11d1a20ce8c4a3462200a0e7d0ba2ec5c7ea1a025d444772ac5fc1a02 SHA512 3cffb2ac4bbe65539951b134f89449341bff9f5682ec344c244b28efea5fe96c753caa873f26c75b8fc0a19f48404ae0a43f05e41eabafe66fd0f493b4065f97
-DIST sdcc-doc-2.7.0.tar.bz2 1211113 BLAKE2B 4435ba6e75e6037e1e267adca65ba029ccfc87a677fb7c13bc090c04a91485205def7f3e702c439b9b54514fc0fd14dd2175bcfff7c07933101b114b2fd9b6e8 SHA512 2ed6503551b7c9e3e674a3bf391e731c2fa838f3978761982ab1a072d47b449b73e6efe3b05967bcdfe623c2fc933503702912721b90df95dab9b332dfacad9a
-DIST sdcc-doc-2.8.0.tar.bz2 1363271 BLAKE2B 0dc5ea0d55cdfda2578324337fa43757fa256c064663b9cfbfa9eb098e8dcdc7a1472c2ab7288c478cbc515e3fd2b11acbaed49599f24376bf4bfcf537b8af02 SHA512 201fcb0ffb96649507dcb0489789e7a89cb30705e9eae3f40b6ce907df3464439488d1369f7d5557873e28bcd44a2af82bb3dab2f02adbf0d6ea88a711bb5d9b
-DIST sdcc-doc-2.9.0.tar.bz2 1388379 BLAKE2B 385b0a44adb55c09b54161b6f84c8c7f5b57dd3e1b525cdda7daef67dd4f75cabf62432038a30b06cd0045acf0da5c30eb1d0c76e3b35830ffc5492d54a3e25d SHA512 c0214437dada2d2acc3590d8a82b077cd841a93da7fe76cc259adea0da67e6ea0ced14dc80c5ce05261aa5d7e2f345f8cf994dafa4e38bd404b00fd6b5b2d168
-DIST sdcc-doc-20060502.tar.gz 1027650 BLAKE2B 104a5614870910a80ad83ee963f3e8636ca7064515905a3b05d3e80225f10bf81b05be88684cc6aaff788ae121003ff1b60a80c32081d52972e049f3ca652f38 SHA512 aba51493c76a019fb439fa8ff2f645bc519bdb9ded30a2871d51f2dd6eedc7315f826e28d5efed0eae731060c22b82071025cec5ae4407c5f6acdd2c18292ff2
 DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
-DIST sdcc-src-2.6.0.tar.gz 4229518 BLAKE2B 3c30ed93154c86d8f4721917372bd850b957ed6408bf253051da42d4497637fe8c753a0a481dee07dfa51f289153936b7b5b2970e942d1aa698d01e00c9e8ab8 SHA512 d5802ad7804c771c25b72b5038cdc291d3e67a618fde6a9d03235954a6a133e0ecc42f26eabcc933806e54457e44efea81dc79ac03cb547556da41dec3eff1e6
-DIST sdcc-src-2.7.0.tar.bz2 3405687 BLAKE2B b7379f783cb1e805059210d46395fb5acfdd331249fef7aeeab66c6b3fcb95d77b7fa146d97b83d0c6659d83fe37734dfc4d7cb59fee3abd45d8e10271628f84 SHA512 95625aadf386f0da65f4ddb856fd7da8a333ed884e308993a0897a205561438b60d2836a60e33a849f6b6ab5dd938b822072641866596897f48fa62a4c536dd3
-DIST sdcc-src-2.8.0.tar.bz2 3460693 BLAKE2B 9481fa90dfa0fd0e84396f54795c78f7bc95b4f0c0220042fe5506b14193c6067f77f5a9b683fd9bebc0797a9d8c7a20f20cc7556c1853c84f39ed774a2b7f1e SHA512 91f43ea275f4c27e5c475a9dbfe5e9c7d5804a530151420473cbc65a48ca15c65a6e38628e0bf927d89cd8ddb6b6030d5d65aa9cba7963e23ac18bde42951fd5
-DIST sdcc-src-2.9.0.tar.bz2 3764926 BLAKE2B ec8289f5204e45e2fdd2ca379cad9e6f65749452888e3373bd073d25fda5df9dae3fe2663a1380b9d292754f318f84f506a73136f44df33d45f079ba5f5fa6c4 SHA512 0703f46db590fa3248c104d5045b0807fc18898aec13a8f5f762ff4e573f3fc199590050fd82c665ae71cd586081fe88db671dcc498770d736650be0dcf32b0e
-DIST sdcc-src-20060502.tar.gz 4145716 BLAKE2B 7f08dc0f04b3fc0b6b294b996901c32232547fb1d406d8bcba42b62eb4ec3db159a292c4eba18664653e30c71eddfc3efbcffbe92d1895f32085f1c90abad13c SHA512 0817f14871822874a3e4b5d8be68df56c7f19444c283d4cd4aa8436af6984631dd0f8322080380d227bbc8d931e6cbc84a81cfbced20cd56f2765cdaf1d552cd
 DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e

diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
deleted file mode 100644
index cd920e988d9..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nadur sdcc-orig/configure.in sdcc/configure.in
---- sdcc-orig/configure.in	2008-04-20 15:24:14.000000000 +0200
-+++ sdcc/configure.in	2008-04-20 15:27:18.000000000 +0200
-@@ -320,17 +320,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
--  CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
--  CFLAGS="-pipe $CFLAGS"
--fi
--
- 
- # Checks for typedefs, structures, and compiler characteristics.
- # ===========================================================================
-diff -Nadur sdcc-orig/debugger/mcs51/configure.in sdcc/debugger/mcs51/configure.in
---- sdcc-orig/debugger/mcs51/configure.in	2008-04-20 15:24:19.000000000 +0200
-+++ sdcc/debugger/mcs51/configure.in	2008-04-20 15:26:53.000000000 +0200
-@@ -148,17 +148,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
--  CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
--  CFLAGS="-pipe $CFLAGS"
--fi
--
- 
- # Set standard installation paths
- # ===========================================================================
-diff -Nadur sdcc-orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
---- sdcc-orig/sim/ucsim/configure.in	2008-04-20 15:24:11.000000000 +0200
-+++ sdcc/sim/ucsim/configure.in	2008-04-20 15:26:06.000000000 +0200
-@@ -514,28 +514,6 @@
- M_OR_MM=$ucsim_cv_MM
- AC_SUBST(M_OR_MM)
- 
--# This is the first time when CFLAGS are set/modified!!
--
--DD_COPT(CXX, ggdb)
--DD_COPT(CXX, gstabs)
--if test "$ucsim_cv_CXXgstabs" = "yes"; then
--   gopt="-gstabs+ -g3"
--elif test "$ucsim_cv_CXXggdb" = "yes"; then
--     gopt="-ggdb -g3"
--else
--     gopt="-g"
--fi
--if test "$CXXFLAGS"x = x ;then
--        CXXFLAGS="$gopt"
--else
--        CXXFLAGS="$CXXFLAGS $gopt"
--fi
--
--DD_COPT(CXX, pipe)
--if test "$ucsim_cv_CXXpipe" = "yes"; then
--  CXXFLAGS="$CXXFLAGS -pipe"
--fi
--
- PICOPT=""
- SHAREDLIB="no"
- DD_COPT_NO_IGNORE(CXX, fPIC)

diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
deleted file mode 100644
index 8d0ddf04519..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc sdcc/sim/ucsim/cmd.src/cmdlex.cc
---- sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc	2004-07-16 19:32:30.000000000 +0300
-+++ sdcc/sim/ucsim/cmd.src/cmdlex.cc	2009-08-10 11:09:58.000000000 +0300
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+
- #line 2 "cmdlex.cc"
- 
- #line 4 "cmdlex.cc"

diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
deleted file mode 100644
index b944b00d83a..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-fix parallel build issues
-
---- sdcc/device/lib/Makefile.in
-+++ sdcc/device/lib/Makefile.in
-@@ -347,37 +347,21 @@
- 	  cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \
- 	fi
- 
--$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
- ifeq ($(LIB_TYPE), SDCCLIB)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
--	../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ../../bin/sdcclib -a $@ $^
- else ifeq ($(LIB_TYPE), AR)
--	ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
--	ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
--	ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
--	ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ar -Scq $@ $^
- else ifeq ($(LIB_TYPE), RANLIB)
--	ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib
--	ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib
--	ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib
--	ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib
-+mklib = ar -Scq $@ $^ && $(top_builddir)/bin/asranlib $@
- else
--	rm -f $(SDCCPORTDIR)/libfloat.lib
--	for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done
--	cp $(OBJECTS_FLOAT) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/libint.lib
--	for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done
--	cp $(OBJECTS_INT) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/liblong.lib
--	for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done
--	cp $(OBJECTS_LONG) $(SDCCPORTDIR)
--	rm -f $(SDCCPORTDIR)/libsdcc.lib
--	for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done
--	cp $(OBJECTS_SDCC) $(SDCCPORTDIR)
-+mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@; cp $^ $(SDCCPORTDIR)
- endif
- 
-+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib)
-+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib)
-+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib)
-+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib)
-+
- clean_intermediate:
- 	rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym
- 

diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
deleted file mode 100644
index fb4ac7918c5..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-like fix already in upstream
-
-* sim/ucsim/cmd.src/cmdlex.cc: regenerated,
-  fix for parch #3038644: Fix for GCC-4.4 compile error
-
---- trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc	2010/08/04 15:21:39	5910
-+++ trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc	2010/08/04 17:17:09	5911
-@@ -85,6 +85,7 @@
- #include <errno.h>
- #include <cstdlib>
- #include <cstring>
-+#include <cstdio>
- /* end standard C++ headers. */
- 
- #ifdef __cplusplus

diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
deleted file mode 100644
index f7ca6237cf5..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream has reworked their code, so just do a minimal hack for the older ver
-
-http://bugs.gentoo.org/270621
-
---- sdcc/as/link/getline.h
-+++ sdcc/as/link/getline.h
-@@ -30,6 +30,9 @@
- 
- #include <stdio.h>
- 
-+#undef getline	/* just in case */
-+#define getline sdcc_getline
-+
- #ifdef __cplusplus
- extern "C"
- {

diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
deleted file mode 100644
index 58d10299aa8..00000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-fix from upstream for implicit decls
-
---- trunk/sdcc/debugger/mcs51/sdcdb.c	2009/09/20 11:50:19	5517
-+++ trunk/sdcc/debugger/mcs51/sdcdb.c	2010/04/14 16:18:37	5813
-@@ -34,6 +34,10 @@
- #include <readline/readline.h>
- #include <readline/history.h>
- #endif  /* HAVE_LIBREADLINE */
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <sys/wait.h>
- 
- #ifdef SDCDB_DEBUG
- int   sdcdbDebug = 0;
-@@ -1609,7 +1609,7 @@ static void parseCmdLine (int argc, char **argv)
-             }
- 
-             if (strncmp(argv[i],"-cd=",4) == 0) {
--                chdir(argv[i][4]);
-+                chdir(&argv[i][4]);
-                 continue;
-             }
- 
---- trunk/sdcc/debugger/mcs51/config.h.in
-+++ trunk/sdcc/debugger/mcs51/config.h.in
-@@ -15,6 +15,10 @@
- 
- #undef HAVE_LIBREADLINE
- 
-+#undef HAVE_UNISTD_H
-+
-+#undef HAVE_SYS_WAIT_H
-+
- #endif
- 
- /* End of config.h */
-
-fix from upstream for collision between "link" in unistd.h and local "link"
-
---- trunk/sdcc/debugger/mcs51/symtab.h	2006/09/16 14:10:20	4379
-+++ trunk/sdcc/debugger/mcs51/symtab.h	2010/04/14 16:18:37	5813
-@@ -106,13 +106,13 @@
-     short    num_elem;     /* # of elems if type==array  */
-     short    ptr_const :1;   /* pointer is constant        */
-     short    ptr_volatile:1; /* pointer is volatile        */
--    struct link *tspec;     /* pointer type specifier      */
-+    struct st_link *tspec;     /* pointer type specifier      */
- } declarator ;
- 
- #define DECLARATOR   0
- #define SPECIFIER    1
- 
--typedef struct link {
-+typedef struct st_link {
-     unsigned class : 1      ;  /* DECLARATOR or SPECIFIER    */
-     unsigned tdef  : 1      ;  /* current link created by    */
-     /* typedef if this flag is set*/
-@@ -121,8 +121,8 @@
-         declarator     d     ;  /* if CLASS == DECLARATOR     */
-     } select ;
- 
--    struct link    *next    ;  /* next element on the chain  */
--} link ;
-+    struct st_link    *next    ;  /* next element on the chain  */
-+} st_link ;
- 
- typedef struct symbol {
-     char     *name               ;
-@@ -136,8 +136,8 @@
-     unsigned addr               ;  /* address if the symbol */
-     unsigned eaddr              ;  /* end address for functions */
-     char     addr_type          ;  /* which address space   */
--    link     *type              ;  /* start of type chain        */
--    link     *etype             ;  /* end of type chain          */
-+    st_link  *type              ;  /* start of type chain        */
-+    st_link  *etype             ;  /* end of type chain          */
-     char     scopetype         ;  /* 'G' global, 'F' - file, 'L' local */
-     char     *sname             ;  /* if 'F' or 'L' then scope name */
-     char     *rname             ;  /* real name i.e. mangled beyond recognition */
-@@ -242,6 +242,6 @@
- DEFSETFUNC(moduleWithName);
- DEFSETFUNC(moduleWithCName);
- DEFSETFUNC(moduleWithAsmName);
--unsigned int getSize (link *);
-+unsigned int getSize (st_link *);
- 
- #endif
-	
---- a/sdcc/debugger/mcs51/symtab.c
-+++ b/sdcc/debugger/mcs51/symtab.c
-@@ -31,7 +31,7 @@ DEFSETFUNC(symWithRName);
- /*------------------------------------------------------------------*/
- /* getSize - returns size of a type chain in bits                   */
- /*------------------------------------------------------------------*/
--unsigned int   getSize ( link *p )
-+unsigned int   getSize ( st_link *p )
- {
-     /* if nothing return 0 */
-     if ( ! p )
-@@ -127,8 +127,8 @@ static char  *parseTypeInfo (symbol *sym, char *s)
-     /* bp now points to '}' ... go past it */
-     s = ++bp;
-     while (*s != ')') { /* till we reach the end */
--        link *type;
--        type = Safe_calloc(1,sizeof(link));
-+        st_link *type;
-+        type = Safe_calloc(1,sizeof(st_link));
-         if (*s == ',') s++;
- 
-         /* is a declarator */
---- a/sdcc/debugger/mcs51/cmd.c
-+++ b/sdcc/debugger/mcs51/cmd.c
-@@ -327,8 +327,8 @@ static char *warranty=
- "POSSIBILITY OF SUCH DAMAGES.\n";
- #endif
- 
--static void printTypeInfo(link *);
--static void printValAggregates (symbol *,link *,char,unsigned int,int);
-+static void printTypeInfo(st_link *);
-+static void printValAggregates (symbol *,st_link *,char,unsigned int,int);
- static  int printOrSetSymValue (symbol *sym, context *cctxt,
-                                 int flg, int dnum, int fmt,
-                                 char *rs, char *val, char cmp);
-@@ -2323,7 +2323,7 @@ int cmdListSrc (char *s, context *cctxt)
-     return 0;
- }
- 
--static unsigned long getValBasic(symbol *sym, link *type, char *val)
-+static unsigned long getValBasic(symbol *sym, st_link *type, char *val)
- {
-     char *s;
-     union
-@@ -2347,7 +2347,7 @@ static unsigned long getValBasic(symbol *sym, link *type, char *val)
-     {
-             if (IS_INTEGRAL(type))
-         {
--            link *etype;
-+            st_link *etype;
-             if ( type->next )
-                 etype = type->next;
-             else
-@@ -2460,7 +2460,7 @@ static void printFmtInteger(char *deffmt,int fmt, long val,
- /*-----------------------------------------------------------------*/
- /* printValBasic - print value of basic types                      */
- /*-----------------------------------------------------------------*/
--static void printValBasic(symbol *sym, link *type,
-+static void printValBasic(symbol *sym, st_link *type,
-                           char mem, unsigned addr,int size, int fmt)
- {
-     union {
-@@ -2484,7 +2484,7 @@ static void printValBasic(symbol *sym, link *type,
-         else
-         if (IS_INTEGRAL(type))
-         {
--            link *etype;
-+            st_link *etype;
-             if ( type->next )
-                 etype = type->next;
-             else
-@@ -2534,10 +2534,10 @@ static void printValFunc (symbol *sym, int fmt)
- /*-----------------------------------------------------------------*/
- /* printArrayValue - will print the values of array elements       */
- /*-----------------------------------------------------------------*/
--static void printArrayValue (symbol *sym,  link *type,
-+static void printArrayValue (symbol *sym,  st_link *type,
-                              char space, unsigned int addr, int fmt)
- {
--        link *elem_type = type->next;
-+        st_link *elem_type = type->next;
-         int i;
- 
-         fprintf(stdout,"{");
-@@ -2558,7 +2558,7 @@ static void printArrayValue (symbol *sym,  link *type,
- /*-----------------------------------------------------------------*/
- /* printStructValue - prints structures elements                   */
- /*-----------------------------------------------------------------*/
--static void printStructValue (symbol *sym, link *type,
-+static void printStructValue (symbol *sym, st_link *type,
-                               char space, unsigned int addr, int fmt)
- {
-         symbol *fields = SPEC_STRUCT(type)->fields;
-@@ -2581,7 +2581,7 @@ static void printStructValue (symbol *sym, link *type,
- /*-----------------------------------------------------------------*/
- /* printValAggregates - print value of aggregates                  */
- /*-----------------------------------------------------------------*/
--static void printValAggregates (symbol *sym, link *type,
-+static void printValAggregates (symbol *sym, st_link *type,
-                                 char space,unsigned int addr, int fmt)
- {
- 
-@@ -2606,7 +2606,7 @@ static int printOrSetSymValue (symbol *sym, context *cctxt,
-     static char fmtChar[] = " todx ";
-     static int stack = 1;
-         symbol *fields;
--    link *type;
-+    st_link *type;
-     unsigned int  addr;
-     int size, n;
-     char *s, *s2;
-@@ -2808,7 +2808,7 @@ static void printStructInfo (structdef *sdef)
- /*-----------------------------------------------------------------*/
- /* printTypeInfo - print out the type information                  */
- /*-----------------------------------------------------------------*/
--static void printTypeInfo(link *p)
-+static void printTypeInfo(st_link *p)
- {
-     if (!p)
-         return ;

diff --git a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild b/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
deleted file mode 100644
index bac1374e0bf..00000000000
--- a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PV=${PV/*_p/}
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.gz
-	doc? ( http://sdcc.sourceforge.net/snapshots/docs/${PN}-doc-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn
-	!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}

diff --git a/dev-embedded/sdcc/sdcc-2.6.0.ebuild b/dev-embedded/sdcc/sdcc-2.6.0.ebuild
deleted file mode 100644
index ce41e43289b..00000000000
--- a/dev-embedded/sdcc/sdcc-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}

diff --git a/dev-embedded/sdcc/sdcc-2.7.0.ebuild b/dev-embedded/sdcc/sdcc-2.7.0.ebuild
deleted file mode 100644
index 089966f3433..00000000000
--- a/dev-embedded/sdcc/sdcc-2.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	dev-libs/boehm-gc"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# --as-needed fix :
-	sed -i -e "s/= @CURSES_LIBS@ @LIBS@/= @CURSES_LIBS@ @LIBS@ -lcurses/" sim/ucsim/gui.src/serio.src/Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	econf --enable-libgc docdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc ChangeLog
-	if use doc ; then
-		cp -pPR "${WORKDIR}"/doc/* "${D}"/usr/share/doc/${PF}/
-	fi
-	find "${D}"/usr/share/doc/${PF}/ -name *.txt -exec gzip -f -9 {} \;
-	find "${D}"/usr/share/doc/${PF}/ -name */*.txt -exec gzip -f -9 {} \;
-}

diff --git a/dev-embedded/sdcc/sdcc-2.8.0.ebuild b/dev-embedded/sdcc/sdcc-2.8.0.ebuild
deleted file mode 100644
index 0694d18904a..00000000000
--- a/dev-embedded/sdcc/sdcc-2.8.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc doc"
-
-DEPEND=">=dev-embedded/gputils-0.13.2
-	boehm-gc? ( dev-libs/boehm-gc )"
-RDEPEND="!dev-embedded/sdcc-svn"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix conflicting variable names between Gentoo and sdcc
-	find ./ -type f -exec sed -i s:PORTDIR:PORTINGDIR:g  {} \; || die "sed failed"
-	find device/lib/pic*/ -type f -exec sed -i s:ARCH:SDCCARCH:g  {} \; || die "sed failed"
-	find device/lib/pic/libdev/ -type f -exec sed -i s:CFLAGS:SDCCFLAGS:g  {} \; || die "sed failed"
-
-	# Fix automagic C{,XX}FLAGS
-	epatch "${FILESDIR}"/${P}-flags.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
-	# We'll install doc manually
-	sed -i -e '/SDCC_DOC/d' Makefile.in || die "sed failed"
-	sed -i -e 's/all install-doc/all/' as/Makefile.in || die "sed failed"
-	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die "sed failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable boehm-gc libgc) \
-		--disable-doc \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	insinto /usr/share/doc/${PF}
-	if use doc ; then
-		cd "${WORKDIR}"/doc
-		dohtml -r *.html ucsim
-		rm -rf *.html ucsim
-		dohtml as/asxhtm.html
-		rm -f as/asxhtm.html
-		rm -f INSTALL.txt
-	else
-		dohtml as/doc/asxhtm.html
-		rm -f as/doc/asxhtm.html
-		mv as/doc as/as || die "Failed to rename as/doc"
-		doins -r as/as
-		mv sim/ucsim/doc sim/ucsim/ucsim || die "Failed to rename sim/ucsim/doc"
-		dohtml -r sim/ucsim/ucsim
-		rm -f INSTALL.txt Makefile* *.mk
-		cd doc
-	fi
-	doins -r *
-	prepalldocs
-}

diff --git a/dev-embedded/sdcc/sdcc-2.9.0.ebuild b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
deleted file mode 100644
index 2a6ad593874..00000000000
--- a/dev-embedded/sdcc/sdcc-2.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion autotools
-	docs_compile() { return 0; }
-else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-	docs_compile() { return 1; }
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+boehm-gc doc"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc )
-	!dev-embedded/sdcc-svn"
-DEPEND="${RDEPEND}"
-if docs_compile ; then
-	DEPEND+="
-		doc? (
-			>=app-office/lyx-1.3.4
-			dev-tex/latex2html
-		)"
-fi
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name configure ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-getline.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-
-	# We'll install doc manually
-	sed -i -e '/SDCC_DOC/d' Makefile.in || die
-	sed -i -e 's/all install-doc/all/' as/Makefile.in || die
-	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	ac_cv_prog_STRIP=true \
-	econf \
-		$(use_enable boehm-gc libgc) \
-		$(docs_compile && use_enable doc || echo --disable-doc)
-}
-
-fsrc_compile() {
-	emake || die
-	if docs_compile && use doc ; then
-		cd doc
-		local d
-		for d in cdbfileformat sdccman test_suite_spec ; do
-			lyx -e html ${d} || die
-		done
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc doc/*.txt doc/*/*.txt
-	find "${D}" -name .deps -exec rm -rf {} +
-
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		dohtml -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	env RESTRICT="" prepstrip "${D%/}"/usr/bin
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/
@ 2018-11-02 14:33 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-11-02 14:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cb60b5c5b84a6eb770cee3e0c67ab23530ba5096
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 14:33:22 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 14:33:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb60b5c5

dev-embedded/sdcc: Fix and run eautoreconf

Patch support/sdbinutils/config/override.m4 to not fix on autoconf 2.64
Run eautoreconf
Remove docs_compile() but instead check PV in src_install()
Do not compile documentation in live ebuild as getting lyx to behave is
more trouble than it's worth

Fixes: https://bugs.gentoo.org/670126
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../sdcc/files/sdcc-3.8.0-override-override.patch  | 30 +++++++++++++++++++
 dev-embedded/sdcc/sdcc-3.8.0.ebuild                | 35 ++++++++++------------
 dev-embedded/sdcc/sdcc-9999.ebuild                 | 35 ++++++++++------------
 3 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
new file mode 100644
index 00000000000..f6bb4b8b972
--- /dev/null
+++ b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
@@ -0,0 +1,30 @@
+--- a/support/sdbinutils/config/override.m4
++++ b/support/sdbinutils/config/override.m4
+@@ -27,27 +27,6 @@
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install

diff --git a/dev-embedded/sdcc/sdcc-3.8.0.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
index 8db064b0f82..b2e7a0f0e7b 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion
-	docs_compile() { return 0; }
 else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
+	SRC_URI="
+		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+	"
 	KEYWORDS="~amd64 ~x86"
-	docs_compile() { return 1; }
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -56,14 +56,9 @@ DEPEND="
 	${RDEPEND}
 	dev-util/gperf
 "
-if docs_compile ; then
-DEPEND+="
-	doc? (
-		>=app-office/lyx-1.3.4
-		dev-tex/latex2html
-	)
-"
-fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+)
 
 src_prepare() {
 	# Fix conflicting variable names between Gentoo and sdcc
@@ -83,16 +78,16 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 
 	default
+	eautoreconf
 }
 
 src_configure() {
 	# sdbinutils subdir doesn't pass down --docdir properly, so need to
 	# expand $(datarootdir) ourselves.
 	econf \
-		ac_cv_prog_STRIP=true \
-		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_AR="$(tc-getAR)" \
-		$(docs_compile && use_enable doc || echo --disable-doc) \
+		ac_cv_prog_AS="$(tc-getAS)" \
+		ac_cv_prog_STRIP=true \
 		$(use_enable avr avr-port) \
 		$(use_enable boehm-gc libgc) \
 		$(use_enable device-lib) \
@@ -116,6 +111,7 @@ src_configure() {
 		$(use_enable ucsim) \
 		$(use_enable z180 z180-port) \
 		$(use_enable z80 z80-port) \
+		--disable-doc \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
 }
@@ -125,10 +121,9 @@ src_install() {
 	dodoc doc/*.txt
 	find "${D}" -name .deps -exec rm -rf {} + || die
 
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		docinto html
-		doins -r *
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
 	fi
 
 	# a bunch of archives (*.a) are built & installed by gputils

diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 8db064b0f82..b2e7a0f0e7b 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion
-	docs_compile() { return 0; }
 else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
+	SRC_URI="
+		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+	"
 	KEYWORDS="~amd64 ~x86"
-	docs_compile() { return 1; }
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
@@ -56,14 +56,9 @@ DEPEND="
 	${RDEPEND}
 	dev-util/gperf
 "
-if docs_compile ; then
-DEPEND+="
-	doc? (
-		>=app-office/lyx-1.3.4
-		dev-tex/latex2html
-	)
-"
-fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+)
 
 src_prepare() {
 	# Fix conflicting variable names between Gentoo and sdcc
@@ -83,16 +78,16 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 
 	default
+	eautoreconf
 }
 
 src_configure() {
 	# sdbinutils subdir doesn't pass down --docdir properly, so need to
 	# expand $(datarootdir) ourselves.
 	econf \
-		ac_cv_prog_STRIP=true \
-		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_AR="$(tc-getAR)" \
-		$(docs_compile && use_enable doc || echo --disable-doc) \
+		ac_cv_prog_AS="$(tc-getAS)" \
+		ac_cv_prog_STRIP=true \
 		$(use_enable avr avr-port) \
 		$(use_enable boehm-gc libgc) \
 		$(use_enable device-lib) \
@@ -116,6 +111,7 @@ src_configure() {
 		$(use_enable ucsim) \
 		$(use_enable z180 z180-port) \
 		$(use_enable z80 z80-port) \
+		--disable-doc \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
 }
@@ -125,10 +121,9 @@ src_install() {
 	dodoc doc/*.txt
 	find "${D}" -name .deps -exec rm -rf {} + || die
 
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		docinto html
-		doins -r *
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
 	fi
 
 	# a bunch of archives (*.a) are built & installed by gputils


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/
@ 2023-08-20  9:33 Viorel Munteanu
  0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-08-20  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     15974072b734f58a9169e8f6757c6b4f17fd14e8
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 08:25:10 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 09:32:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15974072

dev-embedded/sdcc: fix compilation of live version

Update patches, create an empty directory.

Closes: https://bugs.gentoo.org/911463
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../sdcc/files/sdcc-4.3.2-override-override.patch  | 62 ++++++++++++++++++++++
 dev-embedded/sdcc/sdcc-9999.ebuild                 |  5 +-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch b/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch
new file mode 100644
index 000000000000..8a0e587f5f6b
--- /dev/null
+++ b/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/911463
+
+--- a/support/sdbinutils/config/override.m4
++++ b/support/sdbinutils/config/override.m4
+@@ -27,27 +27,6 @@
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.69])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows one to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install
+--- a/support/cpp/config/override.m4
++++ b/support/cpp/config/override.m4
+@@ -27,27 +27,6 @@
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.69])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install

diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index dc4655403f3d..f2689c566ba0 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -62,8 +62,7 @@ DEPEND="
 	dev-util/gperf
 "
 PATCHES=(
-	"${FILESDIR}"/sdcc-3.8.0-override-override.patch
-	"${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
+	"${FILESDIR}"/sdcc-4.3.2-override-override.patch
 )
 
 src_prepare() {
@@ -84,6 +83,8 @@ src_prepare() {
 	# Make sure timestamps don't get messed up.
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
 
+	mkdir -p support/sdbinutils/bfd/doc || die
+
 	default
 	eautoreconf
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/
@ 2024-11-03  0:10 Andreas K. Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-11-03  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     4044bf66ede0740864c73d26fde649675d6ce064
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 00:07:39 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 00:08:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4044bf66

dev-embedded/sdcc: drop 3.8.0-r1, 4.0.0, 4.1.0, 4.2.0

Bug: https://bugs.gentoo.org/898594
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-embedded/sdcc/Manifest                         |   8 --
 .../sdcc/files/sdcc-3.8.0-override-override.patch  |  30 ----
 dev-embedded/sdcc/metadata.xml                     |   3 -
 dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild             | 131 -----------------
 dev-embedded/sdcc/sdcc-4.0.0.ebuild                | 150 -------------------
 dev-embedded/sdcc/sdcc-4.1.0.ebuild                | 157 --------------------
 dev-embedded/sdcc/sdcc-4.2.0.ebuild                | 158 ---------------------
 7 files changed, 637 deletions(-)

diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 67c7abbe0abc..8f200014c25c 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,10 +1,2 @@
-DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
-DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
-DIST sdcc-doc-4.1.0.tar.bz2 991207 BLAKE2B fd1ab82c8cc65031a8231bc4aba1e0562ed4b3178612a4d915568cb5600ba9159d89f905e261e860da9e0f4aa5a24fbd7ab1364f2f9f7b3078bcf3aa01d71ba5 SHA512 01686e590d0168108099d3c6c9bdb0885a25abccc9b6c87739eafec7103054424da1a5960a8d4566462dca9bf00cdd8b103ab6026523833d9aaa4d4bcdc5b620
-DIST sdcc-doc-4.2.0.tar.bz2 1244684 BLAKE2B d6ee4001ee0d2dde61dd1e8567499909fa6373eac93f3731fa1d6628f6e488742cc0798b1ebb908769d4cc52e091d4d685b3891d7c15a519294240643e528b02 SHA512 8494de35991e9a38ca138545b7c2396d353b21d67a4f321afa9187a5c117c6ce7d3c0850e95c981ccc7a3c8fa1e470f5e2351b84ccbe1634b1f8bf085cd45f76
 DIST sdcc-doc-4.3.0.tar.bz2 1271916 BLAKE2B a8c8018990ff2ae5504253f38a9de045b8a5227a60d76604394c286cb55d11b24f3ab97ed0a11d434c0b1ccb7e5340c33872c5ff5e677130e395b396a389f532 SHA512 088dce843c9e06380a8058b5253051e2a2442655be38435f15ed6754291e75d3f6e2b1a416e4f90dd865b2d89a9e1c59a2b9ee1422096132f49f038c527bcd19
-DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
-DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
-DIST sdcc-src-4.1.0.tar.bz2 19400609 BLAKE2B 9754d70026af595a5456f0d7c1b375df2716c6400ca59affcadbfd3588f4d51c45a3d52c235d6efc9b7512b5f94f023d8d2964cc0365cdff4586edf71fc51af1 SHA512 a9c3fee427cbc66b56a286c8d66b2922f79c9dfb42d2ed2843b2e192a6b314a04de4c82f1083d8625b49756b5f1d99f8fb706402b5f1284110760ec346303779
-DIST sdcc-src-4.2.0.tar.bz2 19662367 BLAKE2B a11d6b3af2552e0508bb1d0644d3e6db385634237fc93079716a5e3aa710bac25fd888e10dce76e6891ebe524f4d81d8318492001d8ce9ade0ef16d114adf14b SHA512 7ca4037d526b5fed7bbca4433835d0299ced7315dd69c1ec66cff873ec7caa41b69927363bf5850e2ad4f27ef6286e57f9ccd40bb6792308be6c3073c5238cba
 DIST sdcc-src-4.3.0.tar.bz2 19931677 BLAKE2B 94fc7ade96801ea6c9eb89d32b99554d27ad3d926d2d5889e91334b11d4658ccc160606cd2b1c6f3bb21bd25ea3df1dca274f40553aa8a52a73ac07764b3eaad SHA512 dabe276a0d2872bee2cdc14433f31a1e94153f9dce5a11add916ede2e76bfacf763be8e6d8134dc3aefdae29e38d3a7354626755e81e0f6db0e60c1798476f21

diff --git a/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
deleted file mode 100644
index f6bb4b8b972b..000000000000
--- a/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/support/sdbinutils/config/override.m4
-+++ b/support/sdbinutils/config/override.m4
-@@ -27,27 +27,6 @@
- m4_copy_force([_AC_PREREQ], [AC_PREREQ])
- 
- 
--dnl Ensure exactly this Autoconf version is used
--m4_ifndef([_GCC_AUTOCONF_VERSION],
--  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
--
--dnl Test for the exact version when AC_INIT is expanded.
--dnl This allows to update the tree in steps (for testing)
--dnl by putting
--dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
--dnl in configure.ac before AC_INIT,
--dnl without rewriting this file.
--dnl Or for updating the whole tree at once with the definition above.
--AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
--[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
--  m4_defn([m4_PACKAGE_VERSION]), [],
--  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
--])
--m4_define([AC_INIT], m4_defn([AC_INIT])[
--_GCC_AUTOCONF_VERSION_CHECK
--])
--
--
- dnl Ensure we do not use a buggy M4.
- m4_if(m4_index([..wi.d.], [.d.]), [-1],
-   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install

diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index c4bc3f3380ae..822e493b6360 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -23,20 +23,17 @@ be retargeted for other microprocessors.
 		<flag name="device-lib">Enable built of devices libraries</flag>
 		<flag name="non-free">Enable non-free runtime library parts</flag>
 		<flag name="packihx">Enable Intel HEX files pack utility</flag>
-		<flag name="sdbinutils">Enable SDCC library archive utilities sdar, sdranlib, sdnm</flag>
 		<flag name="sdcdb">Enable SDCC source level debugger</flag>
 		<flag name="sdcpp">Enable SDCC preprocessor based on GCC cpp</flag>
 		<flag name="ucsim">Enable software simulator for microcontrollers</flag>
 
 		<!-- ports in order defined by configure.ac -->
-		<flag name="avr">Add support for AVR -- not supported upstream</flag>
 		<flag name="mcs51">Add support for Intel mcs51</flag>
 		<flag name="z80">Add support for Zilog Z80</flag>
 		<flag name="z180">Add support for Zilog Z180</flag>
 		<flag name="r2k">Add support for Rabbit 2000</flag>
 		<flag name="r2ka">Add support for Rabbit 2000A</flag>
 		<flag name="r3ka">Add support for Rabbit 3000A</flag>
-		<flag name="gbz80">Add support for Gameboy gbz80</flag>
 		<flag name="sm83">Add support for Gameboy SM83</flag>
 		<flag name="tlcs90">Add support for TLCS-90</flag>
 		<flag name="ez80-z80">Add support for EZ80-Z80</flag>

diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
deleted file mode 100644
index fa91314a3c0d..000000000000
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( https://downloads.sourceforge.net/sdcc/${PN}-doc-${PV}.tar.bz2 )
-	"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="https://sdcc.sourceforge.net/"
-
-LICENSE="
-	GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )
-"
-SLOT="0"
-SDCC_PORTS="
-	avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
-	z80
-"
-IUSE="
-	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
-"
-
-for port in ${SDCC_PORTS}; do
-REQUIRED_USE="${REQUIRED_USE}
-	${port}? ( sdbinutils )
-"
-done
-REQUIRED_USE="${REQUIRED_USE}
-	|| ( ${SDCC_PORTS} )
-"
-
-RESTRICT="strip"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
-)
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-
-	default
-	eautoreconf
-
-	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
-	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
-	touch support/sdbinutils/bfd/doc/bfdver.texi || die
-	touch support/sdbinutils/bfd/doc/bfd.info || die
-}
-
-src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_STRIP=true \
-		$(use_enable avr avr-port) \
-		$(use_enable boehm-gc libgc) \
-		$(use_enable device-lib) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable non-free) \
-		$(use_enable packihx) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable sdbinutils) \
-		$(use_enable sdcdb) \
-		$(use_enable sdcpp) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ucsim) \
-		$(use_enable z180 z180-port) \
-		$(use_enable z80 z80-port) \
-		--disable-doc \
-		--without-ccache
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
-
-	if use doc && [[ ${PV} != "9999" ]]; then
-		cd "${WORKDIR}"/doc
-		dodoc -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	dostrip /usr/bin
-}

diff --git a/dev-embedded/sdcc/sdcc-4.0.0.ebuild b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
deleted file mode 100644
index b3b7f9c472dd..000000000000
--- a/dev-embedded/sdcc/sdcc-4.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( https://downloads.sourceforge.net/sdcc/${PN}-doc-${PV}.tar.bz2 )
-	"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="https://sdcc.sourceforge.net/"
-
-LICENSE="
-	GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )
-"
-SLOT="0"
-# in order of configure.ac's AC_DO_PORT stanzas
-SDCC_PORTS="
-	avr
-	mcs51
-	z80 z180
-	r2k r3ka
-	gbz80
-	tlcs90
-	ez80-z80
-	ds390 ds400
-	pic14 pic16
-	hc08
-	s08
-	stm8
-	pdk13 pdk14 pdk15 pdk16
-"
-IUSE="
-	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
-"
-
-for port in ${SDCC_PORTS}; do
-REQUIRED_USE="${REQUIRED_USE}
-	${port}? ( sdbinutils )
-"
-done
-REQUIRED_USE="${REQUIRED_USE}
-	|| ( ${SDCC_PORTS} )
-"
-
-RESTRICT="strip"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
-)
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-
-	default
-	eautoreconf
-
-	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
-	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
-	touch support/sdbinutils/bfd/doc/bfdver.texi || die
-	touch support/sdbinutils/bfd/doc/bfd.info || die
-}
-
-src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_STRIP=true \
-		$(use_enable boehm-gc libgc) \
-		$(use_enable device-lib) \
-		$(use_enable non-free) \
-		$(use_enable packihx) \
-		$(use_enable sdbinutils) \
-		$(use_enable sdcdb) \
-		$(use_enable sdcpp) \
-		$(use_enable ucsim) \
-		\
-		$(use_enable avr avr-port) \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable z80 z80-port) \
-		$(use_enable z180 z180-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ez80-z80 ez80_z80-port) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable pdk13 pdk13-port) \
-		$(use_enable pdk14 pdk14-port) \
-		$(use_enable pdk15 pdk15-port) \
-		$(use_enable pdk16 pdk16-port) \
-		\
-		--disable-doc \
-		--without-ccache
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
-
-	if use doc && [[ ${PV} != "9999" ]]; then
-		cd "${WORKDIR}"/doc
-		dodoc -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	dostrip /usr/bin
-}

diff --git a/dev-embedded/sdcc/sdcc-4.1.0.ebuild b/dev-embedded/sdcc/sdcc-4.1.0.ebuild
deleted file mode 100644
index b374b0833a86..000000000000
--- a/dev-embedded/sdcc/sdcc-4.1.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( https://downloads.sourceforge.net/sdcc/${PN}-doc-${PV}.tar.bz2 )
-	"
-	S="${WORKDIR}/sdcc"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="https://sdcc.sourceforge.net/"
-
-LICENSE="
-	GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )
-"
-SLOT="0"
-# in order of configure.ac's AC_DO_PORT stanzas
-SDCC_PORTS="
-	avr
-	mcs51
-	z80 z180
-	r2k r2ka r3ka
-	gbz80
-	tlcs90
-	ez80-z80
-	z80n
-	ds390 ds400
-	pic14 pic16
-	hc08
-	s08
-	stm8
-	pdk13 pdk14 pdk15 pdk16
-"
-IUSE="
-	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
-"
-
-for port in ${SDCC_PORTS}; do
-REQUIRED_USE="${REQUIRED_USE}
-	${port}? ( sdbinutils )
-"
-done
-REQUIRED_USE="${REQUIRED_USE}
-	|| ( ${SDCC_PORTS} )
-"
-
-RESTRICT="strip"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
-	pic14? ( >=dev-embedded/gputils-0.13.7 )
-	pic16? ( >=dev-embedded/gputils-0.13.7 )
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
-)
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-
-	default
-	eautoreconf
-
-	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
-	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
-	touch support/sdbinutils/bfd/doc/bfdver.texi || die
-	touch support/sdbinutils/bfd/doc/bfd.info || die
-}
-
-src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_STRIP=true \
-		$(use_enable boehm-gc libgc) \
-		$(use_enable device-lib) \
-		$(use_enable non-free) \
-		$(use_enable packihx) \
-		$(use_enable sdbinutils) \
-		$(use_enable sdcdb) \
-		$(use_enable sdcpp) \
-		$(use_enable ucsim) \
-		\
-		$(use_enable avr avr-port) \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable z80 z80-port) \
-		$(use_enable z180 z180-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r2ka r2ka-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ez80-z80 ez80_z80-port) \
-		$(use_enable z80n z80n-port) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable pdk13 pdk13-port) \
-		$(use_enable pdk14 pdk14-port) \
-		$(use_enable pdk15 pdk15-port) \
-		$(use_enable pdk16 pdk16-port) \
-		\
-		--disable-doc \
-		--without-ccache
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
-
-	if use doc && [[ ${PV} != "9999" ]]; then
-		cd "${WORKDIR}"/doc
-		dodoc -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	dostrip -x /usr/bin
-}

diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
deleted file mode 100644
index 674b5e4b92f3..000000000000
--- a/dev-embedded/sdcc/sdcc-4.2.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
-		doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
-	"
-
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="https://sdcc.sourceforge.net/"
-
-LICENSE="
-	GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )
-"
-SLOT="0"
-# in order of configure.ac's AC_DO_PORT stanzas
-SDCC_PORTS="
-	mcs51
-	z80 z180
-	r2k r2ka r3ka
-	sm83
-	tlcs90
-	ez80-z80
-	z80n
-	ds390 ds400
-	pic14 pic16
-	hc08
-	s08
-	stm8
-	pdk13 pdk14 pdk15 pdk16
-	mos6502 mos65c02
-"
-IUSE="
-	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
-"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	pic14? ( >=dev-embedded/gputils-0.13.7 )
-	pic16? ( >=dev-embedded/gputils-0.13.7 )
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	sdcdb? ( sys-libs/readline:0= )
-	ucsim? ( sys-libs/ncurses:= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-PATCHES=(
-	"${FILESDIR}"/sdcc-3.8.0-override-override.patch
-	"${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
-)
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \
-			-name 'configure.ac' -o -name 'Makefile.*' \) \
-		-exec sed -i 's/\<ARCH\>/SDCC_&/g' {} + || die
-	find device -name 'Makefile.in' \
-		-exec sed -i 's/\<PORTDIR\>/SDCC_&/g' {} + || die
-	# Possible alternative: Patch the following files to not pick up the
-	# variables from the environment:
-	# - lib/Makefile.in (PORTDIR ifndef/endif)
-	# - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877)
-	# - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452})
-	# - device/lib/pic14/configure.ac (${ARCH:-16f877})
-	# - device/lib/pic16/configure.ac (${ARCH:-18f452})
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-
-	default
-	eautoreconf
-
-	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
-	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
-	touch support/sdbinutils/bfd/doc/bfdver.texi || die
-	touch support/sdbinutils/bfd/doc/bfd.info || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		ac_cv_prog_STRIP=true
-		--without-ccache
-		--enable-sdbinutils
-
-		$(use_enable ucsim)
-		$(use_enable device-lib)
-		$(use_enable packihx)
-		$(use_enable sdcpp)
-		$(use_enable sdcdb)
-		$(use_enable non-free)
-		$(use_enable boehm-gc libgc)
-
-		$(use_enable mcs51 mcs51-port)
-		$(use_enable z80 z80-port)
-		$(use_enable z180 z180-port)
-		$(use_enable r2k r2k-port)
-		$(use_enable r2ka r2ka-port)
-		$(use_enable r3ka r3ka-port)
-		$(use_enable sm83 sm83-port)
-		$(use_enable tlcs90 tlcs90-port)
-		$(use_enable ez80-z80 ez80_z80-port)
-		$(use_enable z80n z80n-port)
-		$(use_enable ds390 ds390-port)
-		$(use_enable ds400 ds400-port)
-		$(use_enable pic14 pic14-port)
-		$(use_enable pic16 pic16-port)
-		$(use_enable hc08 hc08-port)
-		$(use_enable s08 s08-port)
-		$(use_enable stm8 stm8-port)
-		$(use_enable pdk13 pdk13-port)
-		$(use_enable pdk14 pdk14-port)
-		$(use_enable pdk15 pdk15-port)
-		$(use_enable pdk16 pdk16-port)
-		$(use_enable mos6502 mos6502-port)
-		$(use_enable mos65c02 mos65c02-port)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# Sanity check, as gputils errors/segfaults don't cause make to stop
-	local libs=()
-	use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib )
-	use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib )
-	for lib in "${libs[@]}"; do
-		[[ -f "${lib}" ]] || die "Failed to build ${lib}"
-	done
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${ED}" -type d -name .deps -exec rm -vr {} + || die
-
-	if use doc && [[ ${PV} != "9999" ]]; then
-		cd "${WORKDIR}"/doc
-		dodoc -r *
-	fi
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-11-03  0:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-09 21:00 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/, dev-embedded/sdcc/files/ Mikle Kolyada
  -- strict thread matches above, loose matches on Subject: below --
2018-11-02 14:33 Jeroen Roovers
2023-08-20  9:33 Viorel Munteanu
2024-11-03  0:10 Andreas K. Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox