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

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

Package-Manager: portage-2.2.14

---
 sci-geosciences/xtide/ChangeLog            |  6 +++++-
 sci-geosciences/xtide/metadata.xml         | 18 ++++++------------
 sci-geosciences/xtide/xtide-2.12-r1.ebuild | 30 ------------------------------
 sci-geosciences/xtide/xtide-2.13.ebuild    | 11 +++++++----
 4 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/sci-geosciences/xtide/ChangeLog b/sci-geosciences/xtide/ChangeLog
index ba366fc..b47ffbf 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 <[email protected]> -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 <[email protected]> +xtide-2.13.ebuild:

diff --git a/sci-geosciences/xtide/metadata.xml 
b/sci-geosciences/xtide/metadata.xml
index 74b69f1..dc8684a 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>[email protected]</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>[email protected]</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 db4f8fc..0000000
--- 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 da50551..65f9a94 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'

Reply via email to