[gentoo-commits] proj/sci:master commit in: sci-geosciences/libtcd/

["Justin Lecher" <jlec@gentoo.org>]

commit:     c38bdd388ea2903a2a7781d9c3e2ad304bb3572f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 08:13:40 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 08:13:40 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c38bdd38

sci-geosciences/libtcd: Bump to EAPI=5

Package-Manager: portage-2.2.14

---
 sci-geosciences/libtcd/ChangeLog              |  6 +++++-
 sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild | 24 ------------------------
 sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild |  8 ++++----
 sci-geosciences/libtcd/metadata.xml           | 18 +++++++++---------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/sci-geosciences/libtcd/ChangeLog b/sci-geosciences/libtcd/ChangeLog
index f048539..249596b 100644
--- a/sci-geosciences/libtcd/ChangeLog
+++ b/sci-geosciences/libtcd/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-geosciences/libtcd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2014; Justin Lecher <jlec@gentoo.org> -libtcd-2.2.5-r1.ebuild,
+  libtcd-2.2.5_p2.ebuild, metadata.xml:
+  Bump to EAPI=5
+
 *libtcd-2.2.5_p2 (16 Jun 2012)
 
   16 Jun 2012; Tim Cera <tim@cerazone.net> +libtcd-2.2.5_p2.ebuild:

diff --git a/sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild
deleted file mode 100644
index 75bcf38..0000000
--- a/sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files."
-HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc non-commercial"
-
-DEPEND=">=sci-geosciences/harmonics-dwf-free-20110410-r1
-	non-commercial?	( >=sci-geosciences/harmonics-dwf-free-noncomm-20110410-r1 )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc ; then
-		dohtml libtcd.html
-	fi
-}

diff --git a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
index 31ba83e..5c8c833 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
+
 # Upstream used -r# at the end of their files which would mess up gentoo's use
 # of -r#.  Name ebuild _p# instead and replace as needed...
 MY_P=${PN}-${PV/_p/-r}
@@ -21,9 +23,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"/${P%_*}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
-	if use doc ; then
-		dohtml libtcd.html
-	fi
+	use doc && docinto html && dodoc libtcd.html
 }

diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
index 46b9c60..3201c56 100644
--- a/sci-geosciences/libtcd/metadata.xml
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<maintainer>
-<email>tim@cerazone.net</email>
-<name>Tim Cera</name>
-</maintainer>
-<use>
-	<flag name="non-commercial">
+  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>tim@cerazone.net</email>
+    <name>Tim Cera</name>
+  </maintainer>
+  <use>
+    <flag name="non-commercial">
 		Allows the use of a tide constituent database that is available for
 		non-commercial use only.
 	</flag>
-</use>
-<longdescription lang="en">
+  </use>
+  <longdescription lang="en">
 Library for reading and writing Tide Constituent Database (TCD) files.
 </longdescription>
 </pkgmetadata>