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 DA69713933E for ; Wed, 21 Jul 2021 15:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2304E09C4; Wed, 21 Jul 2021 15:56:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 C7544E09C4 for ; Wed, 21 Jul 2021 15:56:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7FDDE342A84 for ; Wed, 21 Jul 2021 15:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEE965C4 for ; Wed, 21 Jul 2021 15:56:01 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1626882817.62e67cad5e675b2c7f492d1f4507555d3fa9f997.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/charm/charm-6.8.2.ebuild X-VCS-Directories: sys-cluster/charm/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 62e67cad5e675b2c7f492d1f4507555d3fa9f997 X-VCS-Branch: master Date: Wed, 21 Jul 2021 15:56:01 +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: 7a7e88d5-f713-4dcf-91a3-a1de7b0be2fb X-Archives-Hash: 5b91e91f80148f8390ebd01faead80b4 commit: 62e67cad5e675b2c7f492d1f4507555d3fa9f997 Author: Marek Szuba gentoo org> AuthorDate: Wed Jul 21 15:49:56 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Jul 21 15:53:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e67cad sys-cluster/charm: update EAPI 5 -> 8 Fails to compile for exactly the same reason as the EAPI-5 variant (Bug #782622). Signed-off-by: Marek Szuba gentoo.org> sys-cluster/charm/charm-6.8.2.ebuild | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild index c11f5157ca9..1ff82273b8c 100644 --- a/sys-cluster/charm/charm-6.8.2.ebuild +++ b/sys-cluster/charm/charm-6.8.2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 FORTRAN_STANDARD="90" -inherit epatch flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs +inherit flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs DESCRIPTION="Message-passing parallel language and runtime system" HOMEPAGE="http://charm.cs.uiuc.edu/" @@ -19,9 +19,8 @@ IUSE="charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi nu RDEPEND="mpi? ( virtual/mpi )" DEPEND=" ${RDEPEND} - net-libs/libtirpc - virtual/pkgconfig -" + net-libs/libtirpc" +BDEPEND="virtual/pkgconfig" REQUIRED_USE=" cmkopt? ( !charmdebug !charmtracing ) @@ -98,6 +97,8 @@ src_prepare() { # Fix QA notice. Filed report with upstream. append-cflags -DALLOCA_H + + eapply_user } src_compile() { @@ -124,7 +125,7 @@ src_install() { # Make charmc play well with gentoo before we move it into /usr/bin. This # patch cannot be applied during src_prepare() because the charmc wrapper # is used during building. - epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" + eapply "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" sed -e "s|gentoo-include|${P}|" \ -e "s|gentoo-libdir|$(get_libdir)|g" \ @@ -160,12 +161,9 @@ src_install() { i=$(readlink -e "${i}") || die fi [[ -s $i ]] || continue - [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" + [[ ${i} = *.so ]] && dolib.so "${i}" || dolib.a "${i}" done - # Basic docs. - dodoc CHANGES README - # Install examples. if use examples; then find examples/ -name 'Makefile' | xargs sed \ @@ -174,8 +172,8 @@ src_install() { find examples/ -name 'Makefile' | xargs sed \ -r "s:./charmrun:./charmrun ++local:" -i || \ die "Failed to fix examples" - insinto /usr/share/doc/${PF}/examples - doins -r examples/charm++/* + docinto examples + dodoc -r examples/charm++/* docompress -x /usr/share/doc/${PF}/examples fi }