gentoo resync : 25.08.2020

3 files changed, 12 insertions, 36 deletions

diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 708282c2d72d..5aa5b0e61a39 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,3 @@
-DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.3.1.ebuild 700 BLAKE2B 8426dc0e2c549807b159e0822b7574a9a12ae9ff5a52a1ce45985a6c3446b25ec45011404f1e02262b2c54f1d0c117e8002b8bdd24c44bfebb7403d00cd026da SHA512 eecedd765217b255f7301302ffc6115f0925f76244b433d3765a5feca8f1f5e96af80adc9d6f1f25fd7d2a8f6d254d6e8db301fe6c3ddedeed99a1713018510c
-EBUILD camd-2.4.6.ebuild 667 BLAKE2B 33ee7075498fd4c7c84ad09388a973b9ed02d4555d3d5dac7a38de9bb6a5a72a9739aba7a981c42ca689cf89d7c3bc9131a782ce7b41efbcebd48f58795bdd3e SHA512 852291d6bd31990419a8a13a3d1b331312fc8e1a711d074a0e69e6e3ba9a6ce3060fe9b3d457fc78dae4a0c4218a65795c997d9bcc703299e3cd34a6508d367c
+EBUILD camd-2.4.6.ebuild 728 BLAKE2B 7b81c500ff5353cc46d899d60875419380cbb802374d8b2baef0406f55b3f66bc4584b3e1949218fd60e5fdb5874e03a5960ad72cec987d687f874f9cdcd72bb SHA512 26506b332fcb761bfb50c5bc4cc7e0515e2fd13524254687f63b2ec303366b29bb02f2dbd72d9bb1aa2ff20b95ad65b9e32fc115b0c27eabea1767e289f06b44
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.3.1.ebuild b/sci-libs/camd/camd-2.3.1.ebuild
deleted file mode 100644
index c42e1b578dcd..000000000000
--- a/sci-libs/camd/camd-2.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd/"
-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 static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 88bf2cf3cb77..81a19dcab527 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -9,9 +9,8 @@ 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 static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
@@ -20,6 +19,13 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
-		$(use_with doc) \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }