From 4aa0c216d21f74e01eb3c80a7d757bb36d6b9d40 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@gentoo.org>
Date: Sat, 28 Mar 2015 22:52:38 +0100
Subject: 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 +-
 sci-libs/dealii/dealii-8.2.1-r1.ebuild | 127 ++++++++++++++++++++++++++++++++
 sci-libs/dealii/dealii-8.2.1.ebuild    | 129 ---------------------------------
 sci-libs/dealii/dealii-9999.ebuild     |  10 +--
 6 files changed, 140 insertions(+), 137 deletions(-)
 create mode 100644 sci-libs/dealii/dealii-8.2.1-r1.ebuild
 delete mode 100644 sci-libs/dealii/dealii-8.2.1.ebuild

diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index 1b5b46aa4..b3491fe13 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@gentoo.org> +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@gentoo.org> 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 7e174ffa8..e1bce5e4a 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 e7cf68128..c0e321cf2 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-r1.ebuild b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
new file mode 100644
index 000000000..145cb29e6
--- /dev/null
+++ b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="http://www.dealii.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/dealii/dealii.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_PV="${PV//0_rc/rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/dealii/dealii/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		doc? (
+			https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz
+			-> ${P}-offline_documentation.tar.gz
+			http://ganymed.iwr.uni-heidelberg.de/~maier/dealii/releases/${MY_P}-offline_documentation.tar.gz
+			-> ${P}-offline_documentation.tar.gz
+			)"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="
+	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
+REQUIRED_USE="
+	mumps? ( mpi lapack )
+	p4est? ( mpi )
+	trilinos? ( mpi )"
+
+RDEPEND="dev-libs/boost
+	app-arch/bzip2
+	sys-libs/zlib
+	arpack? ( sci-libs/arpack[mpi=] )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi )
+	mumps? ( sci-libs/mumps[mpi] )
+	muparser? ( dev-cpp/muParser )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
+	opencascade? ( sci-libs/opencascade )
+	p4est? ( sci-libs/p4est[mpi] )
+	parameter_gui? ( dev-qt/qtgui )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	tbb? ( dev-cpp/tbb )
+	trilinos? ( sci-libs/trilinos )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+
+src_configure() {
+	# deal.II needs a custom build type:
+	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
+
+	local mycmakeargs=(
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_BUNDLED=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_COMPONENT_COMPAT_FILES=OFF
+		-DDEAL_II_CMAKE_MACROS_RELDIR=share/${PN}/cmake/macros
+		-DDEAL_II_DOCHTML_RELDIR=share/doc/${PF}/html
+		-DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
+		-DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
+		-DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
+		-DDEAL_II_WITH_BZIP2=ON
+		-DDEAL_II_WITH_ZLIB=ON
+		$(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_sse2 DEAL_II_HAVE_SSE2)
+		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
+		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
+		$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
+		$(cmake-utils_use lapack DEAL_II_WITH_LAPACK)
+		$(cmake-utils_use mesh_converter DEAL_II_COMPONENT_MESH_CONVERTER)
+		$(cmake-utils_use metis DEAL_II_WITH_METIS)
+		$(cmake-utils_use mpi DEAL_II_WITH_MPI)
+		$(cmake-utils_use mumps DEAL_II_WITH_MUMPS)
+		$(cmake-utils_use muparser DEAL_II_WITH_MUPARSER)
+		$(cmake-utils_use netcdf DEAL_II_WITH_NETCDF)
+		-DOPENCASCADE_DIR="${CASROOT}"
+		$(cmake-utils_use opencascade DEAL_II_WITH_OPENCASCADE)
+		$(cmake-utils_use p4est DEAL_II_WITH_P4EST)
+		$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
+		$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
+		$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
+		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
+		$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
+		$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
+		$(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc && [[ ${PV} != *9999* ]]; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+			"${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake-utils_src_install
+
+	# decompress the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-libs/dealii/dealii-8.2.1.ebuild b/sci-libs/dealii/dealii-8.2.1.ebuild
deleted file mode 100644
index 07c31a30f..000000000
--- a/sci-libs/dealii/dealii-8.2.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="http://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/dealii/dealii.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	MY_PV="${PV//0_rc/rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/dealii/dealii/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		doc? (
-			https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz
-			-> ${P}-offline_documentation.tar.gz
-			http://ganymed.iwr.uni-heidelberg.de/~maier/dealii/releases/${MY_P}-offline_documentation.tar.gz
-			-> ${P}-offline_documentation.tar.gz
-			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-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
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
-	mumps? ( mpi lapack )
-	p4est? ( mpi )
-	trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
-	app-arch/bzip2
-	sys-libs/zlib
-	arpack? ( sci-libs/arpack[mpi=] )
-	hdf5? ( sci-libs/hdf5[mpi=] )
-	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi )
-	mumps? ( sci-libs/mumps[mpi] )
-	muparser? ( dev-cpp/muParser )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
-	opencascade? ( sci-libs/opencascade )
-	p4est? ( sci-libs/p4est[mpi] )
-	parameter_gui? ( dev-qt/qtgui )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	sparse? ( sci-libs/umfpack )
-	tbb? ( dev-cpp/tbb )
-	trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-src_configure() {
-	# deal.II needs a custom build type:
-	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
-	local mycmakeargs=(
-		-DDEAL_II_ALLOW_AUTODETECTION=OFF
-		-DDEAL_II_ALLOW_BUNDLED=OFF
-		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
-		-DDEAL_II_COMPONENT_COMPAT_FILES=OFF
-		-DDEAL_II_CMAKE_MACROS_RELDIR=share/${PN}/cmake/macros
-		-DDEAL_II_DOCHTML_RELDIR=share/doc/${PF}/html
-		-DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
-		-DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
-		-DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
-		-DDEAL_II_WITH_BZIP2=ON
-		-DDEAL_II_WITH_ZLIB=ON
-		$(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)
-		$(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
-		$(cmake-utils_use lapack DEAL_II_WITH_LAPACK)
-		$(cmake-utils_use mesh_converter DEAL_II_COMPONENT_MESH_CONVERTER)
-		$(cmake-utils_use metis DEAL_II_WITH_METIS)
-		$(cmake-utils_use mpi DEAL_II_WITH_MPI)
-		$(cmake-utils_use mumps DEAL_II_WITH_MUMPS)
-		$(cmake-utils_use muparser DEAL_II_WITH_MUPARSER)
-		$(cmake-utils_use netcdf DEAL_II_WITH_NETCDF)
-		-DOPENCASCADE_DIR="${CASROOT}"
-		$(cmake-utils_use opencascade DEAL_II_WITH_OPENCASCADE)
-		$(cmake-utils_use p4est DEAL_II_WITH_P4EST)
-		$(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
-		$(cmake-utils_use petsc DEAL_II_WITH_PETSC)
-		$(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
-		$(cmake-utils_use tbb DEAL_II_WITH_THREADS)
-		$(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc && [[ ${PV} != *9999* ]]; then
-		# copy missing images to the build directory:
-		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
-			"${BUILD_DIR}"/doc/doxygen/deal.II || die
-		# replace links:
-		sed -i \
-			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
-			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
-	fi
-	cmake-utils_src_install
-
-	# decompress the installed example sources:
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 2774e75cb..dc836023b 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)
-- 
cgit v1.2.3-65-gdbad