sci-libs/proj: Drop old; punt base.eclass

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 13 insertions, 50 deletions

diff --git a/sci-libs/proj/ChangeLog b/sci-libs/proj/ChangeLog
index 5d9e95d45160..d9871db3d2bf 100644
--- a/sci-libs/proj/ChangeLog
+++ b/sci-libs/proj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/proj
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.43 2013/06/22 12:47:33 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.44 2014/01/06 14:48:29 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -proj-4.7.0.ebuild,
+  proj-4.8.0.ebuild:
+  Drop old; punt base.eclass
 
   22 Jun 2013; Justin Lecher <jlec@gentoo.org> proj-4.8.0.ebuild, metadata.xml:
   Drop la files
diff --git a/sci-libs/proj/proj-4.7.0.ebuild b/sci-libs/proj/proj-4.7.0.ebuild
deleted file mode 100644
index 1252571eb635..000000000000
--- a/sci-libs/proj/proj-4.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.7.0.ebuild,v 1.15 2013/01/02 12:33:54 jer Exp $
-
-EAPI="3"
-
-inherit base
-
-DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${P}.tar.gz || die
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	unpack ${PN}-datumgrid-1.5.zip || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	base_src_install
-	dodoc README NEWS AUTHORS ChangeLog nad/README.{NAD,NADUS} || die
-	cd nad
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83 || die
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist || die
-}
diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild
index 8f654c0307d1..c0592f04e858 100644
--- a/sci-libs/proj/proj-4.8.0.ebuild
+++ b/sci-libs/proj/proj-4.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild,v 1.10 2013/06/22 12:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild,v 1.11 2014/01/06 14:48:29 jlec Exp $
 
 EAPI=4
 
@@ -8,7 +8,8 @@ inherit eutils java-pkg-opt-2 flag-o-matic
 
 DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
 HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
+SRC_URI="
+	ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
 	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
 	http://trac.osgeo.org/proj/export/2190/tags/${PV}/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
 "
@@ -19,7 +20,8 @@ KEYWORDS="alpha amd64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~pp
 IUSE="java static-libs"
 
 RDEPEND=""
-DEPEND="app-arch/unzip
+DEPEND="
+	app-arch/unzip
 	java? ( >=virtual/jdk-1.5 )"
 
 src_unpack() {
@@ -42,7 +44,7 @@ src_configure() {
 
 src_install() {
 	default
-	cd nad
+	cd nad || die
 	dodoc README.{NAD,NADUS}
 	insinto /usr/share/proj
 	insopts -m 755