sci-visualization/ferret-bin: Version bump.

4 files changed, 26 insertions, 79 deletions

diff --git a/sci-visualization/ferret-bin/ChangeLog b/sci-visualization/ferret-bin/ChangeLog
index 922c00190..1b3708ce0 100644
--- a/sci-visualization/ferret-bin/ChangeLog
+++ b/sci-visualization/ferret-bin/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ferret-bin-6.6.4 (16 Nov 2010)
+
+  16 Nov 2010; Tim Cera <timcera@earthlink.net> -ferret-bin-6.4.ebuild,
+  -ferret-bin-6.5.ebuild, +ferret-bin-6.6.4.ebuild:
+  Version bump.
+
+*ferret-bin-6.6.2 (10 Aug 2010)
+
+  10 Aug 2010; Tim Cera <timcera@earthlink.net> -ferret-bin-6.4.ebuild,
+  +ferret-bin-6.6.2.ebuild:
+  Version bump. Ferret now requires libcurl.so.3, where only libcurl.so.4 is
+  available so added symlink.
+
 *ferret-bin-6.5 (09 Apr 2010)
 
   09 Apr 2010; Tim Cera <timcera@earthlink.net> +ferret-bin-6.5.ebuild:
diff --git a/sci-visualization/ferret-bin/Manifest b/sci-visualization/ferret-bin/Manifest
index 320da39f8..8d47ba410 100644
--- a/sci-visualization/ferret-bin/Manifest
+++ b/sci-visualization/ferret-bin/Manifest
@@ -1,14 +1,9 @@
 AUX 99ferret 673 RMD160 4d3486b9c9612c0c2491c21744dae34d1a2d667c SHA1 0d93a2f271a7aed837fe79cd73504a266412e007 SHA256 23e1c54a4ee63f74ab44285d4362838a4cd49572aee9478c5b58a95458f81d6e
-DIST amd64fer_environment.v64.tar.gz 7517382 RMD160 348e9ef504c6deb6304b4b813bd472fc4a3a5147 SHA1 81b5d1567828a82dd998363d1d9f4459b677a2b5 SHA256 2ae6d448b37dfcb3b438e46b3b75ca9a152ea54b973dc413a09f85fc37938c27
-DIST amd64fer_environment.v65.tar.gz 7540244 RMD160 ceda414aa13b10ba27743630e714b9e2f5a58412 SHA1 91f20ffbb856a167ff039b67f33281555842acae SHA256 a9b4df0241216bd73cc9d71dc3aab3f907018b7350364f6d69c5b8642b4b517c
-DIST amd64fer_executables.v64.tar.gz 6353614 RMD160 7108a13669dd4484b2c5de6e218d31037e9ca062 SHA1 41ed6d671d355f0ef187e49e503552349cc78ec4 SHA256 b8f56070b01f7027bf05e60c9d9a48641f37909f6114d742f1cc6ffa6f5e2f98
-DIST amd64fer_executables.v65.tar.gz 6242809 RMD160 9f43dd4f83d6d68a41dcccb62fc2a636ad896b8d SHA1 1fcaf929b70de5eec1177b47365fed6f348eda82 SHA256 db23b23a435f550557046b9f181a18476f4aa5de9b5fb0909a711b6e2722f455
+DIST amd64fer_environment.v664.tar.gz 8079499 RMD160 dd0d4f84440fb78aebd42a8c2963935d261e82cc SHA1 864dace46d24ad8c9373b5a85066f6afbbd7e05a SHA256 de02d54e825e1f32d8fefc651027202941a8985425202f1872bab84119bed698
+DIST amd64fer_executables.v664.tar.gz 5408420 RMD160 bb8eb43e9b835a51d66b33990c173e2a11fe5194 SHA1 395c0dd4498d0a0a2baf182bd70408f0bc8b5c6a SHA256 4212f24f079a599cbb5a15cd21f41b723ebe710208de4efc14b58222feb95c58
 DIST fer_dsets.tar.gz 39991296 RMD160 dc3c8c67d86bcddad6bf1d984b524e1121ea5286 SHA1 4e0f514b7ae1441597e0f06fd06eda5797025ce6 SHA256 094645b275520321940002d286e792877a4867e2576832e246ab3d3f113425f3
-DIST x86fer_environment.v64.tar.gz 7519737 RMD160 01cf4ed3e71dbc758e1fd18bd17b36b9a89d5f27 SHA1 65f5e13797460f215c6f6f3c965d88b92b4cf9d7 SHA256 1dd264a8623e30e091fe133af8a9392b4a1015a4d5a4a77e2f821a5014902623
-DIST x86fer_environment.v65.tar.gz 7539235 RMD160 889ba4770aa4c0028ad22433ead028adbc100db8 SHA1 bbb174bbf68c9d54a292781f236cf4a34e814db3 SHA256 cfb876a925b418074b0cf3ff8225e349f414e7b1bd034e6f28c2a2540043623c
-DIST x86fer_executables.v64.tar.gz 5838185 RMD160 fb0172243690f8ad98d46b946784fd728dcc2502 SHA1 08c5fd8bbb2d9679af47b71339077cc4765b26ab SHA256 7d8c23243d0edf0bd61cb495bbb82a6b55636862b29b9a250aeda397a434e749
-DIST x86fer_executables.v65.tar.gz 5815631 RMD160 d46cb56dd21c8ba61a553bb5b7476e38e02c93d3 SHA1 4eba69f27247894d5eacc536f6bb5ae5f42124c0 SHA256 97fcf84a6bd2bb1de406f97606a748ff754ecdfc4514e3afd5fa2f581b984659
-EBUILD ferret-bin-6.4.ebuild 1500 RMD160 bcbcf50c5f4cfa52d60a3dee1cbcfd8c3756360f SHA1 f02acd29160f888b1791eaa65afe309b76d0e734 SHA256 8f9055540719eba8b112f234d469e262caa7ce00317c8837f2a5791d077c0eda
-EBUILD ferret-bin-6.5.ebuild 1500 RMD160 bcbcf50c5f4cfa52d60a3dee1cbcfd8c3756360f SHA1 f02acd29160f888b1791eaa65afe309b76d0e734 SHA256 8f9055540719eba8b112f234d469e262caa7ce00317c8837f2a5791d077c0eda
-MISC ChangeLog 1174 RMD160 d377035b3b92f6dead5ae569a3717d4493e2d3ef SHA1 8ecc80941af96e7f6522f087d1b2097997a32491 SHA256 851f8d85b82be2aeb73c38d680139a1361a9b45bd07528b50b4546b385c1b8d8
+DIST x86fer_environment.v664.tar.gz 7671499 RMD160 40912a10e921d1814a6a72a4c31f1230d4008804 SHA1 cc74b21df222236bae5e8038bedf4a6640ccc7fb SHA256 bf011446669aea636e3c3eff07c72792c6319ce12e3a589d8bd7b8ecd65503ec
+DIST x86fer_executables.v664.tar.gz 3813127 RMD160 1070576386af84e256da40f3bb21e76912f75a99 SHA1 5301cc8ae3e5611f34cc370fe1b0f9f49629ca42 SHA256 34416d6934dea3c938f51d18869b36fd78f2ca31d403e8303cd007f3c1a38e89
+EBUILD ferret-bin-6.6.4.ebuild 1576 RMD160 c533e5c40f9107acdb34561601c275d2316bb2a3 SHA1 352b82d8e7f63db2f95a13adb9d64f823ed082ad SHA256 a84387c478d1605407eae32b392dba9bd78019ffbf937fd809afd53df45a1084
+MISC ChangeLog 1709 RMD160 f83bc23549134197b4e1fe7213cca6233f1f1d4d SHA1 8068e562d08db44ab0b389beb41a112753145dc5 SHA256 59daaeb29bc423006aa8d881d27a82e60371c0761b0223d177651a3985bc93b4
 MISC metadata.xml 362 RMD160 81d21aa9fb0e54a53c2db8ea0965a59a633417fa SHA1 8e0c5a42c19d225c6b0087173dfd3498fb6098ad SHA256 114c2d067f3f6e4e809739707c042f4a2959895fe4f8dfdd86f52857d6e4532a
diff --git a/sci-visualization/ferret-bin/ferret-bin-6.5.ebuild b/sci-visualization/ferret-bin/ferret-bin-6.5.ebuild
deleted file mode 100644
index 45e531a57..000000000
--- a/sci-visualization/ferret-bin/ferret-bin-6.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-MY_PV=${PV/\./}
-
-MY_FER_ENV="fer_environment.v${MY_PV}.tar.gz"
-MY_FER_EXE="fer_executables.v${MY_PV}.tar.gz"
-
-DESCRIPTION="Ferret is an interactive computer visualization and analysis environment"
-HOMEPAGE="http://ferret.pmel.noaa.gov/Ferret/"
-SRC_URI="ftp://ftp.pmel.noaa.gov/ferret/pub/data/fer_dsets.tar.gz
-	x86? ( ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32/${MY_FER_ENV} -> x86${MY_FER_ENV}
-	       ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32/${MY_FER_EXE} -> x86${MY_FER_EXE} )
-	amd64? ( ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_ENV} -> amd64${MY_FER_ENV}
-	         ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_EXE} -> amd64${MY_FER_EXE} )"
-
-LICENSE="PMEL-FERRET"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=app-crypt/mit-krb5-1.6.3-r6
-	x11-base/xorg-server
-	~virtual/libstdc++-3.3"
-
-BASEDIR="/opt/ferret-bin"
-
-src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
-	use x86 && unpack "x86${MY_FER_ENV}"
-	use amd64 && unpack "amd64${MY_FER_ENV}"
-	cd "${S}"/bin
-	use x86 && unpack "x86${MY_FER_EXE}"
-	use amd64 && unpack "amd64${MY_FER_EXE}"
-	cd "${S}"
-	mkdir data
-	cd data
-	unpack "fer_dsets.tar.gz"
-}
-
-src_install() {
-	mkdir -p ext_func/libs
-	mv bin/*.so ext_func/libs
-
-	mkdir -p "${D}/${BASEDIR}"
-	mv "${S}"/* "${D}/${BASEDIR}"
-
-	doenvd "${FILESDIR}"/99ferret
-}
-
-pkg_postinst() {
-	env-update
-}
-
-pkg_postrm() {
-	env-update
-}
diff --git a/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild b/sci-visualization/ferret-bin/ferret-bin-6.6.4.ebuild
index 45e531a57..fa19c3407 100644
--- a/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild
+++ b/sci-visualization/ferret-bin/ferret-bin-6.6.4.ebuild
@@ -4,7 +4,9 @@
 
 EAPI="2"
 
-MY_PV=${PV/\./}
+inherit versionator eutils
+
+MY_PV=$(delete_all_version_separators "${PV}" )
 
 MY_FER_ENV="fer_environment.v${MY_PV}.tar.gz"
 MY_FER_EXE="fer_executables.v${MY_PV}.tar.gz"
@@ -12,10 +14,10 @@ MY_FER_EXE="fer_executables.v${MY_PV}.tar.gz"
 DESCRIPTION="Ferret is an interactive computer visualization and analysis environment"
 HOMEPAGE="http://ferret.pmel.noaa.gov/Ferret/"
 SRC_URI="ftp://ftp.pmel.noaa.gov/ferret/pub/data/fer_dsets.tar.gz
-	x86? ( ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32/${MY_FER_ENV} -> x86${MY_FER_ENV}
-	       ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32/${MY_FER_EXE} -> x86${MY_FER_EXE} )
-	amd64? ( ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_ENV} -> amd64${MY_FER_ENV}
-	         ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_EXE} -> amd64${MY_FER_EXE} )"
+	x86? ( ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32_nc4/${MY_FER_ENV} -> x86${MY_FER_ENV}
+	       ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32_nc4/${MY_FER_EXE} -> x86${MY_FER_EXE} )
+	amd64? ( ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux_nc4/${MY_FER_ENV} -> amd64${MY_FER_ENV}
+	         ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux_nc4/${MY_FER_EXE} -> amd64${MY_FER_EXE} )"
 
 LICENSE="PMEL-FERRET"
 SLOT="0"