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

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

4 files changed, 21 insertions, 102 deletions

diff --git a/sci-libs/mc/ChangeLog b/sci-libs/mc/ChangeLog
index a9ad59fdcc91..cbacb9c34608 100644
--- a/sci-libs/mc/ChangeLog
+++ b/sci-libs/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/mc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/ChangeLog,v 1.6 2012/02/28 12:57:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/ChangeLog,v 1.7 2012/10/16 20:40:42 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> -mc-1.4.ebuild, mc-1.5.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   28 Feb 2012; Justin Lecher <jlec@gentoo.org> mc-1.5.ebuild,
   +files/mc-1.5-unbundle.patch, metadata.xml:
diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest
index 8c460185e629..23d8eacf88ac 100644
--- a/sci-libs/mc/Manifest
+++ b/sci-libs/mc/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 1.4-doc.patch 526 RMD160 9b3cd48b6b319b1a30c156aa3e14cb6f753b55d4 SHA1 eac89bc5c3a65244f33f5d97172ea814c33294f9 SHA256 d1459adc32d7a4c987cbba795935e199939c66a81649ca21159c2d632c9cc408
-AUX 1.4-multilib.patch 693 RMD160 cbc1859370d49aa240215a2580d89a42b98ecbb8 SHA1 134917a0258d3fb71c0e19a1e57db41950c45d07 SHA256 c12e7f95d5ecc9d3bdd6b2d25b0660b63b8ed08d557c7653d89f23b576817aa8
-AUX 1.4-overflow.patch 426 RMD160 7c22e306c37c693c7e93f958c6aa497c43b894fb SHA1 d8ed633462b347d56cbb9428807f249682be4f2f SHA256 3ea566138dccc904747021f909d553254e9ff0f7064ea5cffd74b20df678c0bd
-AUX 1.4-superlu.patch 695 RMD160 4318c21aabd86b2f0677488af486a30ea52b9538 SHA1 1f8de9615227c96a886bd10738c097e63ef8e3d3 SHA256 df3feabb7b2bb78973b4e0b85b9382e742f69f1966be6d6e61c418047c87d99e
-AUX mc-1.5-unbundle.patch 1825 RMD160 a08e323260973bdc52d5653d5336a2e14b0c4d51 SHA1 a5117c65a955759a9cb07024dd0be71cda5e2259 SHA256 c0137c8a4627dd9e30564aeee833f5044401be9a2b73c0771baec01470aaa32b
-DIST mc-1.4.tar.gz 16304707 RMD160 06ef87fdf214509b94a3a79370f9dbb28e8755ae SHA1 32369cc980e95296c10f9461df791e4f6b5b9765 SHA256 c5768055eb0fbccac620494e46708a7a0aef7ffc34f2b98efb8fce1b953e4e93
-DIST mc-1.5.tar.gz 18140539 RMD160 4d4b3bf06bd77929466bb6015a31233b2e9c1b44 SHA1 ee33246e3d29b33911086acb94792a644f48a575 SHA256 a149d833d41362916583dca7561248281a79c8a8167b5329a24d7f3f23df05e1
-EBUILD mc-1.4.ebuild 1972 RMD160 36ae132c50409e1de2f7532571f5450ad662575d SHA1 8f9f76adebd57f15b0ae6152a3c7c20a7a7349dc SHA256 b09309c767eb092f8ced0f29ac4ddfdd8083d8262ca1d7bd6c5abe9ec3587f1a
-EBUILD mc-1.5.ebuild 2043 RMD160 879e38855814768d635319801c38845d8d987504 SHA1 f9da59d83b67cfaeb2673ba844c44d612ff2434a SHA256 7e21e569689e85280d36681965605979cf827971217653ced07bfe72e8dbaf0c
-MISC ChangeLog 1156 RMD160 7754076c3fbaeecd0b0a6f88a0461f88552a8a58 SHA1 29693b50e954c0658309232aff3bcc37c5cf285e SHA256 984df90ba15b42f10736472e27d4e18c740318a88554a71b54224cadbf5aec7a
-MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
+AUX 1.4-doc.patch 526 SHA256 d1459adc32d7a4c987cbba795935e199939c66a81649ca21159c2d632c9cc408 SHA512 079a62088acae2164965f76821399c49c798e1e38b25f54825d16afa4eefcc43fcda10bddb9dca183c0b53e4fb72402a31ec914c0145b62c674a1244f7a1152d WHIRLPOOL d53281044811a136023028baadc96cc25b904d706d5944b92f6563bcb87a7860ff0bf077d6ef7d3f177bea3be504cdf2a70862177cf7031666ed01014e386039
+AUX 1.4-multilib.patch 693 SHA256 c12e7f95d5ecc9d3bdd6b2d25b0660b63b8ed08d557c7653d89f23b576817aa8 SHA512 878d0ff033ae1926fe53c43bb3e6118612e328b395879359c930c10b7699d0180d024693b9bdc9da21a5dd904557101001683079127657122c7140d49ae9b43b WHIRLPOOL f1307329799827307f264f1b8ba9d1ace520e4171a9d96b9d0ac7d7685391a6cb2fa67b87f3de5e6fa1f5fd6e1237f45b5c04e7ac43ce6ed0cff541b047a1492
+AUX 1.4-overflow.patch 426 SHA256 3ea566138dccc904747021f909d553254e9ff0f7064ea5cffd74b20df678c0bd SHA512 8eef4fcacb4c9b676b071483a7ff7c214110e8af1819552dc732919da2b4138754391cf578c90991e0fb36a475446b73bc9e5764b9e83224ab82519084d1aaee WHIRLPOOL e525a4a1808d9dc9a5aff7a268b04ce748963a59bab28ba6e70d03cf421f447b93a2cff0fc6d9fc039224a1bc2b5c852240b6f3fbe99149fc07109c7a101d334
+AUX 1.4-superlu.patch 695 SHA256 df3feabb7b2bb78973b4e0b85b9382e742f69f1966be6d6e61c418047c87d99e SHA512 9ada97571a91a8b4d832c61e373c2f64267ed4f0730a4e8543f388167daafe8800ed95e74e143d1644019f934b1e5b6b658b5ee639e97a01ad0a78bfe653296b WHIRLPOOL bac8c3e464796500f95252bc38f435c3e9fd0fff58dd9699ef731954a8111e44958272ba562e19e0214faa3c678ccecb4b621ea72cf5c45ba716402f1ecb83da
+AUX mc-1.5-unbundle.patch 1825 SHA256 c0137c8a4627dd9e30564aeee833f5044401be9a2b73c0771baec01470aaa32b SHA512 45565bd8ffd7525798f21f878c9d4f34c46dd198d40fa475d00bdf1461a2ae6372e836bef59f2686a9af52d31a3b061e43868fdc6a7da17838316294ba689d92 WHIRLPOOL d7b70b9d75d6d66f113488515c99ff004a78311b2b3400cde8c6ef068e63f0a22c04041b48019db751e4651c5d490f7db49ac0cacbccffc64dbcde71a0ba5440
+DIST mc-1.5.tar.gz 18140539 SHA256 a149d833d41362916583dca7561248281a79c8a8167b5329a24d7f3f23df05e1 SHA512 6db79c677b1a326ea50c78a07b8cc088eb5e23e9d8821a3a3802017e9e8d4011307ba024d3354dc24cb31d822da2023a150787a137b7806f6344b0834e7f194b WHIRLPOOL a008371d978d86946b147aea2d45c7ae2a14c558a3c07b835a815e8e4e60602cae5b1133766c435dab8aeb3b2858ad796bfcd2f10f5347a5a8543c7fc68185f4
+EBUILD mc-1.5.ebuild 2025 SHA256 0254a35db87f7ffd23b3be091fef6112461990058a81c01357338db25ec841cb SHA512 0a805aa22690df7b5f4861f203627d754a15816cdaac59c481115b6866b3bf6d647812c5091286fd60ac5a2e81e3dfc74334e8c8d598c9f3ef46b1906c2b29fb WHIRLPOOL 68575cbc18d3304bd7074f1a56d6e94b4a5a27d2a64ecd247064115856a07ae6e304e08a748a264baf787b16bb783724491e585c7c55dc52d24ff3f0133424b4
+MISC ChangeLog 1340 SHA256 94a3405d035f0dbae8aa4e74a20c8906995da96a0b4e3728bf3190c5b1f42f89 SHA512 46f9e4cbfeef88140915d9fe47b05557c24fbd393305a7b567afe4c31686d35d150d2bfb636709509de4539c3d25eb29e82d486e8091b6de0d349d91031aa1fb WHIRLPOOL 4bb15e95b7a978e951e5328039b54519bb2756f2724e264fa6eae82868bdd564c98bd8588d8d7d7ae451cd2db7a2ae3d54c0fe293a19a012bbd416e64c12ebbb
+MISC metadata.xml 219 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8 SHA512 8e1fa48bb6533db28b30f09f61673779d75cebd0ba8058abb411cb62595788272998bb9d3e1be8a0f6f95ca42722efc6af7e4d5741e15fe72df4ad8c872383c1 WHIRLPOOL 12f73f93602d45fe69385989b4e8e91507665e0d7deb148365fce2c41d9a85e9bcaaa940ce039a554770f4f4b2207e33a2cea5ad784561b3c3a92be8584f4478
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk9MzzIACgkQgAnW8HDreRbo8ACcCQPhSV4xqp2h+xiCnT+JerDJ
-Vt0AoJEfuhzCyC+GIUrUhEFIEN7GHKdH
-=A/DW
+iEYEAREIAAYFAlB9xlEACgkQgAnW8HDreRbW0gCdFWHN+u8VR8lpQWqgs/Li+u7X
+dIgAnjt1UfchDnZa03zTy5yTtbczE0a+
+=Z+hm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mc/mc-1.4.ebuild b/sci-libs/mc/mc-1.4.ebuild
deleted file mode 100644
index 27185cdbc99e..000000000000
--- a/sci-libs/mc/mc-1.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.4.ebuild,v 1.4 2011/06/21 15:12:17 jlec Exp $
-
-EAPI="2"
-
-inherit autotools eutils fortran-2 multilib
-
-DESCRIPTION="2D/3D AFEM code for nonlinear geometric PDE"
-HOMEPAGE="http://fetk.org/codes/mc/index.html"
-SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="debug doc"
-
-RDEPEND="
-	virtual/fortran
-
-	dev-libs/maloc
-	media-libs/sg
-	sci-libs/amd
-	sci-libs/gamer
-	sci-libs/punc
-	sci-libs/superlu
-	sci-libs/umfpack"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		media-gfx/graphviz
-		app-doc/doxygen )"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-superlu.patch \
-		"${FILESDIR}"/${PV}-overflow.patch \
-		"${FILESDIR}"/${PV}-multilib.patch \
-		"${FILESDIR}"/${PV}-doc.patch
-	sed \
-		-e 's:AMD_order:amd_order:g' \
-		-e 's:UMFPACK_numeric:umfpack_di_numeric:g' \
-		-e 's:buildg_:matvec_:g' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myconf
-
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
-
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
-	export FETK_MPI_LIBRARY="${fetk_lib}"
-	export FETK_VF2C_LIBRARY="${fetk_lib}"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
-	export FETK_LAPACK_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_SUPERLU_LIBRARY="${fetk_lib}"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_PMG_LIBRARY="${fetk_lib}"
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable debug vdebug) \
-		--disable-triplet \
-		--enable-shared \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index 0339acc531f3..7c5205c036f8 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v 1.4 2012/02/28 12:57:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v 1.5 2012/10/16 20:40:42 jlec Exp $
 
 EAPI=4
 
@@ -18,8 +18,6 @@ LICENSE="GPL-2"
 IUSE="debug doc static-libs"
 
 RDEPEND="
-	virtual/fortran
-
 	dev-libs/maloc
 	media-libs/sg
 	sci-libs/amd