Added die to sed invocations

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26.5 x86_64

6 files changed, 25 insertions, 26 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 6835f26759e6..1863af063044 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.45 2008/08/07 06:34:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.46 2008/10/12 02:38:16 nerdboy Exp $
+
+  12 Oct 2008; Steve Arnold <nerdboy@gentoo.org> gdal-1.3.1.ebuild,
+  gdal-1.3.2.ebuild, gdal-1.4.2.ebuild, gdal-1.5.0-r1.ebuild:
+  Added die to sed invocations (although what this hs to do with perl I'm 
+  not quite sure...
 
   07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 6e5ac81c2a24..20423209b8fc 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e SHA1 ebd9b397bd1230a4b5110367f29f6040a86284f3 SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280
 AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a SHA1 09296a78067d6b3a12bc7ee47a1969e82efa2a26 SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81
 AUX gdal-1.3.2-gcc4-stl.patch 902 RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 SHA1 68f53438de2af1a325260d6070728d363fffd91f SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21
@@ -19,18 +16,11 @@ DIST gdal-1.4.2.tar.gz 7457778 RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 S
 DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 SHA1 c049d29f530f1867e4edcf36b1a299c96a9327a1 SHA256 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
 DIST gdal-1.5.1.tar.gz 6176140 RMD160 4f0557edaf99e89cbaa540bfdbf8fa8b352204c6 SHA1 e188b82f0c4f12c6925afecfde742e3eab627d49 SHA256 407794d5846d18673df71ece278707ddb209d505a100335e21d6489a09f290fe
 DIST gdal-1.5.2.tar.gz 6180070 RMD160 37601decec7cc23ee6ea77c9c0e7c12ef3154213 SHA1 bf759b28d2218919212484c2b593edbc1c09aabb SHA256 243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
-EBUILD gdal-1.3.1.ebuild 4433 RMD160 90e75e8762d254918901259d7fc18878f9c944d2 SHA1 4adf098db1b6137147b698d1f09f427f0a2ec6ac SHA256 4047d6abc8395e3cfb5e789fa0429b949ce8d9732ca11661e214691499c0f1e7
-EBUILD gdal-1.3.2.ebuild 4719 RMD160 9170b33c5836b334fdf36262f56e1e51bab900d2 SHA1 9d0e952e7be7fbfce3d3f94b0ea9aec9a90445d2 SHA256 e7bb8a9c9d110189b22e3938b5740bcc4c12c8c10156d4c95d0f50e9cfdc4ff4
-EBUILD gdal-1.4.2.ebuild 4590 RMD160 5f0abae2511ec0cbfafc123309a973c8dc6690aa SHA1 acbde4df8ef2ca27e2a7b2ca4e67015aa06ec925 SHA256 662631ab4afd12657bc62934a1b3813e68bb11fba8dbff32f417c857b1f71766
-EBUILD gdal-1.5.0-r1.ebuild 6012 RMD160 4f3330a8ad52f5a5a574349074a4f18f697f2617 SHA1 200e710a186c01d9db25fde6218551c94f969903 SHA256 2a6252b3eb34a685fbb5de2e9e9c1a741814e9bd59fb72061028124312466d5a
+EBUILD gdal-1.3.1.ebuild 4472 RMD160 95dcac174c5e8e8146b091954fc6996c298216a7 SHA1 9416a2b1241b2bfc735e842b6593967df47971de SHA256 a9a2250ca532e6afb611ad0f337288df090826d1452a84dbc6291f8b34f3be50
+EBUILD gdal-1.3.2.ebuild 4758 RMD160 43be47f82f228892b9a656de1ae04e85afad867f SHA1 7f76a50be06e1f4387ecccf31f69c53e17fa85c6 SHA256 a484e541050ede9c5ac28d417807372f7c73034383230b45668b3ec8edcdbbcd
+EBUILD gdal-1.4.2.ebuild 4629 RMD160 560e55823c191aacfcbb540d81bed5999e36af68 SHA1 da52160462873449a6a8fd6dda4f223fd41030ca SHA256 295326ca15c88bc6c41137fda65a3a9bb2ecfbaa146c68dac454af748eefd686
+EBUILD gdal-1.5.0-r1.ebuild 6127 RMD160 3282266d87f529fc5f34874886547e0dc56528ff SHA1 ce429086a266ba00d04aa5f69a62cdd228aacf51 SHA256 c6458586043fbfd15de9b09640a6e12fa55a611dcbdf64a91922c297c3531df4
 EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SHA1 cfb48b1ef59cb36f8d70e2d0638dfe553e641c7d SHA256 b5169d89b0f260cae069d41d36f5d69e700fcdf27b6172282458520b365f6acf
 EBUILD gdal-1.5.2.ebuild 6147 RMD160 548f582c8f25f9df5186cdc444b56920e9e2f7cc SHA1 62f7eed12ee64235e5c66d31e3101dd2068a71bf SHA256 575fb78144fba6bcbf2e83b3dd77db8200f9ad8421af66fdc2984e7e68637e38
-MISC ChangeLog 8883 RMD160 f3a124f7ea3c6ea335ba113b1bcc590e1317db90 SHA1 38cd6756ad3ff6f1079086691a3c16277451598d SHA256 b7138d7eb31059e81f4fdaf43119c151d9645f4b6e7da20bfea46de2f34194f8
+MISC ChangeLog 9113 RMD160 282c3371ef17dde0fea17a9674d2e4d51e058938 SHA1 c908a876ad0550fbc25ca8f4cde89d060bf7e95b SHA256 83a435778ade0d6e16cfd6d21b307d76671eb490f1f43f757aa03a8ee64c42e8
 MISC metadata.xml 985 RMD160 9dc9e3ce1126fd8ec1f750c16cf2f3a083521c37 SHA1 51e902a9cd3d5161054fd94decd65d426d67295c SHA256 f4d66564bbb50bb7fbdde5df7729c90a035a0efc811a0fae33e70fd2e260a9e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkial4MACgkQOeoy/oIi7uwpXgCdHKtMi9FBQ9kFO5IbkvZKZCUL
-iPwAoMnk4KSVwSJVS/PHGwS1IEYy/eK1
-=NZeX
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild
index d49f29a238b1..9bc54e018c8d 100644
--- a/sci-libs/gdal/gdal-1.3.1.ebuild
+++ b/sci-libs/gdal/gdal-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.16 2008/05/21 19:01:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.17 2008/10/12 02:38:16 nerdboy Exp $
 
 inherit eutils libtool distutils toolchain-funcs
 
@@ -99,7 +99,8 @@ src_compile() {
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
+	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
diff --git a/sci-libs/gdal/gdal-1.3.2.ebuild b/sci-libs/gdal/gdal-1.3.2.ebuild
index 689a6cf2a6db..df0e7853a237 100644
--- a/sci-libs/gdal/gdal-1.3.2.ebuild
+++ b/sci-libs/gdal/gdal-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.6 2008/05/21 19:01:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.7 2008/10/12 02:38:16 nerdboy Exp $
 
 inherit eutils libtool distutils toolchain-funcs
 
@@ -102,7 +102,8 @@ src_compile() {
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
+	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
diff --git a/sci-libs/gdal/gdal-1.4.2.ebuild b/sci-libs/gdal/gdal-1.4.2.ebuild
index 74a45801973a..aad09eb4efa4 100644
--- a/sci-libs/gdal/gdal-1.4.2.ebuild
+++ b/sci-libs/gdal/gdal-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.4 2008/05/21 19:01:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.5 2008/10/12 02:38:16 nerdboy Exp $
 
 inherit eutils libtool distutils toolchain-funcs
 
@@ -102,7 +102,8 @@ src_compile() {
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
+	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
diff --git a/sci-libs/gdal/gdal-1.5.0-r1.ebuild b/sci-libs/gdal/gdal-1.5.0-r1.ebuild
index 3c6baf7cb2bc..cadcf23307bb 100644
--- a/sci-libs/gdal/gdal-1.5.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.4 2008/05/21 19:01:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.5 2008/10/12 02:38:16 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -122,7 +122,8 @@ src_compile() {
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
+	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
 
@@ -132,9 +133,9 @@ src_compile() {
 
 	if useq python; then
 	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg
+		swig/python/setup.cfg || die "sed python setup.cfg failed"
 	    sed -i -e "s:$(DESTDIR)$(prefix):$(DESTDIR)$(INST_PREFIX):g" \
-		swig/python/GNUmakefile
+		swig/python/GNUmakefile || die "sed python GNUmakefile failed"
 	fi
 
 	if useq perl ; then