gentoo resync : 14.05.2020

3 files changed, 7 insertions, 90 deletions

diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index c8fc5c686237..03dc04d5a6e5 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -1,5 +1,3 @@
-DIST slepc-3.11.1.tar.gz 4700643 BLAKE2B a624050aad0128d7ef53f27f72484e078e62d8edf9298995dda71a9e8d804dddc7e433542eccf95b2d896be80e8795b1664375e68a4c02c18c56d78d490bffb7 SHA512 a941c2a955953ed2344de7f7d9eaaed79504c3559e27920c633bc09cfb192f883b26fd4aa5dc3bd9909a2fc045f3a34e514feca0e074ca36bc3166aa9c059235
-DIST slepc-3.12.1.tar.gz 4757436 BLAKE2B 607e7b28730ff16fa995768e23fd9861e180c078d2f06e8f65324b1e1761f0688fe5a4c4420983b521583cb2b3fe28b606baea604daf5253c30131f9f54c5572 SHA512 0254ea1a521cf150f9f0402bb936c9d1aa32765264e055ecdd058e44aaa7e87c3df1b63b1889c1989c4a691c652eb0f248a1bbbe6d555ce16f9f8f28d6765b50
-EBUILD slepc-3.11.1.ebuild 1661 BLAKE2B 6844c1e110d47bf7620e5a1712bbd265d6d0a40f65e8961ec3818c0eeb5b56c95b35bf4b76fdeab1a144a4561f549e4be1ad8a4cb27fcd623add77fd3e33af97 SHA512 e827d09af4082f3b6e6a96ae1880042a292f7cc1d44729c2efc77cfac91a554dde8f19ea8210dbc5d532e9f09786ec87d6a92ad379e18326181eee35e6f33d2d
-EBUILD slepc-3.12.1.ebuild 1661 BLAKE2B 6844c1e110d47bf7620e5a1712bbd265d6d0a40f65e8961ec3818c0eeb5b56c95b35bf4b76fdeab1a144a4561f549e4be1ad8a4cb27fcd623add77fd3e33af97 SHA512 e827d09af4082f3b6e6a96ae1880042a292f7cc1d44729c2efc77cfac91a554dde8f19ea8210dbc5d532e9f09786ec87d6a92ad379e18326181eee35e6f33d2d
+DIST slepc-3.13.1.tar.gz 4797627 BLAKE2B 29372b8a2d4c5f3b26e840df743f7aec098bfeeb29e9c108e509baa21d9697da19c737470ba4c132391d5193ebf749ef3f3c6ece600ec7527502d40a239aa0ee SHA512 620c344274808329c0a1009e7844532e03e88d38135bfd5b73bc0bc6815b17b6dfb49341d05399230ba6e06997db688aec17615429eaca3dc94fd886119bf321
+EBUILD slepc-3.13.1.ebuild 1588 BLAKE2B 471e024fa09e1b2bcbdaaccfaa6681449d7180ae0874b9f698cb180f60bc37b467e1cc5ed451ec25acb1dc02d219a2c8734a8113a277e3e95e409aefa81cc510 SHA512 87cfaaf90488b5951aa3ec865ebe288b8dc724323032d540b109511f3b268b107ed00e23f3439046191fb73c19f8b68f96a1f3450706c960b4c19c27ccbafdc5
 MISC metadata.xml 451 BLAKE2B 5268292011dffcbc322504b29332ae20a4e775238e201ffe793e1ebfb8d8c13a836ca1f8eba44b38bc63ba7b21a3634a03df9990e8b801def0152316d1539960 SHA512 7bf6d4cdedaa48f96e9b1d3e237b795f7cbfd840cece0c0181c9efa05ec833477191e8d12cf2b7737a921b85fb5af055d5868e1173415fc70802eb515959c9d5
diff --git a/sci-mathematics/slepc/slepc-3.12.1.ebuild b/sci-mathematics/slepc/slepc-3.12.1.ebuild
deleted file mode 100644
index 52212cabfd52..000000000000
--- a/sci-mathematics/slepc/slepc-3.12.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
-HOMEPAGE="http://slepc.upv.es/"
-SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="complex-scalars doc mpi"
-
-RDEPEND="
-	=sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=]
-	sci-libs/arpack[mpi=]
-	mpi? ( virtual/mpi )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-MAKEOPTS="${MAKEOPTS} V=1"
-
-src_prepare() {
-	default
-
-	sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die
-}
-
-src_configure() {
-	# *sigh*
-	addpredict "${PETSC_DIR}"/.nagged
-
-	# Make sure that the environment is set up correctly:
-	unset PETSC_DIR
-	unset PETSC_ARCH
-	unset SLEPC_DIR
-	source "${EPREFIX}"/etc/env.d/99petsc
-	export PETSC_DIR
-
-	# configure is a custom python script and doesn't want to have default
-	# configure arguments that we set with econf
-	./configure \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
-		--with-arpack=1 \
-		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-arpack-flags="$(usex mpi "-lparpack,-larpack" "-larpack")"
-
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99slepc <<- EOF
-		SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib
-	EOF
-	doenvd 99slepc
-
-	if use doc ; then
-		dodoc docs/slepc.pdf
-		docinto html
-		dodoc -r docs/*.html docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/slepc/slepc-3.11.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild
index 52212cabfd52..be2d085dd6cb 100644
--- a/sci-mathematics/slepc/slepc-3.11.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -30,12 +30,6 @@ DEPEND="${RDEPEND}
 
 MAKEOPTS="${MAKEOPTS} V=1"
 
-src_prepare() {
-	default
-
-	sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die
-}
-
 src_configure() {
 	# *sigh*
 	addpredict "${PETSC_DIR}"/.nagged
@@ -43,9 +37,10 @@ src_configure() {
 	# Make sure that the environment is set up correctly:
 	unset PETSC_DIR
 	unset PETSC_ARCH
-	unset SLEPC_DIR
 	source "${EPREFIX}"/etc/env.d/99petsc
 	export PETSC_DIR
+	export PETSC_ARCH
+	export SLEPC_DIR="${S}"
 
 	# configure is a custom python script and doesn't want to have default
 	# configure arguments that we set with econf
@@ -53,8 +48,7 @@ src_configure() {
 		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
 		--with-arpack=1 \
 		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-arpack-flags="$(usex mpi "-lparpack,-larpack" "-larpack")"
-
+		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
 }
 
 src_install() {