Reflect the split of the fortran interface out of sci-libs/netcdf in sci-libs/bigdft and sci-libs/etsf_io. The version of sci-physics/elk bumped to 1.4.22, the old ones removed.

7 files changed, 33 insertions, 8 deletions

diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 5334648c2..1d25edefd 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bigdft-1.6.0-r2 (19 Jun 2012)
+*bigdft-1.6_pre1-r2 (19 Jun 2012)
+
+  19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  -bigdft-1.6_pre1-r1.ebuild, +bigdft-1.6_pre1-r2.ebuild,
+  -bigdft-1.6.0-r1.ebuild, +bigdft-1.6.0-r2.ebuild:
+  Reflect the split of the fortran interface out of sci-libs/netcdf
+
   22 May 2012; Justin Lecher <jlec@gentoo.org> bigdft-1.6_pre1-r1.ebuild,
   bigdft-1.6.0-r1.ebuild:
   Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest
index 5f1f645ce..02177f45a 100644
--- a/sci-libs/bigdft/Manifest
+++ b/sci-libs/bigdft/Manifest
@@ -1,2 +1,2 @@
-DIST bigdft-1.6-tuto.1.tar.gz 7510733 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
-DIST bigdft-1.6.0.tar.gz 8876759 SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
+DIST bigdft-1.6-tuto.1.tar.gz 7510733 RMD160 1f759a7590491e2f143c592db01d0263646bae82 SHA1 5308af2e44b15a9a2c5d9cb14eec9b934a16c9f0 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
+DIST bigdft-1.6.0.tar.gz 8876759 RMD160 6cc9f8c87447d540e0677311dfb9a1da6c7f0150 SHA1 b4c75d0bf95ddf66d8cade96f4c1c625a2b71f1b SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index cdb304961..b4e40f540 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
 			)
 		)
 	etsf_io? ( sci-libs/etsf_io )
-	netcdf? ( sci-libs/netcdf[fortran] )"
+	netcdf? ( || (
+				sci-libs/netcdf[fortran]
+				sci-libs/netcdf-fortran
+				)
+			)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/autoconf-2.59
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
index 6cdd6e4e3..f9860f679 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
@@ -32,7 +32,11 @@ RDEPEND="
 			)
 		)
 	etsf_io? ( sci-libs/etsf_io )
-	netcdf? ( sci-libs/netcdf[fortran] )"
+	netcdf? ( || (
+				sci-libs/netcdf[fortran]
+				sci-libs/netcdf-fortran
+				)
+			)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/autoconf-2.59
diff --git a/sci-libs/etsf_io/ChangeLog b/sci-libs/etsf_io/ChangeLog
index b4391ae02..19ac5b64a 100644
--- a/sci-libs/etsf_io/ChangeLog
+++ b/sci-libs/etsf_io/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/etsf_io
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*etsf_io-1.0.3-r1 (19 Jun 2012)
+
+  19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  -etsf_io-1.0.3.ebuild, +etsf_io-1.0.3-r1.ebuild:
+  Reflect the split of the fortran interface out of sci-libs/netcdf
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> etsf_io-1.0.3.ebuild,
   metadata.xml:
   Fixed Malformed CVS Header on line: 3
diff --git a/sci-libs/etsf_io/Manifest b/sci-libs/etsf_io/Manifest
index b63a2dba4..45b7f5717 100644
--- a/sci-libs/etsf_io/Manifest
+++ b/sci-libs/etsf_io/Manifest
@@ -1 +1 @@
-DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e
+DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e SHA512 2a60533a588587da5629687942044ed58b72a554c484d3c22263314cbeb21aa819d5097e6637b599de06474d4d92cc84ea94fa365123e677311be3bf7b8e7bf5 WHIRLPOOL 714cfa983b5f3411a04df88ad54513f71b482368cba93b790d5d93388a9aea346cd83de80311ed0fe5fdc51fac4af8be4428764119a0cf9f17df24e91f2ae74a
diff --git a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
index 402389b9e..a3c62340d 100644
--- a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild
+++ b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,10 @@ IUSE="examples"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	sci-libs/netcdf[fortran]
+	|| (
+		sci-libs/netcdf[fortran]
+		sci-libs/netcdf-fortran
+	)
 	virtual/fortran"
 DEPEND="${RDEPEND}"