Work around a bug in bash-3 parser and heredocs #282902.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 21 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 5a97ff56c129..2361f644f6f4 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.219 2009/08/27 10:03:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.220 2009/08/28 15:03:40 vapier Exp $
+
+  28 Aug 2009; Mike Frysinger <vapier@gentoo.org> netpbm-10.46.00.ebuild,
+  netpbm-10.46.00-r1.ebuild:
+  Work around a bug in bash-3 parser and heredocs #282902.
 
   27 Aug 2009; Mike Frysinger <vapier@gentoo.org> netpbm-10.46.00.ebuild,
   netpbm-10.46.00-r1.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 60fd5c87e283..6adbb40ee47a 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -14,14 +14,14 @@ DIST netpbm-10.44.00.tar.lzma 1880748 RMD160 8da4bc01241c3b281f63f2105292af8efe4
 DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c581c18 SHA1 0dee5f49bf1ebd5d08675db21a621f3d7ceea3d0 SHA256 598350fc2b65f268666a711ae50952573c606157727a1fe5295de9bff4e1fd3a
 EBUILD netpbm-10.26.62.ebuild 2895 RMD160 91f714d94c546ec08e8d4fae8a428c23330d0858 SHA1 59a05481b8d6fc4558ea8fb11d8cf9608882e157 SHA256 b90fbb741700ab0020828d19e139d37886bd5d1fc23c9f668617f0de4342bb26
 EBUILD netpbm-10.44.00-r1.ebuild 3993 RMD160 37c38beca30d58121a5b1bfa078805d11ac9a1cc SHA1 8a906fb9dabf52b707c5827e0b2112a64eaa2925 SHA256 f9a77a40c0fe78d68f3dfb6940eaca0454ff04c292ed9b4802d266c6efc9d305
-EBUILD netpbm-10.46.00-r1.ebuild 4204 RMD160 11f3c42671d74fb7999aaeef4cd5176e74cef688 SHA1 39251d0700686f2733eef4774f6c1409f9cb1c6b SHA256 e8216541b239bac20c878109cce8124979c6af7b16a9869bfddc430e5cefb384
-EBUILD netpbm-10.46.00.ebuild 4138 RMD160 b186baec56fa9e16abcadb8dd5469a1ddf4226bd SHA1 64095fca8a9a47e4b58b862e0bcac7556aaf0b90 SHA256 ec750075dd8f3a7f7a8e6dffbf4f76e657a2441ca2b4eb6aee4c1b051896d5ca
-MISC ChangeLog 29503 RMD160 921ed3d219254e7d775647d74924dc52959a4096 SHA1 7846d20c8dab8e42243f1de1cdb3d660a0887882 SHA256 4b38f114ba6646e409e6f4c206a51d30c06b93df3d56c57925a5f35797626212
+EBUILD netpbm-10.46.00-r1.ebuild 4344 RMD160 9fd5ef74cdd7916c1b2346de7124dac4a607267a SHA1 8ee4e5bf0eb615080d293f59b16a8b21dc69b645 SHA256 9673931c6a927a88c8232d41dc0ddbcda0e0687da4d0b9e6148c0925d8e16c1c
+EBUILD netpbm-10.46.00.ebuild 4279 RMD160 7920e652ae1bc6214d1436331dc521a6bd782629 SHA1 97e6fd5e9223fc78bdf7f1e15dec065c079f0532 SHA256 d30057d7406c6e8892067ae8dfb717944e60bc2cb7b1057fe1da46354b34a38f
+MISC ChangeLog 29666 RMD160 5a65e560d35adb016f54527aa452c024a575a63c SHA1 7df56fda58e3d37d69569b4a6c53b8ed9829ade3 SHA256 5fd11ff717afb2baaf18e5e774667b3c37d78874d4a3909309d8e95dce634af3
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqWWhAACgkQlPl3HsVfCDq+agCeJrutw7CTFYOc9tetrPM/C5EU
-mdMAn0wrb+IFmI4uRivyo2vCRqqNf7qf
-=tFp5
+iEYEARECAAYFAkqX8dIACgkQlPl3HsVfCDr7+ACeJp2sOYIGgb4E6Ox/Bmw/lfdi
+06QAn3dELwDlZW7tNvJ/2TTUNgQy48v/
+=L6dc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
index ac8d61d16e59..34b7c5b71ac7 100644
--- a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.2 2009/08/27 10:03:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.3 2009/08/28 15:03:40 vapier Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -90,7 +90,7 @@ src_unpack() {
 	# avoid ugly depend.mk warnings
 	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
 
-	cat config.mk.in /dev/stdin >> config.mk <<-EOF || die
+	cat config.mk.in /dev/stdin >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
 	SYMLINK = ln -sf
@@ -129,6 +129,9 @@ src_unpack() {
 	X11LIB = $(netpbm_config X X11)
 	X11HDR_DIR =
 	EOF
+	# cannot chain the die with the heredoc above as bash-3
+	# has a parser bug in that setup #282902
+	[ $? -eq 0 ] || die "writing config.mk failed"
 }
 
 src_compile() {
diff --git a/media-libs/netpbm/netpbm-10.46.00.ebuild b/media-libs/netpbm/netpbm-10.46.00.ebuild
index ef8bb4b3498f..7a31f060df9c 100644
--- a/media-libs/netpbm/netpbm-10.46.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.46.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.9 2009/08/27 10:03:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.10 2009/08/28 15:03:40 vapier Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -88,7 +88,7 @@ src_unpack() {
 	# avoid ugly depend.mk warnings
 	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
 
-	cat config.mk.in /dev/stdin >> config.mk <<-EOF || die
+	cat config.mk.in /dev/stdin >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
 	SYMLINK = ln -sf
@@ -127,6 +127,9 @@ src_unpack() {
 	X11LIB = $(netpbm_config X X11)
 	X11HDR_DIR =
 	EOF
+	# cannot chain the die with the heredoc above as bash-3
+	# has a parser bug in that setup #282902
+	[ $? -eq 0 ] || die "writing config.mk failed"
 }
 
 src_compile() {