sci-visualization/ferret-bin: Changed ebuild to correctly install

according to x86 and amd64 architectures.
(Portage version: 2.1.6.13/git/Linux x86_64)
 (Unsigned Manifest commit)

3 files changed, 20 insertions, 10 deletions

diff --git a/sci-visualization/ferret-bin/ChangeLog b/sci-visualization/ferret-bin/ChangeLog
index bcb5545cd..175ffd5c5 100644
--- a/sci-visualization/ferret-bin/ChangeLog
+++ b/sci-visualization/ferret-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jan 2010; Tim Cera <timcera@earthlink.net> ferret-bin-6.4.ebuild:
+  Modified ebuild to handle x86/amd64 and now installs the correct files 
+  for the correct architecture.
+
 *ferret-bin-6.4 (27 Jan 2010)
 
   27 Jan 2010; Tim Cera <timcera@earthlink.net> files/99ferret,
diff --git a/sci-visualization/ferret-bin/Manifest b/sci-visualization/ferret-bin/Manifest
index 7fa4f4379..993138ef6 100644
--- a/sci-visualization/ferret-bin/Manifest
+++ b/sci-visualization/ferret-bin/Manifest
@@ -1,18 +1,20 @@
 AUX 99ferret 673 RMD160 4d3486b9c9612c0c2491c21744dae34d1a2d667c SHA1 0d93a2f271a7aed837fe79cd73504a266412e007 SHA256 23e1c54a4ee63f74ab44285d4362838a4cd49572aee9478c5b58a95458f81d6e
+DIST amd64fer_environment.v64.tar.gz 7517382 RMD160 348e9ef504c6deb6304b4b813bd472fc4a3a5147 SHA1 81b5d1567828a82dd998363d1d9f4459b677a2b5 SHA256 2ae6d448b37dfcb3b438e46b3b75ca9a152ea54b973dc413a09f85fc37938c27
+DIST amd64fer_executables.v64.tar.gz 6353614 RMD160 7108a13669dd4484b2c5de6e218d31037e9ca062 SHA1 41ed6d671d355f0ef187e49e503552349cc78ec4 SHA256 b8f56070b01f7027bf05e60c9d9a48641f37909f6114d742f1cc6ffa6f5e2f98
 DIST fer_dsets.tar.gz 39991296 RMD160 dc3c8c67d86bcddad6bf1d984b524e1121ea5286 SHA1 4e0f514b7ae1441597e0f06fd06eda5797025ce6 SHA256 094645b275520321940002d286e792877a4867e2576832e246ab3d3f113425f3
 DIST fer_environment.v62.tar.gz 7833080 RMD160 92b71efc6ce4b820d6a54e21274e8462c69eb2fa SHA1 06f1a660f0c93c946d55922f831bf2a28ca50f5b SHA256 1844d0f13f3d3a53d110a3d12f72b707e33837cab02906512f4913560774a6ed
 DIST fer_environment.v63.tar.gz 7909512 RMD160 e04a46862e3ae60b06b72c55734b519663162dd7 SHA1 373df55bd96f991580697e6fd53bd50e280757e0 SHA256 3dab28c1e8951a582da1bda18cdb517e68348fbc692c97c30444ed8f4dead74b
-DIST fer_environment.v64.tar.gz 7519737 RMD160 01cf4ed3e71dbc758e1fd18bd17b36b9a89d5f27 SHA1 65f5e13797460f215c6f6f3c965d88b92b4cf9d7 SHA256 1dd264a8623e30e091fe133af8a9392b4a1015a4d5a4a77e2f821a5014902623
 DIST fer_environment_x86.61.tar.Z 10514543 RMD160 47505dac54b16e75ae5610931193168f183102dd SHA1 19c31f210fd88d61b1f5c0989a117fd7443657a1 SHA256 e2050eca0b903df58f07319651aae1e3e9d5fc3cb8d21bdd91ea228b0e55bc8b
 DIST fer_environment_x86_64.61.tar.Z 10511779 RMD160 870059554f90a0b60128ff605cab8f12ff250366 SHA1 ee9d696100fd72429fa90496f0a4c597b5663ac8 SHA256 c28b337628e8d33f6e8dd79de6960797594df8c9f8272cfaa50569a5ca178999
 DIST fer_executables.v62.tar.gz 5819789 RMD160 049eb3e3e8530a5638d2c45294225373fbb68344 SHA1 ed1181dde5255b29f6570a6634b08258d5b6352b SHA256 66ab638dc8ebad905c5a7fccba9bd5b4cf21380c0c81108ea24a54c77ba8c6d7
 DIST fer_executables.v63.tar.gz 6436465 RMD160 4e8347a015bc10ad23faf48a4e094bf5d5afbf2a SHA1 8e8b6f63254d6f32a0b225605ad183df73accd83 SHA256 b41d65f491db62a876f8a4bd0ee44e9359e2563fcfb5c6f647beae4d2b988fde
-DIST fer_executables.v64.tar.gz 5838185 RMD160 fb0172243690f8ad98d46b946784fd728dcc2502 SHA1 08c5fd8bbb2d9679af47b71339077cc4765b26ab SHA256 7d8c23243d0edf0bd61cb495bbb82a6b55636862b29b9a250aeda397a434e749
 DIST fer_executables_x86.61.tar.Z 9310457 RMD160 13eff5eded02582abe8958793b2d753b556e08de SHA1 fcaed69892cd3f934684c969d0808f5c62c837c0 SHA256 dde20aa1164f12a22be67aaafd521653f40bbec62871e6ff176ae5233cc92b66
 DIST fer_executables_x86_64.61.tar.Z 9077769 RMD160 cbc6b8737da64611aeda11db113fd580492ed16b SHA1 d2815fbda1b3efc7fef25e89183eebec3f312203 SHA256 bcb1e9d523bcf8009718954c18a77e94e440c3f664a9dc11fb90aa64aeb74ff5
+DIST x86fer_environment.v64.tar.gz 7519737 RMD160 01cf4ed3e71dbc758e1fd18bd17b36b9a89d5f27 SHA1 65f5e13797460f215c6f6f3c965d88b92b4cf9d7 SHA256 1dd264a8623e30e091fe133af8a9392b4a1015a4d5a4a77e2f821a5014902623
+DIST x86fer_executables.v64.tar.gz 5838185 RMD160 fb0172243690f8ad98d46b946784fd728dcc2502 SHA1 08c5fd8bbb2d9679af47b71339077cc4765b26ab SHA256 7d8c23243d0edf0bd61cb495bbb82a6b55636862b29b9a250aeda397a434e749
 EBUILD ferret-bin-6.1.ebuild 1626 RMD160 dda17227198aac344e4db5196565262715afb1b7 SHA1 a5714a26a2fc86efa691a55063cfe3a4ce5b3442 SHA256 00d4ebc26953728a3781e840aaf4f53fbe32489a5798282456ca6684ea86f0d5
 EBUILD ferret-bin-6.2.ebuild 1299 RMD160 affb667d0b88e126db48fc9f5789b2925cf8b885 SHA1 4f73923ec77f1cb859373248d9df3586d821ab02 SHA256 070788bc2c89d56f3d0c50d189af615f8c46db86857954c487a18bb81b19c92c
 EBUILD ferret-bin-6.3.ebuild 1299 RMD160 affb667d0b88e126db48fc9f5789b2925cf8b885 SHA1 4f73923ec77f1cb859373248d9df3586d821ab02 SHA256 070788bc2c89d56f3d0c50d189af615f8c46db86857954c487a18bb81b19c92c
-EBUILD ferret-bin-6.4.ebuild 1299 RMD160 f6a92ed4e7660107a6561ff18fd75e19257318de SHA1 81460aa1cc2961d0c295b036019d7a16b1a8425e SHA256 afc60f59e26755e31108b205223d42964b1efe94f263a29130ac4721e226138e
-MISC ChangeLog 996 RMD160 a8b8fef3edb6d6042cb620c498c605c08cbbbb9c SHA1 87ac9df1209ea10ef0eebb000b4bffe849074246 SHA256 2c72f724b0bcdca2764abdf5c1a155c5f71430b3e09ed64a32cb0355ad1a089e
+EBUILD ferret-bin-6.4.ebuild 1505 RMD160 7c0ea9dbe1357bc1d3d9e7bfaf3bcdb12d3218a4 SHA1 cbb5788917421180301caebf21cdc920048a604c SHA256 ee73ce3f52ad1f4bb35bfea6bc86ff4cb4a138379271eb2e0543f492ebd72785
+MISC ChangeLog 1174 RMD160 d377035b3b92f6dead5ae569a3717d4493e2d3ef SHA1 8ecc80941af96e7f6522f087d1b2097997a32491 SHA256 851f8d85b82be2aeb73c38d680139a1361a9b45bd07528b50b4546b385c1b8d8
 MISC metadata.xml 362 RMD160 81d21aa9fb0e54a53c2db8ea0965a59a633417fa SHA1 8e0c5a42c19d225c6b0087173dfd3498fb6098ad SHA256 114c2d067f3f6e4e809739707c042f4a2959895fe4f8dfdd86f52857d6e4532a
diff --git a/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild b/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild
index b9d1bf79e..39dfb3c46 100644
--- a/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild
+++ b/sci-visualization/ferret-bin/ferret-bin-6.4.ebuild
@@ -2,6 +2,8 @@
 # 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"
@@ -10,10 +12,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}
-	       ftp://ftp.pmel.noaa.gov/ferret/pub/linux_32/${MY_FER_EXE} )
-	amd64? ( ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_ENV}
-	         ftp://ftp.pmel.noaa.gov/ferret/pub/x86_64-linux/${MY_FER_EXE} )"
+	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"
@@ -32,9 +34,11 @@ BASEDIR="/opt/ferret-bin"
 src_unpack() {
 	mkdir "${S}"
 	cd "${S}"
-	unpack "${MY_FER_ENV}"
+	use x86 && unpack "x86${MY_FER_ENV}"
+	use amd64 && unpack "amd64${MY_FER_ENV}"
 	cd "${S}"/bin
-	unpack "${MY_FER_EXE}"
+	use x86 && unpack "x86${MY_FER_EXE}"
+	use amd64 && unpack "amd64${MY_FER_EXE}"
 	cd "${S}"
 	mkdir data
 	cd data