gentoo resync : 25.08.2020

3 files changed, 13 insertions, 36 deletions

diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 0c2bb022cec8..6ae9f314a39b 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,3 @@
-DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.3.1.ebuild 739 BLAKE2B f92ddd0fc74c0e1940975e1536f3a56364125a40f0ded5660c9c9dafa04235628b6e10c0aacb03abbc6faad134a2e91b88990475f9222ff9bc6fa1361ca224a7 SHA512 96e2ffe647415968e1824faab20011008db57a3d810d562dd1e45107881512dbe14cf106ea05022f8e22b0a6ca12c5bff0e5c461efaa338b09dca2e2d30534da
-EBUILD amd-2.4.6.ebuild 718 BLAKE2B 932f6b127a62562c0d86e2e472246f0b9dcaca68d4eb1eaf440eed72e071018fadc3c5c42c290d146a38847aa38a2d3feb9bed7f38a99aea777057130f5c1d9d SHA512 593178c8259d83a56d2fdf80149aa6b631e9feecabb5944e702f06b2499104c9d08dc8482ee24a3f9211494256f6b748b8606f29ebb6a1a0f5a0348c446746c5
+EBUILD amd-2.4.6.ebuild 781 BLAKE2B f4647eb197bc38a2fa0f9dcd38ecf71afde48cac512d46a31d21c87b4e94a32e480983bdcb456970aaf07c02f43c028fa0261ed00b07bd718313372171a824e0 SHA512 73b3a9d3d76d8661194a3ecace1de7856fe584fb73882214a24c3bec0d24cdf5a9a4a2126dfe0f7d81028d2e9ed71d8c88d716cc71dd1015a6c11156095421a1
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
deleted file mode 100644
index a0bb445c716c..000000000000
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc fortran static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index ccfc70342cb8..e63da81355ad 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -11,17 +11,24 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc fortran static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-REPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable fortran) \
-		$(use_with doc) \
-		$(use_enable static-libs static)
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }