Drop parallel build patch as upstream repo seems to get it right now #393221 by Daniel M. Weeks.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 8 insertions, 58 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index c5151de05bcc..9fffeb83e11b 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.45 2015/06/09 13:23:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.46 2015/07/10 09:38:40 vapier Exp $
+
+  10 Jul 2015; Mike Frysinger <vapier@gentoo.org> -files/sdcc-9999-build.patch,
+  sdcc-9999.ebuild:
+  Drop parallel build patch as upstream repo seems to get it right now #393221
+  by Daniel M. Weeks.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-embedded/sdcc/files/sdcc-9999-build.patch b/dev-embedded/sdcc/files/sdcc-9999-build.patch
deleted file mode 100644
index 9af5080ecd9e..000000000000
--- a/dev-embedded/sdcc/files/sdcc-9999-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-fix parallel build issues
-
---- sdcc/device/lib/Makefile.in
-+++ sdcc/device/lib/Makefile.in
-@@ -349,40 +349,23 @@
- 	  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_S) -cq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
--	$(AR_S) -cq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
--	$(AR_S) -cq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
--	$(AR_S) -cq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+    mklib = $(AR_S) -cq $@ $^
-   else
-     ifeq ($(LIB_TYPE), RANLIB)
--	$(AR_S) -cq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib
--	$(AR_S) -cq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib
--	$(AR_S) -cq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib
--	$(AR_S) -cq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib
-+      mklib = $(AR_S) -cq $@ $^ && $(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
-   endif
- 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/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 926984d7b284..282fb1e3eb13 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.1 2010/10/08 09:38:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.2 2015/07/10 09:38:40 vapier Exp $
 
 EAPI="2"
 
@@ -49,8 +49,6 @@ src_prepare() {
 			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
 			{} + || die
 
-	epatch "${FILESDIR}"/${P}-build.patch
-
 	# We'll install doc manually
 	sed -i -e '/SDCC_DOC/d' Makefile.in || die
 	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die