sci-geosciences/xtide: Bump to EAPI=5; drop old

Package-Manager: portage-2.2.14

5 files changed, 18 insertions, 48 deletions

diff --git a/sci-geosciences/xtide/ChangeLog b/sci-geosciences/xtide/ChangeLog
index ba366fcf1..b47ffbf77 100644
--- a/sci-geosciences/xtide/ChangeLog
+++ b/sci-geosciences/xtide/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-geosciences/xtide
-# 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> -xtide-2.12-r1.ebuild,
+  xtide-2.13.ebuild, metadata.xml:
+  Bump to EAPI=5; drop old
+
 *xtide-2.13 (16 Jun 2012)
 
   16 Jun 2012; Tim Cera <tim@cerazone.net> +xtide-2.13.ebuild:
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 939bcaf0b..9dcfd2228 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,2 +1 @@
-DIST xtide-2.12.tar.bz2 439317 SHA256 494d398ea1829af4834c68a002cb2b2c73d94966949385c17613d823deb3c0d6
 DIST xtide-2.13.tar.bz2 465679 SHA256 a73c530c83a9346bf85fe9545551eef3fbedfb24adf18f63c9e7dba0388e0d0a SHA512 2324d3f5150a46ea1fd6c2af3379c8ea4f147034f153ac4b0393ef3aaa2178bfdafc01499f27db643b5ec78b4825c99b20957f5e47f6174fe1612480dc79dcd1 WHIRLPOOL af9fe8377fec84a449e06cfac542b2d792ebe1df904e036775b3e5b659e874d5193e0416b061dddcffc2419610d48864207bba27d557fe05fdcd7560c20afb53
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 74b69f1f3..dc8684aef 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -1,18 +1,12 @@
 <?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">
-		Allows the use of a tide constituent database that is available for
-		non-commercial use only.
-	</flag>
-</use>
-<longdescription lang="en">
+  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>tim@cerazone.net</email>
+    <name>Tim Cera</name>
+  </maintainer>
+  <longdescription lang="en">
 XTide provides tide and current predictions in a wide variety of formats.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-geosciences/xtide/xtide-2.12-r1.ebuild b/sci-geosciences/xtide/xtide-2.12-r1.ebuild
deleted file mode 100644
index db4f8fc98..000000000
--- a/sci-geosciences/xtide/xtide-2.12-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats."
-HOMEPAGE="http://www.flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="non-commercial"
-DEPEND=">=x11-libs/libXaw-1.0.3
-	>=x11-libs/libXpm-3.5.6
-	>=media-libs/libpng-1.2.25
-	>=sci-geosciences/libtcd-2.2.5-r1[non-commercial?]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin xtide tide xttpd
-	doman *.[18]
-
-	echo 'HFILE_PATH=/usr/share/harmonics/' > 50xtide_harm
-	doenvd 50xtide_harm
-
-	make_desktop_entry ${PN} 'Tide predition' ${PN} 'Science'
-}
diff --git a/sci-geosciences/xtide/xtide-2.13.ebuild b/sci-geosciences/xtide/xtide-2.13.ebuild
index da50551f1..65f9a94d3 100644
--- a/sci-geosciences/xtide/xtide-2.13.ebuild
+++ b/sci-geosciences/xtide/xtide-2.13.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils
 
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats."
+DESCRIPTION="Tide and current predictions in a wide variety of formats"
 HOMEPAGE="http://www.flaterco.com/xtide/"
 SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-DEPEND=">=x11-libs/libXaw-1.0.3
+
+DEPEND="
+	>=x11-libs/libXaw-1.0.3
 	>=x11-libs/libXpm-3.5.6
 	>=media-libs/libpng-1.2.25
 	>=sci-geosciences/libtcd-2.2.5_p2"
@@ -23,7 +26,7 @@ src_install() {
 	dobin xtide tide xttpd
 	doman *.[18]
 
-	echo 'HFILE_PATH=/usr/share/harmonics/' > 50xtide_harm
+	echo "HFILE_PATH=\"${EPREFIX}/usr/share/harmonics/\"" > 50xtide_harm
 	doenvd 50xtide_harm
 
 	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'