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 E5EAD1382C5 for ; Sat, 20 Mar 2021 12:12:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 433DEE0830; Sat, 20 Mar 2021 12:12:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2869AE0830 for ; Sat, 20 Mar 2021 12:12:49 +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 14680335D35 for ; Sat, 20 Mar 2021 12:12:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6057E46C for ; Sat, 20 Mar 2021 12:12:46 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1616242350.836a2916760428bd6c9649f6f8559ecd42b35da7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/fastjet/fastjet-3.0.6-r1.ebuild X-VCS-Directories: sci-physics/fastjet/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 836a2916760428bd6c9649f6f8559ecd42b35da7 X-VCS-Branch: master Date: Sat, 20 Mar 2021 12:12:46 +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: 489588c1-666b-4f6f-b18c-d12559d68464 X-Archives-Hash: 5244c54ef4e5c67c27660b40045b25d1 commit: 836a2916760428bd6c9649f6f8559ecd42b35da7 Author: David Seifert gentoo org> AuthorDate: Sat Mar 20 12:12:30 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Mar 20 12:12:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836a2916 sci-physics/fastjet: Port to EAPI 7 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> sci-physics/fastjet/fastjet-3.0.6-r1.ebuild | 56 +++++++++++++++++------------ 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild index a7fec572825..b5cfe12ace3 100644 --- a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild +++ b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 FORTRAN_NEEDED=plugins -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils fortran-2 flag-o-matic +inherit autotools flag-o-matic fortran-2 DESCRIPTION="Fast implementation of several recombination jet algorithms" HOMEPAGE="http://www.fastjet.fr/" @@ -15,40 +14,53 @@ SRC_URI="http://www.fastjet.fr/repo/${P}.tar.gz" LICENSE="GPL-2 QPL" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cgal doc examples +plugins static-libs" +IUSE="cgal doc examples +plugins" -RDEPEND="cgal? ( sci-mathematics/cgal )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - plugins? ( sci-physics/siscone:0= )" +RDEPEND=" + cgal? ( sci-mathematics/cgal:= ) + plugins? ( sci-physics/siscone:= )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen[dot] )" PATCHES=( "${FILESDIR}"/${P}-system-siscone.patch ) +src_prepare() { + default + eautoreconf +} + src_configure() { use cgal && \ - has_version sci-mathematics/cgal[gmp] && append-ldflags -lgmp - local myeconfargs=( - $(use_enable cgal) - $(use_enable plugins allplugins) + has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp + + econf \ + --disable-static \ + $(use_enable cgal) \ + $(use_enable plugins allplugins) \ $(use_enable plugins allcxxplugins) - ) - autotools-utils_src_configure } src_compile() { - autotools-utils_src_compile + default + if use doc; then doxygen Doxyfile || die + HTML_DOCS=( html/. ) fi } src_install() { - autotools-utils_src_install - use doc && dohtml -r html/* + default + if use examples; then - insinto /usr/share/doc/${PF} - find example \ - -name Makefile -or Makefile.in -or Makefile.am -delete - doins -r example/* + emake -C example maintainer-clean + find example -iname 'makefile*' -delete || die + + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples fi + + # no static archives + find "${ED}" -name '*.la' -delete || die }