sci-libs/ogdi: Drop unnessecary die

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

5 files changed, 25 insertions, 19 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index f937706dcd35..c0d95f97b201 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ogdi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.30 2011/06/17 11:05:12 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.31 2012/04/26 15:21:03 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> ogdi-3.1.5-r1.ebuild,
+  ogdi-3.1.6.ebuild, ogdi-3.2.0_beta2.ebuild, metadata.xml:
+  Drop unnessecary die
 
   17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   files/ogdi-3.2.0_beta2-64b.patch:
diff --git a/sci-libs/ogdi/metadata.xml b/sci-libs/ogdi/metadata.xml
index 11f58e83b428..cc6a8ba6ad2c 100644
--- a/sci-libs/ogdi/metadata.xml
+++ b/sci-libs/ogdi/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>nerdboy@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
index efdd30a6d4ff..44964624b508 100644
--- a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 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/ogdi/ogdi-3.1.5-r1.ebuild,v 1.13 2010/06/24 14:49:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild,v 1.14 2012/04/26 15:21:03 jlec Exp $
 
 inherit toolchain-funcs eutils
 
-DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,6 +16,7 @@ IUSE=""
 DEPEND="sci-libs/proj
 	sys-libs/zlib
 	dev-libs/expat"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +31,7 @@ src_compile() {
 	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
 
 	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
-		--with-zlib --with-expat || die "econf failed"
+		--with-zlib --with-expat
 
 	# bug #299239
 	emake -j1 || die "make failed"
diff --git a/sci-libs/ogdi/ogdi-3.1.6.ebuild b/sci-libs/ogdi/ogdi-3.1.6.ebuild
index 0f44a6bfe081..a681f0a36d10 100644
--- a/sci-libs/ogdi/ogdi-3.1.6.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.6.ebuild
@@ -1,13 +1,13 @@
-# 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/ogdi/ogdi-3.1.6.ebuild,v 1.3 2011/06/17 10:23:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.6.ebuild,v 1.4 2012/04/26 15:21:03 jlec Exp $
 
 EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
+HOMEPAGE="http://ogdi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -23,8 +23,9 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	rm -rf external
-	epatch "${FILESDIR}"/${P}-unbundle-libs.patch
-	epatch "${FILESDIR}"/${P}-fpic.patch
+	epatch \
+		"${FILESDIR}"/${P}-unbundle-libs.patch \
+		"${FILESDIR}"/${P}-fpic.patch
 	sed 's:O2:O9:g' -i configure || die
 }
 
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index 14cebd095cd6..a1dff33a37e1 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.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/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.2 2011/06/17 11:00:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.3 2012/04/26 15:21:03 jlec Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ MY_P=${P/_/.}
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
+HOMEPAGE="http://ogdi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"