* [gentoo-commits] proj/sci:master commit in: sci-geosciences/harmonics-dwf-free-noncomm/, sci-geosciences/xtide/, ...
@ 2011-11-23 17:32 Tim Cera
0 siblings, 0 replies; 2+ messages in thread
From: Tim Cera @ 2011-11-23 17:32 UTC (permalink / raw
To: gentoo-commits
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@cerazone.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@cerazone.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@cerazone.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@cerazone.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@cerazone.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@cerazone.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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-geosciences/harmonics-dwf-free-noncomm/, sci-geosciences/xtide/, ...
@ 2011-12-15 0:17 Tim Cera
0 siblings, 0 replies; 2+ messages in thread
From: Tim Cera @ 2011-12-15 0:17 UTC (permalink / raw
To: gentoo-commits
commit: 8a6c1897fa52d713293537dc8dd58c7c2382394d
Author: timcera <tim <AT> cerazone <DOT> net>
AuthorDate: Tue Dec 13 23:44:08 2011 +0000
Commit: Tim Cera <timcera <AT> earthlink <DOT> net>
CommitDate: Tue Dec 13 23:44:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8a6c1897
sci-geosciences/xtide: Moved the setting of the HFILE_PATH environment
variable back to the xtide ebuild. Made HFILE_PATH point to a standard
directory /usr/share/harmonics. Version bump to install xtide with new
HFILE_PATH and all dependencies.
sci-geosciences/libtcd: Version bump to reinstall dependencies.
sci-geosciences/harmonics-dwf-free: Moved location of database file to
/usr/share/harmonics
sci-geosciences/harmonics-dwf-free-noncomm: Moved location of database
file to /usr/share/harmonics
---
.../harmonics-dwf-free-noncomm/ChangeLog | 8 ++++++++
... harmonics-dwf-free-noncomm-20110410-r1.ebuild} | 9 +--------
sci-geosciences/harmonics-dwf-free/ChangeLog | 7 +++++++
...build => harmonics-dwf-free-20110410-r1.ebuild} | 9 +--------
sci-geosciences/libtcd/ChangeLog | 9 ++++++++-
...{libtcd-2.2.5.ebuild => libtcd-2.2.5-r1.ebuild} | 6 +++---
sci-geosciences/xtide/ChangeLog | 7 +++++++
.../{xtide-2.12.ebuild => xtide-2.12-r1.ebuild} | 10 ++++++++--
8 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog b/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
index 79b135e..9a44b9d 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*harmonics-dwf-free-noncomm-20110410-r1 (13 Dec 2011)
+
+ 13 Dec 2011; Tim Cera <tim@cerazone.net>
+ -harmonics-dwf-free-noncomm-20110410.ebuild,
+ +harmonics-dwf-free-noncomm-20110410-r1.ebuild:
+ Changed location of tidal constituent database (tcd) file to
+ /usr/share/harmonics
+
*harmonics-dwf-free-noncomm-20110410 (23 Nov 2011)
23 Nov 2011; Tim Cera <tim@cerazone.net>
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410-r1.ebuild
similarity index 70%
rename from sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild
rename to sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410-r1.ebuild
index 5f0fc41..cd15ab9 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410.ebuild
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20110410-r1.ebuild
@@ -18,13 +18,6 @@ DEPEND=""
RDEPEND="${DEPEND}"
src_install() {
- insinto /usr/share/"${PN}"
+ insinto /usr/share/harmonics
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 506405c..3e81a49 100644
--- a/sci-geosciences/harmonics-dwf-free/ChangeLog
+++ b/sci-geosciences/harmonics-dwf-free/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*harmonics-dwf-free-20110410-r1 (13 Dec 2011)
+
+ 13 Dec 2011; Tim Cera <tim@cerazone.net> -harmonics-dwf-free-20110410.ebuild,
+ +harmonics-dwf-free-20110410-r1.ebuild:
+ Changed location of the tide constituent database (tcd) file to
+ /usr/share/harmonics
+
*harmonics-dwf-free-20110410 (23 Nov 2011)
23 Nov 2011; Tim Cera <tim@cerazone.net> -harmonics-dwf-free-20100529.ebuild,
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410-r1.ebuild
similarity index 65%
rename from sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild
rename to sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410-r1.ebuild
index 2609cad..d47bac2 100644
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410.ebuild
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20110410-r1.ebuild
@@ -17,13 +17,6 @@ DEPEND=""
RDEPEND="${DEPEND}"
src_install() {
- insinto /usr/share/"${PN}"
+ insinto /usr/share/harmonics
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/ChangeLog b/sci-geosciences/libtcd/ChangeLog
index 4324ffd..a8e13c4 100644
--- a/sci-geosciences/libtcd/ChangeLog
+++ b/sci-geosciences/libtcd/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for sci-geosciences/libtcd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libtcd-2.2.5-r1 (13 Dec 2011)
+
+ 13 Dec 2011; Tim Cera <tim@cerazone.net> -libtcd-2.2.5.ebuild,
+ +libtcd-2.2.5-r1.ebuild:
+ Version bump to force an update of DEPEND tidal constituent database (tcd)
+ files.
+
*libtcd-2.2.5 (19 Nov 2010)
19 Nov 2010; Tim Cera <tim@cerazone.net> -libtcd-2.2.4.ebuild,
diff --git a/sci-geosciences/libtcd/libtcd-2.2.5.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild
similarity index 83%
rename from sci-geosciences/libtcd/libtcd-2.2.5.ebuild
rename to sci-geosciences/libtcd/libtcd-2.2.5-r1.ebuild
index d58be40..1e3516f 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.5.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.5-r1.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: $
@@ -11,8 +11,8 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="doc non-commercial"
-DEPEND=">=sci-geosciences/harmonics-dwf-free-20110410
- non-commercial? ( >=sci-geosciences/harmonics-dwf-free-noncomm-20110410 )"
+DEPEND=">=sci-geosciences/harmonics-dwf-free-20110410-r1
+ non-commercial? ( >=sci-geosciences/harmonics-dwf-free-noncomm-20110410-r1 )"
RDEPEND="${DEPEND}"
src_install() {
diff --git a/sci-geosciences/xtide/ChangeLog b/sci-geosciences/xtide/ChangeLog
index 949ed8f..9b2a966 100644
--- a/sci-geosciences/xtide/ChangeLog
+++ b/sci-geosciences/xtide/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*xtide-2.12-r1 (13 Dec 2011)
+
+ 13 Dec 2011; Tim Cera <tim@cerazone.net> -xtide-2.12.ebuild,
+ +xtide-2.12-r1.ebuild:
+ Putting all tide constituent database (tcd) files in one directory:
+ /usr/share/harmonics
+
*xtide-2.12 (23 Nov 2011)
23 Nov 2011; Tim Cera <tim@cerazone.net> -xtide-2.11.ebuild,
diff --git a/sci-geosciences/xtide/xtide-2.12.ebuild b/sci-geosciences/xtide/xtide-2.12-r1.ebuild
similarity index 72%
rename from sci-geosciences/xtide/xtide-2.12.ebuild
rename to sci-geosciences/xtide/xtide-2.12-r1.ebuild
index be3d342..d907bef 100644
--- a/sci-geosciences/xtide/xtide-2.12.ebuild
+++ b/sci-geosciences/xtide/xtide-2.12-r1.ebuild
@@ -4,6 +4,8 @@
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"
@@ -14,11 +16,15 @@ IUSE="non-commercial"
DEPEND=">=x11-libs/libXaw-1.0.3
>=x11-libs/libXpm-3.5.6
>=media-libs/libpng-1.2.25
- >=sys-libs/zlib-1.2.3-r1
- >=sci-geosciences/libtcd-2.2.5[non-commercial?]"
+ >=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'
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-15 0:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-15 0:17 [gentoo-commits] proj/sci:master commit in: sci-geosciences/harmonics-dwf-free-noncomm/, sci-geosciences/xtide/, Tim Cera
-- strict thread matches above, loose matches on Subject: below --
2011-11-23 17:32 Tim Cera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox