| 1 |
vapier 09/08/28 15:03:40 |
| 2 |
|
| 3 |
Modified: netpbm-10.46.00.ebuild ChangeLog |
| 4 |
netpbm-10.46.00-r1.ebuild |
| 5 |
Log: |
| 6 |
Work around a bug in bash-3 parser and heredocs #282902. |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 media-libs/netpbm/netpbm-10.46.00.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: netpbm-10.46.00.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- netpbm-10.46.00.ebuild 27 Aug 2009 10:03:54 -0000 1.9 |
| 23 |
+++ netpbm-10.46.00.ebuild 28 Aug 2009 15:03:40 -0000 1.10 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.9 2009/08/27 10:03:54 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00.ebuild,v 1.10 2009/08/28 15:03:40 vapier Exp $ |
| 29 |
|
| 30 |
inherit toolchain-funcs eutils multilib |
| 31 |
|
| 32 |
@@ -88,7 +88,7 @@ |
| 33 |
# avoid ugly depend.mk warnings |
| 34 |
touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
| 35 |
|
| 36 |
- cat config.mk.in /dev/stdin >> config.mk <<-EOF || die |
| 37 |
+ cat config.mk.in /dev/stdin >> config.mk <<-EOF |
| 38 |
# Misc crap |
| 39 |
BUILD_FIASCO = N |
| 40 |
SYMLINK = ln -sf |
| 41 |
@@ -127,6 +127,9 @@ |
| 42 |
X11LIB = $(netpbm_config X X11) |
| 43 |
X11HDR_DIR = |
| 44 |
EOF |
| 45 |
+ # cannot chain the die with the heredoc above as bash-3 |
| 46 |
+ # has a parser bug in that setup #282902 |
| 47 |
+ [ $? -eq 0 ] || die "writing config.mk failed" |
| 48 |
} |
| 49 |
|
| 50 |
src_compile() { |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.220 media-libs/netpbm/ChangeLog |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.220&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.220&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/ChangeLog?r1=1.219&r2=1.220 |
| 59 |
|
| 60 |
Index: ChangeLog |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v |
| 63 |
retrieving revision 1.219 |
| 64 |
retrieving revision 1.220 |
| 65 |
diff -u -r1.219 -r1.220 |
| 66 |
--- ChangeLog 27 Aug 2009 10:03:54 -0000 1.219 |
| 67 |
+++ ChangeLog 28 Aug 2009 15:03:40 -0000 1.220 |
| 68 |
@@ -1,6 +1,10 @@ |
| 69 |
# ChangeLog for media-libs/netpbm |
| 70 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.219 2009/08/27 10:03:54 vapier Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.220 2009/08/28 15:03:40 vapier Exp $ |
| 73 |
+ |
| 74 |
+ 28 Aug 2009; Mike Frysinger <vapier@g.o> netpbm-10.46.00.ebuild, |
| 75 |
+ netpbm-10.46.00-r1.ebuild: |
| 76 |
+ Work around a bug in bash-3 parser and heredocs #282902. |
| 77 |
|
| 78 |
27 Aug 2009; Mike Frysinger <vapier@g.o> netpbm-10.46.00.ebuild, |
| 79 |
netpbm-10.46.00-r1.ebuild: |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.3 media-libs/netpbm/netpbm-10.46.00-r1.ebuild |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild?rev=1.3&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild?rev=1.3&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild?r1=1.2&r2=1.3 |
| 88 |
|
| 89 |
Index: netpbm-10.46.00-r1.ebuild |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v |
| 92 |
retrieving revision 1.2 |
| 93 |
retrieving revision 1.3 |
| 94 |
diff -u -r1.2 -r1.3 |
| 95 |
--- netpbm-10.46.00-r1.ebuild 27 Aug 2009 10:03:54 -0000 1.2 |
| 96 |
+++ netpbm-10.46.00-r1.ebuild 28 Aug 2009 15:03:40 -0000 1.3 |
| 97 |
@@ -1,6 +1,6 @@ |
| 98 |
# Copyright 1999-2009 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
-# $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 $ |
| 101 |
+# $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 $ |
| 102 |
|
| 103 |
inherit toolchain-funcs eutils multilib |
| 104 |
|
| 105 |
@@ -90,7 +90,7 @@ |
| 106 |
# avoid ugly depend.mk warnings |
| 107 |
touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
| 108 |
|
| 109 |
- cat config.mk.in /dev/stdin >> config.mk <<-EOF || die |
| 110 |
+ cat config.mk.in /dev/stdin >> config.mk <<-EOF |
| 111 |
# Misc crap |
| 112 |
BUILD_FIASCO = N |
| 113 |
SYMLINK = ln -sf |
| 114 |
@@ -129,6 +129,9 @@ |
| 115 |
X11LIB = $(netpbm_config X X11) |
| 116 |
X11HDR_DIR = |
| 117 |
EOF |
| 118 |
+ # cannot chain the die with the heredoc above as bash-3 |
| 119 |
+ # has a parser bug in that setup #282902 |
| 120 |
+ [ $? -eq 0 ] || die "writing config.mk failed" |
| 121 |
} |
| 122 |
|
| 123 |
src_compile() { |
Archives