diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-08-28 15:03:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-08-28 15:03:40 +0000 |
| commit | bb3d2a706edcafa732fbd46a57b25091c367c5ca (patch) | |
| tree | 1648968053a3626f820aedaf5a3fd9288de9bc87 /media-libs | |
| parent | Version bump (diff) | |
| download | gentoo-2-bb3d2a706edcafa732fbd46a57b25091c367c5ca.tar.gz gentoo-2-bb3d2a706edcafa732fbd46a57b25091c367c5ca.tar.bz2 gentoo-2-bb3d2a706edcafa732fbd46a57b25091c367c5ca.zip | |
Work around a bug in bash-3 parser and heredocs #282902.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.46.00-r1.ebuild | 7 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.46.00.ebuild | 7 |
3 files changed, 15 insertions, 5 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/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() { |