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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 25 insertions, 78 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/Manifest b/dev-embedded/sdcc/Manifest
index 0a48a3815bee..67cf0e52254b 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX sdcc-2.8.0-flags.patch 2103 SHA256 bc578efacde9ebf65f49c2d209854a7ada18f337da894ed37414fde0dd1bc046 SHA512 a3a0a3768ac98cfcce3e660263a1f076cd50a557bf16b9f80fb20450875b7da16567f96b208acd77b73d669ac8a6a096d1e150f0bc0c7935b58642b30e7b74fe WHIRLPOOL 4e7c9d06c2681e707f3b2dc4d51a91ae18b3130774580b78bfb5b04004582f2cdfa9eae701d4ba56a16aa88e6bac6a60b0dfd3a386d5b22488f3a1583c123167
 AUX sdcc-2.8.0-gcc44.patch 313 SHA256 ae0a477edc8f9aa0f6bb6b08fcde4538fd465708c0d79dc5bdc96969feacc115 SHA512 6b1bbcd93153c099cc562f69fe8cff872b325af84bbcd0f96b2db834a2e4ff4ab1f33393b77e40c6a20744cf4d1aa89a4a536d52347cabc6ce4b5f93bdb366e5 WHIRLPOOL 5eac5c590315f150dc160a25a71c88eb4add7411622ca7b4d8ae83fc5b4ddf34b7ea936c07c4a1d309e1c280ed7a1d1a17a537eac61e04f6d46f08e791fa05bb
@@ -7,7 +7,6 @@ AUX sdcc-2.9.0-build.patch 2443 SHA256 11ea67c70cc4cca2d487ad3ffc140023ff3d7d67f
 AUX sdcc-2.9.0-gcc44.patch 419 SHA256 ffc643045f09d0b191172faf79dcdf58c3f6d8cf8361b0d75b65fafa7b29f3a8 SHA512 161cf235fb17c73ffe1d8c8d54853f2743025a77a554d4623907e8199b3858f4fbae3a6f2657f88edf490e2655e908cc22c6d217de4f1c5f42d0743e310706c1 WHIRLPOOL 1cb1d76e86626cc09a67e9eb3821b34768f728fe6fd1239984ab709fcc22a5491a501dfb7ab0fd7e6ae9e5e1422659b7788d500a1df96200e0ccd6ca63a80799
 AUX sdcc-2.9.0-getline.patch 308 SHA256 c51c06e536bb761f301a816916f467b29b4e144b9380dbc1163799ea6e24a95a SHA512 49c064d1d6253c248538ed199d2ad10e30fe3bc1df0d707f37f9c5780b55a3c418fa9d2e74e87cb60b2fafba6f074736e817d249846d2ebe927601edaeae5bfd WHIRLPOOL e9f4f908add7fc1b01664f798d2252c571f10f82b8043fa4fc5819c7c471ee9ea88837359a2cd7edd126b071b9ac448f2e5a93690819f75f90b6a98b42749ec9
 AUX sdcc-2.9.0-headers.patch 7919 SHA256 8c5e0162f52eaaad91e4dee2c5197dfa7ec075dca953bdf00b5623a15ca867f8 SHA512 93fa9c2fd1a6ac2a3c0f941535a3d545f25d6e315e720481cc30d3c7d1fd4d3043448413b541d6ebc6f87d49d331779fca807c23eee863c23c037e5379d3b36b WHIRLPOOL 300c5fe340e2a2f634a7a49197174e028313db0bce48387c9d3119666be994dc5493e575770a1d37a6efd9b237d46c174e9aa7daabef3f4cbb9e48318016c4e4
-AUX sdcc-9999-build.patch 2533 SHA256 c58317e2e281bcd2acddd01b91f5abeb11ced9e28f1153032a66b185e3170b2d SHA512 fc3dbc979865462064efe94e06f446b68a3b104df6880fcbbeffe24361e4579b1017cdbb45ad4cabe9ca4d09094e8e98fe5c09150aea615379c942b140a32e3c WHIRLPOOL 83834aac548b1dc279b83f05fd87d410a6efab929e36b8947c726b72c983f480b0ad5681a2942b7f0a28ca93402fe1683c58e6c3a6593c6cc1e9c6faf04ea574
 DIST sdcc-doc-2.6.0.tar.gz 1026186 SHA256 fca8592706f76ed7063652dafa8c18c79070a1b31c12b8834b7feffbcb945817 SHA512 3cffb2ac4bbe65539951b134f89449341bff9f5682ec344c244b28efea5fe96c753caa873f26c75b8fc0a19f48404ae0a43f05e41eabafe66fd0f493b4065f97 WHIRLPOOL a047bc6c74f7968e63ad5ee540ae52e5e4b0007ea253a84f1b69b7f2ed13b247227aa5d9d366753fce0d58a6c3689b8d99fd7c636070c5bbe942f0c8be01ff84
 DIST sdcc-doc-2.7.0.tar.bz2 1211113 SHA256 3a70654c9c0a0f86d9632d85f94eed946c9faf946c266fceadc5f60f590c0b70 SHA512 2ed6503551b7c9e3e674a3bf391e731c2fa838f3978761982ab1a072d47b449b73e6efe3b05967bcdfe623c2fc933503702912721b90df95dab9b332dfacad9a WHIRLPOOL 28282a9c973f5d155c57c1ea9499ce673118e23e2c877a264ceaa2a022bb0442d04d0d3cb6e94109bdfe3a47cc618c43a05f9fee1fb424438b0776793b73343d
 DIST sdcc-doc-2.8.0.tar.bz2 1363271 SHA256 b40fd15e69d89872c2982fe8a9ed2cc0415d05d0e830b4969714e0af8db21f6d SHA512 201fcb0ffb96649507dcb0489789e7a89cb30705e9eae3f40b6ce907df3464439488d1369f7d5557873e28bcd44a2af82bb3dab2f02adbf0d6ea88a711bb5d9b WHIRLPOOL cd1bd3f46b931e59423100a88fa1827b35c0c1d746be28c1b17d0d4d57f1af57de215c7f0c4dfa9e7d1d072c1a63ba5ab53a2157a925b0450ef9610d01f732aa
@@ -23,25 +22,23 @@ EBUILD sdcc-2.6.0.ebuild 1575 SHA256 f25810c3129b36ff265da9e857e27d49a542a9fa5e0
 EBUILD sdcc-2.7.0.ebuild 1577 SHA256 b5bd996bd02e31e297e366a000babd5f56ba8fd3ee046d721f6af3fc0ec114de SHA512 6f33044f78499df541374ec8ef3ad2a80d61bf302c84e5d02cdab5d868d09be7027ea5e89b7b5c79aff9dfb00cd3cc547093fd7a82c877e2f457ae16c4fcdff0 WHIRLPOOL 0eae202fa9e91c128b373440442b3696c0475910e63b0f4e3e6fb6c6475aab041ba0aab33f2df9b63b504cdf64a67c7d7488a2a656594319363d0d0a74893c4a
 EBUILD sdcc-2.8.0.ebuild 2087 SHA256 400e3c7ec3b0325549033435b8d320a1677e118f7fc92c0e458bf2f63057788e SHA512 eb999c838d372eee0e9d62a9a48b9f6caf133aa2aa4c8a5aca5e8f229b4e50d80a1c77a8328e700b4f980321b24a90a690b0e991d5c5d5fc33e2cb1de3f2aa4f WHIRLPOOL e9fd0b3121ac1fde0769edae008e4beab2e45d805fe330e4458d323fe5f39edf499b6cc3037b3270e0072576d4e7e06ddb3b348c5b4efe1cb621498048040f72
 EBUILD sdcc-2.9.0.ebuild 2396 SHA256 326504d5b4f77aa03bdd100a811f6fdc0c9fc054b2794c09367a33a19f7b2c4a SHA512 ad39aa59b2138db840c5f83c3d4c5dba593ee36b1fb477082b5e3e2e1b7f1bc3648c859166b2cd76c110ab46e8967247ea48a108aa6ef70d5ae07366ecd69ef6 WHIRLPOOL ae49d98ec4de563aa48620bd61941d10faf4a60b140a6f5717d5955b80ce974284ed5734b3aa0e253dcff84181905446c070792fab26548ee1cc0cc4bf875dce
-EBUILD sdcc-9999.ebuild 2107 SHA256 1a8d446a21516aa8f36bfed89446eb0a11117447412f1a85db96b466cc733962 SHA512 9f89bf760f8bbce40ae0c304e86a3a4bc4a4198dcb918a4de62aa4ec45ee7e55c2f67628a4ae86ae9550ed649dd7180b173d489f37c47a182b267ce256d68108 WHIRLPOOL addc7fc4c5e67823bacd2f5a584e74b2d249e3a9a1cf5521eb576850d7e2addf7a7c458e127db49ff3a0f2600d7871d04535668804b5f19b6eb4a2cbfad2eb34
-MISC ChangeLog 7401 SHA256 320b92c33987de001cbd9c7303fcb239209a9b30dc5331238b4346ef60ce8849 SHA512 4991c5555dfbe81faa4839da353a03ff6dd4b0b92ecf80f98fb04f0721da210843c94684bbd2cb63e46811a7dfa3c5eefa1f21775779ce9a05edd7badfd80f5d WHIRLPOOL 07a16f6628066cf2f1b35820b052a8ec63ecd56aa4f0f60767821394d8a9aa44e20c0298519fb21f74b5829a935153d1967f44081adcd449c530223b330446d8
+EBUILD sdcc-9999.ebuild 2067 SHA256 5b187c0408e3938059027c8c7ccadb7128d7b7a1e66b917f652efd294e7f44dd SHA512 1563a1f304469e78b37e472c2f0580cdaccc321e89a3fc7c132721f77d23217768cc0f1238918311fd2b7bf2bd966786f3d65b289dd209c082d159951e3c2fff WHIRLPOOL d139ca6fb79448bdd3b296c27c38ccfcc7e40f75f4ecfc75cc7b49683057f5a3eea561ba3b742acd399c75e36eb67953d3aca03c594a4eb3d4385fde984b895b
+MISC ChangeLog 7605 SHA256 de3544880c6f1075f0a1fad7fb43fd2ebf717eef69fe908ff528597b45cea301 SHA512 8697527927673d4e279c615f78deb0d63e111dc56073c65997856e7c08b93afc945a10f6521148b3a25166f25376884842ec2964981f0878ae0e614f8baa36ed WHIRLPOOL 9959a8ae5658efd22a8f8f93f805938af9887b8d2b57d71cca65d5b76a0ef2ea9c079e94e4a60c975fe2cf1115fc0bc5c1e0e62b34b511159e1826bc27a4caf0
 MISC metadata.xml 449 SHA256 91b57557136bb24a579469aab775008e113d98d56b9635febcb3c04c0ca965cc SHA512 20bc9e6e5a3fb49dfe4dc5e14e2920ede9cb63483c9c3e86a3d0ab7863ba5960678859a3be739a4287b92962ade624ced0dfbb40f6102f76a9c520771837a888 WHIRLPOOL 818e627462656ced9f9a93c1e375634b6edc44bcb4d7bf92c2659e8074b27d39d400df7e854e4e881f915c7d27bae37c7acd690ef67c78da8a22e4a8759661e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdujuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimk8P+wXNats1S0yPB1Q7P6NLpN0Y
-N/dZqi0YHlY8u76zVq4YIz1HzdBvv4cvHtNY6vhqL2zpA/PcRIs8fazuq5fxcOG8
-rbfbTMDRnieJKZ2Vd+keodVRTIOqTBGcc3EZMDJY8V/e1QR+QQsDyHpT4BdM8gx9
-0jX5OYf1PHc3xFBoPmVVnNuwt/5ORzYpEF0r6dCIRV6qJJevpv3yxrE0eqzTsK+0
-pgSDYZK85MQh8KMuM+h4WLKw9QjluJc/WP0HVXx19VPQaPdP6AmpKU+1s6df90e5
-5Fz5BQ94SkfZwvNPo0EHpMnAie27KjZhsngFhcmp8GpRn1yMYFt0I5E0TBBGiPmO
-7qIKMgzw08Ros07UhhbOtOzmp1KTOUqq6o4gt2O8jV7KiqvKoovOHpl35EcoByNO
-9gWvs0Mc9QR3k7sRNFmFO+dBVNssFfHYs0NINyntyGqmBppNwA22C1ZwqWTn2qLA
-fyh9iJot66PWAixhgDKdqsSNoVyEkI5lkgmumvdD0l30fNCj3MQWUn9uTbir8+i2
-dJAS/QguAX6WaKkn2imzULOzPZgLbWkXl50qH2v9i/Nqju/cxgCGxZ/ndLfkFRbq
-BBkbYx/l4RG1+0H74fMsBxudDhZ+lhoq8dAjJyuYoTFL++4xMNXRM27HJBfZoLwC
-KUgARpYESDG8TCuPcX5X
-=NP6g
+iQIcBAEBCAAGBQJVn5KgAAoJEPGu1DbS6WIAk7cP+wRg1RCEPMpLHlYCck64KVT+
+ruN45jKDYEWhWJ/nta7tuyneOaP6ZapyYnG43AjacPRvzNUwEJZAwdbaxo0yf8TD
+R6P6aOTvX4wagCmgTDpfF6w4Sspd0uPBG2RMXgOCDDg7NHPEyJ2tiOdZpjmqY78m
+C3z83e53cJBFEHLccs1BH/vjTUiyIPXtsbxLGegFXn2YDYPi9sJnySeiwT1smbSU
+OWIyze4jfy5TwQw10Wi5VABQ1u748dK0UNVP/ZAut98VK/lVrnfB3LTzEDsX1v2Q
+rF/gOlOtX0nc4E/IXinyq08BOLGvi9UU0hgeyJE3P0qav6/MWNMajk6k1G4YpXRS
+AnJeyn0TwSveaJsVMK/xlesRTqbsDci+sRodRT1zrrY2fMTgTRLmhIp0tQd7ed55
+WsQFmTSbJQZmhOjn5JJk7CeOzQ6XHwQhKtXtIyHRwABdYZpijSpIdwhj5A5oea0H
+NWfVVlD5hKvjf9QOhDKSEmPy0Gz/5xEKxBfMG6uQjKiQMsXIIy1hT/Ea/0TTdoQ/
+Xa8dVE+fI9k8EqekRtAbhSMkANCWaXV9ciGiCZEVwWSh7LpSH8eNK389p9ZDWkXo
+WdC3rdPhjFgMCuKpTlcpyPxp3X+xe84xuGiHVX455cqedT3PjIYBCyxHY5iVrejT
+9DMbKq8V+rKDngqOPnSq
+=XlXs
 -----END PGP SIGNATURE-----
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