From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 18 Dec 2020 11:06:49 +0000
Subject: gentoo resync : 18.12.2020

---
 sci-libs/colpack/Manifest              |  2 +-
 sci-libs/colpack/colpack-1.0.10.ebuild | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'sci-libs/colpack')

diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 576565d81d2f..23a7ff25cc8c 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 1103 BLAKE2B ef32cbd7d52cfc688748f5d14a5a296a4e5766f6d585abb1a1970e6c76ab15bbcf2e9a30203604cf69a2045aab9e61d81eaf31a2785a4edd7f9797933f465c18 SHA512 c9c3da1c54e29a6c6b1d1953a2372ac5eeb4e2fb1129fc8ba0521178918abf468b3788dfad56529fe9afb5491f3bf9ae7aee98904e3a5f45bce51b75ee8ce1c6
+EBUILD colpack-1.0.10.ebuild 958 BLAKE2B e34413307614e6d549acafc44630ad6c791b34fb55474d513912735753accb733819346436707305ee3519cb664cd01096c873efd05892fb4d0e740fa40f6bb4 SHA512 ad5cdca234c0de46707099144be187105cd5d87c012dbdeadb4dc3123f2b97f1f9346d932074e36c3692191b0b07949e15fe3a6d355ad78fce31ceb8cab4e932
 MISC metadata.xml 605 BLAKE2B c7dd1378bd62eeaf69648625deda27806662c0f2fa83112fcc757925412c3d1d2ce218d64be2ad98dc54088618ff874d6a4e7f266e5fc006e98e257d757f4190 SHA512 28e191bbb72a212832b13ad84064538a884835b1f3e4f8e50d4b247b17189a12fa1de32138a675ab1e9fed58b40101c50d2e4472c554cf25f6f919f24059c17b
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 9ba8c09a081b..b432192067c6 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -1,31 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune toolchain-funcs
+inherit autotools toolchain-funcs
 
 MYPN="ColPack"
 
 DESCRIPTION="C++ algorithms for specialized vertex coloring problems"
-LICENSE="GPL-3 LGPL-3"
 HOMEPAGE="http://cscapes.cs.purdue.edu/coloringpage/"
 SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-IUSE="openmp static-libs"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
+IUSE="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] &&	! tc-has-openmp; then
-		ewarn "You are using gcc without OpenMP"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -36,13 +34,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable openmp)
 }
 
 src_install() {
 	default
 	rm -rf "${ED}"/usr/examples
-	use static-libs || prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3