sci-libs/gdal: Drop unnessecary die

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 13 insertions, 16 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 769fbc35ef70..241bbafd2d87 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gdal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.120 2011/10/08 10:32:13 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.121 2012/04/26 15:28:13 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> gdal-1.6.3-r1.ebuild,
+  gdal-1.8.1.ebuild, gdal-1.8.1-r1.ebuild:
+  Drop unnessecary die
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gdal-1.6.3-r1.ebuild,
   +files/gdal-1.6.3-libpng15.patch:
diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
index e486f84521ed..31981badfd26 100644
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.21 2011/10/08 10:32:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.22 2012/04/26 15:28:13 jlec Exp $
 
 EAPI=3
 
@@ -20,9 +20,6 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
-
 IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf odbc png ogdi perl postgres python ruby sqlite threads"
 
 RDEPEND="
@@ -139,7 +136,7 @@ src_configure() {
 		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
 		-i GDALmake.opt.in || die "sed gdalmake.opt failed"
 
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
+	econf ${pkg_conf} ${use_conf}
 
 	# mysql-config puts this in (and boy is it a PITA to get it out)
 	sed \
diff --git a/sci-libs/gdal/gdal-1.8.1-r1.ebuild b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
index aad8d461292e..736350580560 100644
--- a/sci-libs/gdal/gdal-1.8.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.1 2011/09/26 03:33:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.2 2012/04/26 15:28:13 jlec Exp $
 
 EAPI=3
 
@@ -20,7 +20,6 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
 IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
 
 RDEPEND="
@@ -197,7 +196,6 @@ src_compile() {
 		fi
 	done
 
-	# parallel makes fail
 	emake || die "emake failed"
 
 	if use perl ; then
diff --git a/sci-libs/gdal/gdal-1.8.1.ebuild b/sci-libs/gdal/gdal-1.8.1.ebuild
index 8275c43e612e..dda8f68fe0cf 100644
--- a/sci-libs/gdal/gdal-1.8.1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1.ebuild,v 1.3 2011/07/26 16:21:29 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1.ebuild,v 1.4 2012/04/26 15:28:13 jlec Exp $
 
 EAPI=2
 
@@ -20,7 +20,6 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
 IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
 
 RDEPEND="
@@ -194,7 +193,6 @@ src_compile() {
 		fi
 	done
 
-	# parallel makes fail
 	emake || die "emake failed"
 
 	if use perl ; then