commit: cbfcb703efba9f04509b250dd5cef4e22f7f000e Author: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org> AuthorDate: Tue Jul 29 13:12:26 2025 +0000 Commit: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org> CommitDate: Tue Jul 29 13:19:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbfcb703
sci-physics/fastjet: add 3.5.1 - Add --enable-monolithic because otherwise an empty libplugins fails CFLAGS QA checks - Drop unused inherit - Add missing call to fortran-2_pkg_setup - Add swig dependency and generate python interface (regenerate for tarballs) Part-of: https://github.com/gentoo/gentoo/pull/42542 Signed-off-by: Alexander Puck Neuwirth <apn-pucky <AT> gentoo.org> sci-physics/fastjet/Manifest | 1 + .../{fastjet-9999.ebuild => fastjet-3.5.1.ebuild} | 36 +++++++++++++--------- sci-physics/fastjet/fastjet-9999.ebuild | 36 +++++++++++++--------- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest index dd9023e15b4d..f90349fe0494 100644 --- a/sci-physics/fastjet/Manifest +++ b/sci-physics/fastjet/Manifest @@ -1,3 +1,4 @@ DIST fastjet-3.4.0.tar.gz 2959127 BLAKE2B c99e89ee5cea3fd4e3edebdfebb50efd3c58e7ab15215a384c44120ac930882bd2d4e446b61977fe65dcc49056b958c6510abb7c5889024ae49776b1955bd023 SHA512 af8aeb6197f6bd82ec5f127647f49cd5d455c20e614c23d928b850fc97bc12c70cf6e3b09f1bb0308c2a080fcd4fa13416eea0195695060efaa0e400a687d7b7 DIST fastjet-3.4.2.tar.gz 2973605 BLAKE2B f51b26fdb2611084679a79905c6da460edcf3ad3139bdb2384fe95600e474f4bdb028b24c43456e018c5fb9535491c929d1ec2032d184536efd6b2ef16d54ae1 SHA512 e7702699e67ba5af73f1fe931fe5f67b9f52bb2f0cfdc57dbacf408741e6271ed160503fe6142c92621287df49b441ce7562af589353b199fed09a4c4c839f3f DIST fastjet-3.4.3.tar.gz 2984798 BLAKE2B ba203a21c5658555606e4ed83fce4cb3dc0a077b0407c336255a7be2ea861a196d57c2f7db03dbd4dad946b8c68827d0d967b3c009d62232d39827342c7ae492 SHA512 9df7fb6ea1082473929d5963eb58c3d420557a2f52e793432f5bd838e8f7212d0a3c3606b98c3dfeeb3a76ffac73926cb7822aaf499d64a65b2cb2bb845fdb77 +DIST fastjet-3.5.1.tar.gz 3069022 BLAKE2B 031f833fc3b387ab44e76e0712001972708e2a477076095dc661ad16d42958df570d72a8786483bef2f13eecba4147104b301209d7428b77e41f6f8bbdcde98e SHA512 b5551eea8f9304e732c169227b0a8a005eb4c44534843e14e2270aef06aad56ba52fb42e5397120615b14f0edc34e825eb547b4e6ac578dcd9806d47e41fa3ca diff --git a/sci-physics/fastjet/fastjet-9999.ebuild b/sci-physics/fastjet/fastjet-3.5.1.ebuild similarity index 73% copy from sci-physics/fastjet/fastjet-9999.ebuild copy to sci-physics/fastjet/fastjet-3.5.1.ebuild index d1211e191d28..086e3352290e 100644 --- a/sci-physics/fastjet/fastjet-9999.ebuild +++ b/sci-physics/fastjet/fastjet-3.5.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 FORTRAN_NEEDED=plugins -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) DOCS_BUILDER="doxygen" DOCS_DEPEND=" media-gfx/graphviz @@ -12,7 +12,7 @@ DOCS_DEPEND=" virtual/latex-base " -inherit autotools docs flag-o-matic fortran-2 python-single-r1 +inherit autotools docs fortran-2 python-single-r1 DESCRIPTION="A software package for jet finding in pp and e+e- collisions" HOMEPAGE="https://fastjet.fr/"; @@ -34,7 +34,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND=" cgal? ( >=sci-mathematics/cgal-5.4:=[shared(+)] ) plugins? ( sci-physics/siscone:= ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + dev-lang/swig + ) " RDEPEND="${DEPEND}" BDEPEND="app-shells/bash" @@ -46,6 +49,7 @@ PATCHES=( pkg_setup() { use python && python-single-r1_pkg_setup + fortran-2_pkg_setup } src_prepare() { @@ -54,19 +58,21 @@ src_prepare() { } src_configure() { - use cgal && \ - has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp # only bash compatible - sed -i 's#/bin/sh#/bin/bash#g' ./configure || die - econf \ - $(use_enable cgal cgal-header-only) \ - $(use_enable plugins allplugins) \ - $(use_enable plugins allcxxplugins) \ - --enable-shared \ - --enable-static=no \ - --disable-static \ - --disable-auto-ptr \ - $(use_enable python pyext) + local -x CONFIG_SHELL="${BROOT}/bin/bash" + local myeconfargs=( + "$(use_enable cgal cgal-header-only)" + "$(use_enable plugins monolithic)" + "$(use_enable plugins allplugins)" + "$(use_enable plugins allcxxplugins)" + "--enable-shared" + "--enable-static=no" + "--disable-static" + "--disable-auto-ptr" + "$(use_enable python pyext)" + "$(use_enable python swig)" + ) + econf "${myeconfargs[@]}" } src_compile() { diff --git a/sci-physics/fastjet/fastjet-9999.ebuild b/sci-physics/fastjet/fastjet-9999.ebuild index d1211e191d28..086e3352290e 100644 --- a/sci-physics/fastjet/fastjet-9999.ebuild +++ b/sci-physics/fastjet/fastjet-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 FORTRAN_NEEDED=plugins -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) DOCS_BUILDER="doxygen" DOCS_DEPEND=" media-gfx/graphviz @@ -12,7 +12,7 @@ DOCS_DEPEND=" virtual/latex-base " -inherit autotools docs flag-o-matic fortran-2 python-single-r1 +inherit autotools docs fortran-2 python-single-r1 DESCRIPTION="A software package for jet finding in pp and e+e- collisions" HOMEPAGE="https://fastjet.fr/"; @@ -34,7 +34,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND=" cgal? ( >=sci-mathematics/cgal-5.4:=[shared(+)] ) plugins? ( sci-physics/siscone:= ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + dev-lang/swig + ) " RDEPEND="${DEPEND}" BDEPEND="app-shells/bash" @@ -46,6 +49,7 @@ PATCHES=( pkg_setup() { use python && python-single-r1_pkg_setup + fortran-2_pkg_setup } src_prepare() { @@ -54,19 +58,21 @@ src_prepare() { } src_configure() { - use cgal && \ - has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp # only bash compatible - sed -i 's#/bin/sh#/bin/bash#g' ./configure || die - econf \ - $(use_enable cgal cgal-header-only) \ - $(use_enable plugins allplugins) \ - $(use_enable plugins allcxxplugins) \ - --enable-shared \ - --enable-static=no \ - --disable-static \ - --disable-auto-ptr \ - $(use_enable python pyext) + local -x CONFIG_SHELL="${BROOT}/bin/bash" + local myeconfargs=( + "$(use_enable cgal cgal-header-only)" + "$(use_enable plugins monolithic)" + "$(use_enable plugins allplugins)" + "$(use_enable plugins allcxxplugins)" + "--enable-shared" + "--enable-static=no" + "--disable-static" + "--disable-auto-ptr" + "$(use_enable python pyext)" + "$(use_enable python swig)" + ) + econf "${myeconfargs[@]}" } src_compile() {
