From e2dc7fd1247f2d3dcef0fe03ce7bab11a7bf4657 Mon Sep 17 00:00:00 2001 From: Alexander Puck Neuwirth Date: Wed, 26 Feb 2025 11:46:48 +0100 Subject: [PATCH] sci-physics/fastjet-contrib: add 1.101 Signed-off-by: Alexander Puck Neuwirth Closes: https://github.com/gentoo/gentoo/pull/40768 Signed-off-by: Nowa Ammerlaan --- sci-physics/fastjet-contrib/Manifest | 1 + .../fastjet-contrib-1.101.ebuild | 54 +++++++++++++++++++ .../fastjet-contrib-9999.ebuild | 1 + .../files/fastjet-contrib-1.101-ldflags.patch | 11 ++++ 4 files changed, 67 insertions(+) create mode 100644 sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild create mode 100644 sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest index 9e51883dec5fa..ea35b4a8df6f0 100644 --- a/sci-physics/fastjet-contrib/Manifest +++ b/sci-physics/fastjet-contrib/Manifest @@ -1,3 +1,4 @@ DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96 SHA512 b8888d30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960 SHA512 2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce SHA512 b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95 +DIST fastjet-contrib-1.101.tar.gz 1096239 BLAKE2B 69790facda1e623d1f1ad0f1701f0c0e1aba462c34e83d1164f541c0f5cdbc2577f8d962345ec30f730315f332cc5ab7206f968088153973d2ab05498926b8f6 SHA512 68d2d438a4b4aefd9ea040412bc40b117feac40ed43c3d35f86047bf85f23847a5153da46c6fc3631d46f0c90f5f14a965963f64dd5299e8e0e3a080e714a316 diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild new file mode 100644 index 0000000000000..3d8439f18a9d4 --- /dev/null +++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild @@ -0,0 +1,54 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PN=fjcontrib +MY_P=${MY_PN}-${PV} + +DESCRIPTION="3rd party extensions of FastJet." +HOMEPAGE="https://fastjet.hepforge.org/contrib/" +SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=">=sci-physics/fastjet-3.4.1" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.049-ar.patch + "${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3 + "${FILESDIR}"/${PN}-1.101-ldflags.patch +) + +src_configure() { + tc-export CXX AR RANLIB + ./configure \ + --prefix="${ESYSROOT}/usr" \ + --fastjet-config="${ESYSROOT}/usr/bin/fastjet-config" \ + RANLIB="${RANLIB}" \ + AR="${AR}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + FFLAGS="${FFLAGS}" \ + LDFLAGS="${LDFLAGS}" || die +} + +src_compile() { + emake + emake fragile-shared +} + +src_install() { + emake install PREFIX="${ED}/usr" + dolib.so libfastjetcontribfragile.so + # The name used for requesting this library varies + dosym libfastjetcontribfragile.so /usr/$(get_libdir)/libfastjetcontribfragile.so.0 + dosym libfastjetcontribfragile.so /usr/$(get_libdir)/fastjetcontribfragile.so.0 +} diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild index d97361a5c0bcb..2d3ba90325ed2 100644 --- a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild +++ b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild @@ -22,6 +22,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.049-ar.patch "${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3 + "${FILESDIR}"/${PN}-1.101-ldflags.patch ) src_unpack() { diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch new file mode 100644 index 0000000000000..7f8d572ce4ed0 --- /dev/null +++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -66,7 +66,7 @@ + + fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@ + libfastjetcontribfragile.@DYNLIBEXT@: $(fragile_SHARED_SRC_LIST) +- $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_INCLUDES) $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@ ++ $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) $(LDFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_INCLUDES) $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@ + + fragile-shared-install: fragile-shared + utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ $(PREFIX)/lib