gentoo resync : 18.11.2019

4 files changed, 10 insertions, 97 deletions

diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 176a95d07e6f..7f389731e22f 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,9 +1,7 @@
-DIST hypre-2.11.1.tar.gz 8054149 BLAKE2B 207d382b08ac67e09d55e323b86f84a0a7247baf21275c8774bf555c99401aa28f2ae6d4010a63d0c299a702a7b93a85ea98aed51ea5c8c8b31e4587760895d1 SHA512 4266c1b5225bcc97781246475100382f4929d7c918c854570a36b90602e8f111a4893cd1c93b95c68305c851898b970dd92ac173efe9211be5bb914d3c3c5d83
-DIST hypre-2.11.2.tar.gz 8077407 BLAKE2B d51a40d015f03757425da1fbc113a2647c267d1d47bebe343f2cd84983349cdbdb0e5b51a3c253edcab3d54f352158f0e263afcce592157b64202af471d642c6 SHA512 a06321028121e5420fa944ce4fae5f9b96e6021ec2802e68ec3c349f19a20543ed7eff774a4735666c5807ce124eb571b3f86757c67e91faa1c683c3f657469f
 DIST hypre-2.14.0.tar.gz 7312329 BLAKE2B 93de48bdd05c383c74fb1b3b25ddcd5830be099aa7557262547932e17eba524c25ff69ff94d10f29ffdabfef9c05281fd485a7c9b999141f2488ae4fc0238736 SHA512 c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c
-DIST hypre-2.9.0b.tar.gz 9053035 BLAKE2B 1bde86f88545d24617673a0c0c8c7458399bd7220a0ffe25ab4c9772e1c802c9b51ceaf716e843e236df1fd673bbd171642726590efdbb100821c3d3e54bacd7 SHA512 6856f2c80eaf669258d73a36a59c0fd0f43e20a5b2e633b6aefbccf41f5217ea821a6201dadc0de2b17a039ba9f53d98031f0b091e3db552cc5251a4f766acb8
-EBUILD hypre-2.11.1.ebuild 2895 BLAKE2B 93d38f17f0536214b2163de4b9cbf31d36bbcf0ecc50eeccd34fb3aa42c07e894bb6777913a33939bc3650da96b9c88d4ee1ee4da8b257eb05948c26de6d6fac SHA512 d72b5f812193840e828766b66305102101a43a289190af7832fe30714353b0c0dcc872905674ac1286f999873869c3b62e388e767f5867ebd0efa16ff0338f2d
-EBUILD hypre-2.11.2.ebuild 2895 BLAKE2B 93d38f17f0536214b2163de4b9cbf31d36bbcf0ecc50eeccd34fb3aa42c07e894bb6777913a33939bc3650da96b9c88d4ee1ee4da8b257eb05948c26de6d6fac SHA512 d72b5f812193840e828766b66305102101a43a289190af7832fe30714353b0c0dcc872905674ac1286f999873869c3b62e388e767f5867ebd0efa16ff0338f2d
+DIST hypre-2.18.0.tar.gz 5698227 BLAKE2B e6562b78dcff6592a7df86d2162e3669c9ea3f71cc8926402038da319cb6c1b801a7ac5e44612ba86762ccdd63ae30cd2976451368309622b46e67a7a7dc1d83 SHA512 41292d590285703b5fb91c767fc9d064e36911f09583a81a3da9f2b5524143b23bb1beba3449d759e3f681760d9ad155072e1762d7d6bbe0e65660d5b16c472a
+DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
 EBUILD hypre-2.14.0.ebuild 2929 BLAKE2B d3e32bd55d00422686ef432e4ec4c63fe133342494f29255c71d86f98ed31a3eee6fdd66b68f32ab194420197994f11d9cc767675afe65367cd85bb7fefbddab SHA512 9024f6db0d7f7cd460a6a639915d3aa7f73d6048a0ecc70fe88b928cf445d6398a206822cade66b237e9fdbee2ad1b6e443c0870ad3fb67532c05409406f98d6
-EBUILD hypre-2.9.0b.ebuild 1883 BLAKE2B 0f7d1d1b5f760ab851369000f6aed343bd20f34e88ebd6de2b3963deabe1acab2d03cd02176f940a1fc11e941bf5e8086562861ac3c06a3dc3c1aebbab065384 SHA512 3dc2f99aeaaf4e0a723d21302e9664eaa2bea69287ee7554ed0e9894d58effb251727cd329e003547525b91cfe48ec6c62fec2dbec64d12de9531defde5f9cb3
+EBUILD hypre-2.18.0.ebuild 2759 BLAKE2B 1606c1fc02aadf5be7f5a1f095254182fb28fcba12dfc8d0e5b98961466fbc4a2b24990e5dc9aada96ae2c2bed7743710b878a0621b12979cf43ed0c39f415af SHA512 e9699f6ef44ce63cd05794b083370806115a61d399a4d4765d494590dd823cf831e5d60b5da777524d64db6459349e503203bca739c8cba735d18c31d9b15187
+EBUILD hypre-2.18.2.ebuild 2759 BLAKE2B 1606c1fc02aadf5be7f5a1f095254182fb28fcba12dfc8d0e5b98961466fbc4a2b24990e5dc9aada96ae2c2bed7743710b878a0621b12979cf43ed0c39f415af SHA512 e9699f6ef44ce63cd05794b083370806115a61d399a4d4765d494590dd823cf831e5d60b5da777524d64db6459349e503203bca739c8cba735d18c31d9b15187
 MISC metadata.xml 689 BLAKE2B 81168f6d150dc65e74bbae7b73657d2ef6c5de0cfcb616b9f1dd756e9734e10823c1468cc1725f8681dfb71d529c89c958e751100aa9727dcc28e36c8f27fd2b SHA512 fb10f8f67754f103b109fa7696e66e02f6a66ff74472341f3e2dcb27957646fd4140594c9eee489c3d47f1985bf8a122b48269c6a6168ddbfcdcd0ffe2a415e2
diff --git a/sci-libs/hypre/hypre-2.11.1.ebuild b/sci-libs/hypre/hypre-2.18.0.ebuild
index f6aa3e5337be..e8e6dd2d154a 100644
--- a/sci-libs/hypre/hypre-2.11.1.ebuild
+++ b/sci-libs/hypre/hypre-2.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,12 +9,12 @@ inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Parallel matrix preconditioners library"
 HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples fei fortran int64 openmp mpi"
+IUSE="debug examples fortran int64 openmp mpi"
 
 RDEPEND="
 	sci-libs/superlu:=
@@ -26,9 +26,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGELOG COPYRIGHT README )
 
-# 2.11.1: fei and mli wrappers still buggy with big integers
-REQUIRED_USE="int64? ( !fei )"
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] &&\
 		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
@@ -78,8 +75,6 @@ src_configure() {
 		$(use_enable openmp hopscotch) \
 		$(use_enable int64 bigint) \
 		$(use_enable fortran) \
-		$(use_with fei) \
-		$(use_with fei mli) \
 		$(use_with openmp) \
 		$(use_with mpi MPI)
 }
@@ -99,7 +94,6 @@ src_install() {
 		  HYPRE_INSTALL_DIR="${ED}" \
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
 		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
-	use doc && dodoc docs/*.pdf
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r src/examples
diff --git a/sci-libs/hypre/hypre-2.11.2.ebuild b/sci-libs/hypre/hypre-2.18.2.ebuild
index f6aa3e5337be..e8e6dd2d154a 100644
--- a/sci-libs/hypre/hypre-2.11.2.ebuild
+++ b/sci-libs/hypre/hypre-2.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,12 +9,12 @@ inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Parallel matrix preconditioners library"
 HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples fei fortran int64 openmp mpi"
+IUSE="debug examples fortran int64 openmp mpi"
 
 RDEPEND="
 	sci-libs/superlu:=
@@ -26,9 +26,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGELOG COPYRIGHT README )
 
-# 2.11.1: fei and mli wrappers still buggy with big integers
-REQUIRED_USE="int64? ( !fei )"
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] &&\
 		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
@@ -78,8 +75,6 @@ src_configure() {
 		$(use_enable openmp hopscotch) \
 		$(use_enable int64 bigint) \
 		$(use_enable fortran) \
-		$(use_with fei) \
-		$(use_with fei mli) \
 		$(use_with openmp) \
 		$(use_with mpi MPI)
 }
@@ -99,7 +94,6 @@ src_install() {
 		  HYPRE_INSTALL_DIR="${ED}" \
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
 		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
-	use doc && dodoc docs/*.pdf
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r src/examples
diff --git a/sci-libs/hypre/hypre-2.9.0b.ebuild b/sci-libs/hypre/hypre-2.9.0b.ebuild
deleted file mode 100644
index 3228bd2a6524..000000000000
--- a/sci-libs/hypre/hypre-2.9.0b.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Parallel matrix preconditioners library"
-HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="https://computation.llnl.gov/casc/hypre/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran mpi"
-
-RDEPEND="
-	sci-libs/superlu:0=
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "${WORKDIR}"/${P}/{CHANGELOG,COPYRIGHT,README} )
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# link with system superlu and propagate LDFLAGS
-	sed -i \
-		-e 's:@LIBS@:@LIBS@ -lsuperlu:' \
-		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
-		config/Makefile.config.in || die
-	sed -i \
-		-e '/HYPRE_ARCH/s: = :=:g' \
-		configure || die
-	# link with system blas and lapack
-	sed -i \
-		-e '/^BLASFILES/d' \
-		-e '/^LAPACKFILES/d' \
-		lib/Makefile || die
-	use mpi && export CC=mpicc CXX=mpicxx FC=mpif77
-	tc-export CC CXX
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--without-superlu
-		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')"
-		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')"
-		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')"
-		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')"
-		$(use_enable fortran)
-		$(use_with mpi MPI)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dolib.so hypre/lib/lib*
-	insinto /usr/include/hypre
-	doins -r hypre/include/*
-
-	use doc && dodoc "${WORKDIR}"/${P}/docs/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}