Adding patch not to let `as` wait for input from stdin on OSX. Fixes bug (#131260)

Package-Manager: portage-2.1_pre7-r5

5 files changed, 39 insertions, 11 deletions

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index a4522f92ae86..1bf2e2247361 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.15 2006/03/01 21:47:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.16 2006/04/26 17:25:50 grobian Exp $
+
+  26 Apr 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/pngcrush-1.6.2-ascall.patch, pngcrush-1.6.2.ebuild:
+  Adding patch not to let `as` wait for input from stdin on OSX.  Fixes bug
+  (#131260)
 
   01 Mar 2006; Simon Stelling <blubb@gentoo.org> pngcrush-1.6.2.ebuild:
   stable on amd64 wrt bug 123286
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index a868b0d250c6..b7e0a0d25bd8 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,18 +1,21 @@
-MD5 9a7c2399ad8a412fa545304bb5d6cae3 ChangeLog 1616
-RMD160 ed09cccb5d07524b487e50ca4b15c4349a9e8dee ChangeLog 1616
-SHA256 8f3c655120df46fb45f3f3536bb0d6320c30d1e065f0e81c6ccf1a8fb88da450 ChangeLog 1616
+MD5 ff758d70a4ddc46560dc9cd23762195c ChangeLog 1819
+RMD160 95b37c4e686d5f4d180fd609e42335d592a42aa4 ChangeLog 1819
+SHA256 dec7053212fb847792eab2090ffce900e273ff5307a861b7f4450c5cb2a50e55 ChangeLog 1819
 MD5 d79c2354a6387a3c996a34326d1eb157 files/digest-pngcrush-1.5.10 67
 RMD160 be9459cccfafdbb931b5976132d1b3c928ba6bda files/digest-pngcrush-1.5.10 67
 SHA256 275efcd234286b4517782d7db2194ace315387082cfb0b4c46c69a3e9f3fdf15 files/digest-pngcrush-1.5.10 67
-MD5 f9f0b42f546c255ca59c741e73f15274 files/digest-pngcrush-1.6.2 66
-RMD160 1092fca52451521bdb6ca8c5e3cda06694f62a14 files/digest-pngcrush-1.6.2 66
-SHA256 c44ed1dcb2671f26c971c050bdf5cd4a1604e1a94be4b092138962d60155c198 files/digest-pngcrush-1.6.2 66
+MD5 d3ec3ca6b7dfb9e4911e6eda1df2046f files/digest-pngcrush-1.6.2 244
+RMD160 16392be9353c017d4b8cbb132ca8065697f13e7c files/digest-pngcrush-1.6.2 244
+SHA256 6f736e630dfc6f4ad8fc25c4cbd05d9a45f53c19b0a2b9bed264a99377f21d40 files/digest-pngcrush-1.6.2 244
+MD5 6a32a01705b45b79b364b06d5c80d0bd files/pngcrush-1.6.2-ascall.patch 479
+RMD160 449bf00473de2c9cf1e2275afc605bb359755f50 files/pngcrush-1.6.2-ascall.patch 479
+SHA256 ebe00d00ae6c28753c113316d6b164cefa96d128865beb7ac69b9e74e941a0a5 files/pngcrush-1.6.2-ascall.patch 479
 MD5 035a2156b3aec707f70a2c518efdce93 metadata.xml 211
 RMD160 c04a912c9dab0304edadf910ee3be1b8b2397d0a metadata.xml 211
 SHA256 894b06b022a4565defb3a919606139ac0ece1c9159b721173771bfecbae07dc9 metadata.xml 211
 MD5 9645194da9503eaf8a6a1ea6f5f97cbd pngcrush-1.5.10.ebuild 606
 RMD160 1cbfae62c5315e4fecba33176de3653e844ec31f pngcrush-1.5.10.ebuild 606
 SHA256 436827fbd466f0dac79aea27fe49eb2cbda08794d75c93eee39002c4bcc26de3 pngcrush-1.5.10.ebuild 606
-MD5 330ed2c4a448f62d6e963b0b9e1ad8d7 pngcrush-1.6.2.ebuild 576
-RMD160 04466301fa962ac84a2b9a81fd87c94010b8afb6 pngcrush-1.6.2.ebuild 576
-SHA256 01c0b85c1d853c374d10e6c66726488d2b630c4d14d8be97b16ece9ecd47c20c pngcrush-1.6.2.ebuild 576
+MD5 32cb4662f6d05c7c1f2b776bd40f85c5 pngcrush-1.6.2.ebuild 665
+RMD160 1e939d65e21be93095c6f39d1b4bb53dd0466b34 pngcrush-1.6.2.ebuild 665
+SHA256 0a34b8f4a7a2abf0d12b228e05800cb3c96e257234172fe24cd93ffbbb13eccb pngcrush-1.6.2.ebuild 665
diff --git a/media-gfx/pngcrush/files/digest-pngcrush-1.6.2 b/media-gfx/pngcrush/files/digest-pngcrush-1.6.2
index 0d3db43a84f1..d4f15cbd25d8 100644
--- a/media-gfx/pngcrush/files/digest-pngcrush-1.6.2
+++ b/media-gfx/pngcrush/files/digest-pngcrush-1.6.2
@@ -1 +1,3 @@
 MD5 c32f3b1a7fd4b7dee81fbd78ae5d1530 pngcrush-1.6.2.tar.gz 374501
+RMD160 e0961fc79e3785ea987ba1592f4d3c17e9db4feb pngcrush-1.6.2.tar.gz 374501
+SHA256 800231bbe7d4fb3f248257406121b27abfff2b6b47af174f53fac2f72cfcd388 pngcrush-1.6.2.tar.gz 374501
diff --git a/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch b/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch
new file mode 100644
index 000000000000..06defb5b6ebc
--- /dev/null
+++ b/media-gfx/pngcrush/files/pngcrush-1.6.2-ascall.patch
@@ -0,0 +1,11 @@
+--- pngcrush-1.6.2/Makefile
++++ pngcrush-1.6.2/Makefile
+@@ -10,7 +10,7 @@
+ 
+ # macros --------------------------------------------------------------------
+ 
+-GAS_VERSION := $(shell as --version | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//')
++GAS_VERSION := $(shell as --version < /dev/null 2&>1 | grep "GNU assembler" | sed -e 's/GNU assembler //' -e 's/ .*//')
+ 
+ # uncomment these 2 lines only if you are using an external copy of zlib:
+ #ZINC = ../../zlib
diff --git a/media-gfx/pngcrush/pngcrush-1.6.2.ebuild b/media-gfx/pngcrush/pngcrush-1.6.2.ebuild
index 4703876353bb..863707fb9278 100644
--- a/media-gfx/pngcrush/pngcrush-1.6.2.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.6.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.6.2.ebuild,v 1.4 2006/03/01 21:47:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.6.2.ebuild,v 1.5 2006/04/26 17:25:50 grobian Exp $
+
+inherit eutils
 
 DESCRIPTION="PNG optimizing tool"
 HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
@@ -12,6 +14,11 @@ IUSE="doc"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-ascall.patch"
+}
+
 src_compile() {
 	emake CFLAGS="-I. ${CFLAGS}" || die
 }