[gentoo-commits] proj/sci:master commit in: sci-libs/dealii/

[Justin Lecher]

commit:     4aa0c216d21f74e01eb3c80a7d757bb36d6b9d40
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 21:52:38 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 21:52:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4aa0c216

sci-libs/dealii: Ebuild maintenance, remove wrong avx2 use flag

Package-Manager: portage-2.2.15

 sci-libs/dealii/ChangeLog                                      |  7 +++++++
 sci-libs/dealii/dealii-8.1.0-r2.ebuild                         |  2 +-
 sci-libs/dealii/dealii-8.2.0.ebuild                            |  2 +-
 .../dealii/{dealii-8.2.1.ebuild => dealii-8.2.1-r1.ebuild}     | 10 ++++------
 sci-libs/dealii/dealii-9999.ebuild                             | 10 ++++------
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index 1b5b46a..b3491fe 100644
--- a/sci-libs/dealii/ChangeLog
+++ b/sci-libs/dealii/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*dealii-8.2.1-r1 (28 Mar 2015)
+
+  28 Mar 2015; Matthias Maier <tamiko@g.o> +dealii-8.2.1-r1.ebuild,
+  -dealii-8.2.1.ebuild, dealii-8.1.0-r2.ebuild, dealii-8.2.0.ebuild,
+  dealii-9999.ebuild:
+  sci-libs/dealii: Ebuild maintenance, remove wrong avx2 use flag
+
   29 Jan 2015; Matthias Maier <tamiko@g.o> dealii-8.1.0-r2.ebuild,
   dealii-8.2.1.ebuild, dealii-9999.ebuild, metadata.xml:
   Convert to CPU_FLAGS_X86

diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
index 7e174ff..e1bce5e 100644
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild
+++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
@@ -44,7 +44,7 @@ RDEPEND="dev-libs/boost
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	mumps? ( sci-libs/mumps[mpi] )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
 	petsc? ( sci-mathematics/petsc[mpi=] )

diff --git a/sci-libs/dealii/dealii-8.2.0.ebuild b/sci-libs/dealii/dealii-8.2.0.ebuild
index e7cf681..c0e321c 120000
--- a/sci-libs/dealii/dealii-8.2.0.ebuild
+++ b/sci-libs/dealii/dealii-8.2.0.ebuild
@@ -1 +1 @@
-dealii-8.2.1.ebuild
\ No newline at end of file
+dealii-8.2.1-r1.ebuild
\ No newline at end of file

diff --git a/sci-libs/dealii/dealii-8.2.1.ebuild b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
similarity index 92%
rename from sci-libs/dealii/dealii-8.2.1.ebuild
rename to sci-libs/dealii/dealii-8.2.1-r1.ebuild
index 07c31a3..145cb29 100644
--- a/sci-libs/dealii/dealii-8.2.1.ebuild
+++ b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
@@ -31,10 +31,9 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
-	arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
-	+debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps
-	muparser opencascade netcdf p4est parameter_gui petsc +sparse
-	static-libs +tbb trilinos
+	arpack cpu_flags_x86_avx cpu_flags_x86_sse2 c++11 +debug doc +examples
+	hdf5 +lapack mesh_converter metis mpi mumps muparser opencascade netcdf
+	p4est parameter_gui petsc +sparse static-libs +tbb trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -53,7 +52,7 @@ RDEPEND="dev-libs/boost
 	mpi? ( virtual/mpi )
 	mumps? ( sci-libs/mumps[mpi] )
 	muparser? ( dev-cpp/muParser )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
@@ -86,7 +85,6 @@ src_configure() {
 		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
 		$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
 		$(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
-		$(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
 		$(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
 		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
 		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)

diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 2774e75..dc83602 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -31,10 +31,9 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
-	arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
-	+debug doc +examples hdf5 +lapack mesh_converter metis mpi muparser
-	opencascade netcdf p4est parameter_gui petsc +sparse static-libs +tbb
-	trilinos
+	arpack cpu_flags_x86_avx cpu_flags_x86_sse2 c++11 +debug doc +examples
+	hdf5 +lapack mesh_converter metis mpi muparser opencascade
+	netcdf p4est parameter_gui petsc +sparse static-libs +tbb trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -51,7 +50,7 @@ RDEPEND="dev-libs/boost
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
@@ -82,7 +81,6 @@ src_configure() {
 		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
 		$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
 		$(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
-		$(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
 		$(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
 		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
 		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)