sci-chemistry/rasmol: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 26 insertions, 22 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 7b78968cb86e..c871106ca858 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.33 2012/04/25 15:52:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.34 2012/10/19 10:23:14 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> rasmol-2.7.5.1.ebuild,
+  rasmol-2.7.5.2.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> rasmol-2.7.5.2.ebuild,
   +files/rasmol-2.7.5.2-glib.h.patch:
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 64448e11b9cd..6430dbacdd70 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 2.7.5-bundled-lib.patch 2513 RMD160 ea8976ac0da2f77767cf78c10fc148033452a731 SHA1 0601835bbcaa22a1fed9f18f8c668daee84cd55b SHA256 86fc627ae39fbc6d85063436b1e05e19745fd4690e6df70fd6111f99c1b90505
-AUX ldflags.patch 423 RMD160 bb60fdfff87e4c511a3c8a4df983fff33c7dc1f5 SHA1 4ebfdb40b52606a52930a374d51d01ec3950dc3c SHA256 1530faa9739dc97d769f8c772de4510bc201b7cdb1e40ddea4e366c7a17b90ea
-AUX rasmol-2.7.5.2-glib.h.patch 770 RMD160 0089c8add9b206bac80bace7d473defb1b7b0468 SHA1 aca3456c203ef62f2edacd33a6eefb9a96f6307e SHA256 4093621678676bdc7c517f6d6c260f495b9d946d57691d8e58371b627cd6c178
-AUX rasmol.sh.debian 966 RMD160 e3e750f854978c24e7b2357cf08d47f9d679b5e4 SHA1 2d9d1298b73af184a1f43636412ac335b9e2f775 SHA256 c3eb76b78d56501498b0fedb899eb69586ad98ceabdca14a4e49564bfbce7545
-DIST rasmol-2.7.5-9Aug09.tar.gz 9763631 RMD160 a126c8f790d4be078fd584e0a50ab6cd0d91b528 SHA1 640ada7601d5ad00bc560ce5ab9494ca05c6358a SHA256 2c601433ea48fea03c3a71aad160ae81ac435290fba4f3e257c20fe839ae3f3a
-DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 RMD160 a680014832de3a5fb461683292ea2b0bed16fce6 SHA1 3e2fe37a003a1d9f6a866e9a17cd0bf596c5f349 SHA256 b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718
-EBUILD rasmol-2.7.5.1.ebuild 1772 RMD160 bebd8774efa3a6146cfa55be23916218c0b82d64 SHA1 95f318fa801cb6f549441e50075cf7f23241bfb5 SHA256 fc3cf9c5867f18b719d59234e64a7a7b256d9ca7dddba3c439f6b3aca44a4cea
-EBUILD rasmol-2.7.5.2.ebuild 1937 RMD160 9ac62fbca964e1ae2d976d44a190810a827943e2 SHA1 1b52074a56677f88c544bba1bae1a8b77ec7cfbf SHA256 ee01a8dc6817e2602a2b39647ca72e0695c6fc452398f60244dcbdfe810ac76f
-MISC ChangeLog 6247 RMD160 6ac89c23b88a6ba6e7cfa0db9feb93ae3026f1c5 SHA1 49b7d152816039b1ea6a3ca01597a6ae920a9c7e SHA256 83590d65789584d481e48974ee61ff375b9d498c7cbfebca81af09e094170e1d
-MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
+AUX 2.7.5-bundled-lib.patch 2513 SHA256 86fc627ae39fbc6d85063436b1e05e19745fd4690e6df70fd6111f99c1b90505 SHA512 940e85bbe35ed6055d8deb1d761e925aec3b60d63c3e91bcc3c08596f1b8269efd4c8a257ff9efdbe32888e987852e85ed19cba5566d8d610e8d625a23b0994a WHIRLPOOL ffbe6399b1176601459dafb8bed6267fbff60d859761a7e0ecbf55b4b0c2f607888a11c0ca9c66278e3cc514ed2b44b769cac3af8099a10efd8decd7bac37077
+AUX ldflags.patch 423 SHA256 1530faa9739dc97d769f8c772de4510bc201b7cdb1e40ddea4e366c7a17b90ea SHA512 fe3678b9c66adc3a1e11a3485cfae67a380719e3c03c9e719fb10e228d5ca8ccf893c0cc335558258539f4c7cdb1d7231aa90df9f11c3d7adddd421020f59957 WHIRLPOOL b8448fd10e73cd73e458a536e4ac172b49002af09d1f7a51b73f3e851014aed74a0d81bd6b72af44fb705cc0be56d37a942ff5166dc6e85f8052332382e27f11
+AUX rasmol-2.7.5.2-glib.h.patch 770 SHA256 4093621678676bdc7c517f6d6c260f495b9d946d57691d8e58371b627cd6c178 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e WHIRLPOOL 250e59fbafe5d53f1dfd77bc2392cf085b07968578675e61635c8ca2e5de1dd60f060240f2a9afdb088285bac3a94cb695cecd3abbb93214f2d6fcf584fe8a16
+AUX rasmol.sh.debian 966 SHA256 c3eb76b78d56501498b0fedb899eb69586ad98ceabdca14a4e49564bfbce7545 SHA512 0247c6ae324890b47f85851f999274a4c9ce79cd72d1face516c5e9268370a79bae1ee181381d016e3bb0dcabe2f539191a632b1902bb780ca7a61cf51bbba9d WHIRLPOOL 0ddcd002f329e25260d946c7195bece00e098e420ce007bb682109653a7f575c8392d33e166aa5cff56a71e3ff514489eb7be6d7eb239576beddc7ac6cf0bbb5
+DIST rasmol-2.7.5-9Aug09.tar.gz 9763631 SHA256 2c601433ea48fea03c3a71aad160ae81ac435290fba4f3e257c20fe839ae3f3a
+DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 SHA256 b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718 SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f WHIRLPOOL 261c5351e32a67807d2979b73fbdf83b947aa641568c08fd2f2b0e06115330541a56f7bbd8f05313c86554c321e59cfe11bf5ee613c09249b9e149411c61d5ca
+EBUILD rasmol-2.7.5.1.ebuild 1762 SHA256 9fa6cf28ea491273dcae6f181b8644e693b686456a40d69eed6a89c67c924c67 SHA512 b8aff50bf9c1f20021314c5279d3880904a4557482a46a2fe28e6ebb63353fc3c7e89db2484c28ca8eee03fc7c75bb212bfcc5956d87894da2fe7287bbe1f378 WHIRLPOOL bc05f9d87f83b482f546782ca892faa9064e0136783b18674c5911780a4055e3dfb2b56ee8633c552c9cefb928704aa70a5bcc1c0798c73d0dc5e9509a58a165
+EBUILD rasmol-2.7.5.2.ebuild 1929 SHA256 cd86617af3941f400b78619497598e437610644ee6424c3b4c1474af8d78aaa0 SHA512 c4f666f7fc253a31d3a61120f1dbaa77bc7c6efd8756991aa9f936fe1d7739d3e49f6e68a2bb24e2ec3168ed41bb3b81da882a88da6a3d55ffbcda0fe626b0c9 WHIRLPOOL e7afd7685bbc3e690090553a7246ddfc05f0f770cc06e2fb8bc6ad1d4f539e7c83cc06c8db96269e10af670d2e19e538cb2003d944e4195a1c019b17763388dd
+MISC ChangeLog 6448 SHA256 610e5b4f9c8071cf4ca6ddca7bf14f922de905553eca2b0c855ecc10bc0da6be SHA512 0efc7555995f3e1c7d536ad8b2ea3d4da730b81992646427f6bf13f090164ccc31212d70f0c6f30ec44ef248b45335354e05e69606a23e0c5aa8cedee6eee93f WHIRLPOOL 014f61320002bf10f9b2c76053403b5f8b213767a51ff4c7fc54e53db71258e9b2ba796b0964b2d1b305c0568cfd948aa7c7580885a76201a38ee16776ecac24
+MISC metadata.xml 167 SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 SHA512 0f65f650c91edb15011884892b3e2447ec2342f207b6b71541ec25939fed33cd219b1fcd85dd06008b56a50622973febeb63c9c6158f62435c63c4fbd3ab93bd WHIRLPOOL 0823fd1d22e4aea50bcf78c359303d804128475e21e39514505ee6528c9c46376ceafc1f13bb1cc4e1143d434397fb4ef65dc028e924fdc831521947534fd93f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+YHeAACgkQgAnW8HDreRYiZwCdF8WKiEFBQMAEYjrZF+XKkJqa
-8VcAnRhOPA7s4F1ixndPQnq7MJxtV+UZ
-=qUwU
+iEYEAREIAAYFAlCBKhQACgkQgAnW8HDreRaOvACdEcgXWfSVByjanTPHrhvhxu1r
+iSEAnj4X+umUdxdQ22hprWV8py6AK7WS
+=pR+X
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
index 1b96daf5ea62..83884d3aee88 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild,v 1.8 2012/03/07 20:52:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild,v 1.9 2012/10/19 10:23:14 jlec Exp $
 
 EAPI=4
 
-inherit eutils fortran-2 prefix toolchain-funcs
+inherit eutils fortran-2 multilib prefix toolchain-funcs
 
 MY_P="RasMol_${PV}"
 VERS="9Aug09"
@@ -14,8 +14,8 @@ HOMEPAGE="http://www.openrasmol.org/"
 #SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
 SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${PN}-2.7.5-${VERS}.tar.gz"
 
-LICENSE="|| ( GPL-2 RASLIC )"
 SLOT="0"
+LICENSE="|| ( GPL-2 RASLIC )"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
@@ -24,7 +24,6 @@ RDEPEND="
 	sci-libs/cbflib
 	sci-libs/cqrlib
 	sci-libs/neartree
-	virtual/fortran
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libXext
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
index 97b1fd31068c..516cbe99eb42 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.3 2012/04/25 15:52:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.4 2012/10/19 10:23:14 jlec Exp $
 
 EAPI=4
 
-inherit eutils fortran-2 prefix toolchain-funcs
+inherit eutils fortran-2 multilib prefix toolchain-funcs
 
 MY_P="RasMol_${PV}"
 VERS="13May11"
@@ -25,7 +25,6 @@ RDEPEND="
 	>=sci-libs/cbflib-0.9.2
 	>=sci-libs/cqrlib-1.1.2
 	>=sci-libs/neartree-3.1.1
-	virtual/fortran
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libXext