From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32E96138359 for ; Fri, 18 Sep 2020 16:47:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4972FE082D; Fri, 18 Sep 2020 16:47:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F191E0815 for ; Fri, 18 Sep 2020 16:47:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EBCA341089 for ; Fri, 18 Sep 2020 16:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9837361 for ; Fri, 18 Sep 2020 16:47:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1600446074.4a1cc44e67e78a4d2f507e585df4deea4a91cb81.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/mumps/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/mumps/mumps-5.1.2-r1.ebuild sci-libs/mumps/mumps-5.1.2.ebuild X-VCS-Directories: sci-libs/mumps/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a1cc44e67e78a4d2f507e585df4deea4a91cb81 X-VCS-Branch: master Date: Fri, 18 Sep 2020 16:47:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fb627f2-d32b-4c79-b9b1-e117e4d33593 X-Archives-Hash: 3529db2414638db692c642559abbe868 commit: 4a1cc44e67e78a4d2f507e585df4deea4a91cb81 Author: Bernd Waibel gmail com> AuthorDate: Sun Sep 15 16:18:51 2019 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 18 16:21:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1cc44e sci-libs/mumps: update scotch dependency - Use >=sci-libs/scotch-6.0.1 for mumps as recommended by upstream - Re-order inherits - Bump to EAPI 7 - Fix missing / after ${EROOT} Closes: https://bugs.gentoo.org/670759 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Bernd Waibel gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12936 Signed-off-by: Sam James gentoo.org> .../{mumps-5.1.2.ebuild => mumps-5.1.2-r1.ebuild} | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2-r1.ebuild similarity index 90% rename from sci-libs/mumps/mumps-5.1.2.ebuild rename to sci-libs/mumps/mumps-5.1.2-r1.ebuild index 477d6dbaeef..be2c5c64986 100644 --- a/sci-libs/mumps/mumps-5.1.2.ebuild +++ b/sci-libs/mumps/mumps-5.1.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib +inherit flag-o-matic fortran-2 toolchain-funcs multilib MYP=MUMPS_${PV} @@ -20,18 +20,23 @@ RDEPEND=" virtual/blas metis? ( || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 ) mpi? ( >=sci-libs/parmetis-4 ) ) - scotch? ( =sci-libs/scotch-6.0.1[mpi=] ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MYP}" +get_version_component_count() { + local cnt=( $(ver_rs 1- ' ') ) + echo ${#cnt[@]} +} + static_to_shared() { local libstatic=${1}; shift local libname=$(basename ${libstatic%.a}) - local soname=${libname}$(get_libname $(get_version_component_range 1-2)) + local soname=${libname}$(get_libname $(ver_cut 1-2)) local libdir=$(dirname ${libstatic}) einfo "Making ${soname} from ${libstatic}" @@ -46,7 +51,7 @@ static_to_shared() { -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \ "$@" -o ${libdir}/${soname} || die "${soname} failed" [[ $(get_version_component_count) -gt 1 ]] && \ - ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version)) + ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) ln -s ${soname} ${libdir}/${libname}$(get_libname) fi } @@ -90,14 +95,14 @@ src_configure() { if use scotch && use mpi; then sed -i \ -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \ - -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \ + -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}/usr/include/scotch:" \ Makefile.inc || die LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr" ord="${ord} -Dptscotch" elif use scotch; then sed -i \ -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \ - -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \ + -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}/usr/include/scotch:" \ Makefile.inc || die LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr" ord="${ord} -Dscotch"