[gentoo-commits] proj/sci:master commit in: sci-geosciences/harmonics-dwf-free-noncomm/, sci-geosciences/xtide/, ...

[Tim Cera]

commit:     ee195c3bc7581c1e216dc538ce0db6ebf4c1e547
Author:     timcera <tim <AT> cerazone <DOT> net>
AuthorDate: Wed Nov 23 17:25:54 2011 +0000
Commit:     Tim Cera <timcera <AT> earthlink <DOT> net>
CommitDate: Wed Nov 23 17:25:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee195c3b

+ sci-geosciences/harmonics-dwf-free and
+ sci-geosciences/harmonics-dwf-free-noncomm:
Now create /etc/env.d/50xtide_harm in both of these ebuilds which
contains HFILE_PATH environment variable used by the xtide suite of
programs to locate the tidal constituent databases.  Concluded that this
was better suited here than in the xtide ebuild.
+ sci-geosciences/libtcd:
Trivial change updating DEPEND to bring in the latest harmonics-dwf*
versions.
+ sci-geosciences/xtide:
Version bump.  Eliminated creation of /etc/xtide.conf by using
HFILE_PATH environment variable created by the harmonics-dwf* ebuilds.

---
 .../harmonics-dwf-free-noncomm/ChangeLog           |   11 ++++++++++-
 ... => harmonics-dwf-free-noncomm-20110410.ebuild} |    9 ++++++++-
 sci-geosciences/harmonics-dwf-free/ChangeLog       |   10 +++++++++-
 ...9.ebuild => harmonics-dwf-free-20110410.ebuild} |    9 ++++++++-
 sci-geosciences/libtcd/libtcd-2.2.5.ebuild         |    4 ++--
 sci-geosciences/xtide/ChangeLog                    |    8 +++++++-
 .../xtide/{xtide-2.11.ebuild => xtide-2.12.ebuild} |    9 +--------
 7 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog b/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
index 9ac6fde..79b135e 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for sci-geosciences/harmonics-dwf-free-noncomm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*harmonics-dwf-free-noncomm-20110410 (23 Nov 2011)
+
+  23 Nov 2011; Tim Cera <tim@××××××××.net>
+  -harmonics-dwf-free-noncomm-20100529.ebuild,
+  +harmonics-dwf-free-noncomm-20110410.ebuild:
+  Version bump and now creates a /etc/env.d/50xtide_harm file that contains the
+  HFILE_PATH environment variable pointing to all installed tidal constituent
+  databases.
+
 *harmonics-dwf-free-noncomm-20100529 (19 Nov 2010)
 
   19 Nov 2010; Tim Cera <tim@××××××××.net>

diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20100529.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild
similarity index 69%
rename from sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20100529.ebuild
rename to sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild
index edc8241..5f0fc41 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20100529.ebuild
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -20,4 +20,11 @@ RDEPEND="${DEPEND}"
 src_install() {
 	insinto /usr/share/"${PN}"
 	doins "${WORKDIR}/${MY_P}"-nonfree.tcd
+	tcd_paths=`find /usr/share/harmonics-* -name '*.tcd'`
+	echo -n 'HFILE_PATH=' > 50xtide_harm
+	for t in ${tcd_paths}; do
+		echo -n ${t} >> 50xtide_harm
+		echo -n ':' >> 50xtide_harm
+	done
+	doenvd 50xtide_harm
 }

diff --git a/sci-geosciences/harmonics-dwf-free/ChangeLog b/sci-geosciences/harmonics-dwf-free/ChangeLog
index 9106aab..506405c 100644
--- a/sci-geosciences/harmonics-dwf-free/ChangeLog
+++ b/sci-geosciences/harmonics-dwf-free/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-geosciences/harmonics-dwf-free
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*harmonics-dwf-free-20110410 (23 Nov 2011)
+
+  23 Nov 2011; Tim Cera <tim@××××××××.net> -harmonics-dwf-free-20100529.ebuild,
+  +harmonics-dwf-free-20110410.ebuild:
+  Version bump and now creates a /etc/env.d/50xtide_harm file that contains the
+  HFILE_PATH environment variable pointing to all installed tidal constituent
+  databases.
+
 *harmonics-dwf-free-20100529 (19 Nov 2010)
 
   19 Nov 2010; Tim Cera <tim@××××××××.net>

diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20100529.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild
similarity index 63%
rename from sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20100529.ebuild
rename to sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild
index 07b51e3..2609cad 100644
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20100529.ebuild
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,4 +19,11 @@ RDEPEND="${DEPEND}"
 src_install() {
 	insinto /usr/share/"${PN}"
 	doins "${WORKDIR}/${MY_P}"-free.tcd
+	tcd_paths=`find /usr/share/harmonics-* -name '*.tcd'`
+	echo -n 'HFILE_PATH=' > 50xtide_harm
+	for t in ${tcd_paths}; do
+		echo -n ${t} >> 50xtide_harm
+		echo -n ':' >> 50xtide_harm
+	done
+	doenvd 50xtide_harm
 }

diff --git a/sci-geosciences/libtcd/libtcd-2.2.5.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5.ebuild
index 6055081..d58be40 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.5.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.5.ebuild
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc non-commercial"
 
-DEPEND=">=sci-geosciences/harmonics-dwf-free-20081228
-	non-commercial?	( >=sci-geosciences/harmonics-dwf-free-noncomm-20081228 )"
+DEPEND=">=sci-geosciences/harmonics-dwf-free-20110410
+	non-commercial?	( >=sci-geosciences/harmonics-dwf-free-noncomm-20110410 )"
 RDEPEND="${DEPEND}"
 
 src_install() {

diff --git a/sci-geosciences/xtide/ChangeLog b/sci-geosciences/xtide/ChangeLog
index d1b3303..949ed8f 100644
--- a/sci-geosciences/xtide/ChangeLog
+++ b/sci-geosciences/xtide/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-geosciences/xtide
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xtide-2.12 (23 Nov 2011)
+
+  23 Nov 2011; Tim Cera <tim@××××××××.net> -xtide-2.11.ebuild,
+  +xtide-2.12.ebuild:
+  Version bump and shifted configuration to the harmonics-dwf ebuilds.
+
 *xtide-2.11 (19 Nov 2010)
 
   19 Nov 2010; Tim Cera <tim@××××××××.net> -xtide-2.10.ebuild,

diff --git a/sci-geosciences/xtide/xtide-2.11.ebuild b/sci-geosciences/xtide/xtide-2.12.ebuild
similarity index 71%
rename from sci-geosciences/xtide/xtide-2.11.ebuild
rename to sci-geosciences/xtide/xtide-2.12.ebuild
index 27dbf43..be3d342 100644
--- a/sci-geosciences/xtide/xtide-2.11.ebuild
+++ b/sci-geosciences/xtide/xtide-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,11 +21,4 @@ RDEPEND="${DEPEND}"
 src_install() {
 	dobin xtide tide xttpd
 	doman *.[18]
-	tcd_paths=`find /usr/share/harmonics-dwf-free* -name '*.tcd'`
-	for t in ${tcd_paths}; do
-		echo -n ${t} >> xtide.conf
-		echo -n ':' >> xtide.conf
-	done
-	insinto /etc
-	doins xtide.conf
 }