gentoo resync : 25.08.2020

3 files changed, 10 insertions, 27 deletions

diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index fa210259d394..1a7ae88b15e4 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,5 +1,3 @@
-DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.8.0.ebuild 576 BLAKE2B e594eab1a608c513c2cf32270f4e4011520562610a3064460dfd771b09266ceaa15c95bb727eeef5a9e12577c74c5a2f900a4a92e2cab000f84f6b6a1c79ac23 SHA512 3f0e57a9837be8c4e44e3a07ed507a176a9672e3eca944b14573ad0cd9698b55cb05ba7e2ebdc981f6a9fdf5c5fa93ef667b0de12a743323bbc590d958ff95ed
-EBUILD ccolamd-2.9.6.ebuild 603 BLAKE2B 9cc4344db9c02f4497fd573cf8d0ba94096d5a6b53365612b1ebc2e2375d6b9173a25de02feb7cc713bcde0386e4b978ae49120bf1f3d14ba009b7567332ff4a SHA512 ef4dcba98465e40ffb28e52ea55a4b3882da1c53ec5af724211c4a2d5bbcbe58b5baf9488241385310431290bfd9b83da96d8a1fd66ad09290f76b3345447a56
+EBUILD ccolamd-2.9.6.ebuild 657 BLAKE2B 4c90822b5d78b431748dcf50590e6f3a682f9029048e9705b48d563497a3ad0534b2524cfc2e93e10eca53d047e76868e5ece49d31ce92fe1500a1776f51ac62 SHA512 9f10d4c7edd82dfc2b4b248393f149a65593d35d9b63b4886eac1d610e0ebc7899f663cdbfde217943d9280ac49b1825da46a075f7d5cab3f69fff0489cc6e04
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
deleted file mode 100644
index ec74688df75f..000000000000
--- a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ccolamd/"
-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="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 1a280d3e0c9c..e86d7e510aa6 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,14 +9,19 @@ 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="static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }