gentoo auto-resync : 20:02:2023 - 02:17:29

4 files changed, 58 insertions, 0 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index bff4b0cf5fda..9569451bb872 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
index 13c8b4a2325a..c8f52ea4c4f9 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,5 +1,7 @@
 AUX fastjet-contrib-1.049-ar.patch 5345 BLAKE2B d372187f781da47b128c5cdde8909da4c5b1db7ffb3dede72248db9238efd7e399c292a6a2f7d93d879da1120b9ec860076ee3402ed02f6bf7b002e4c962f01a SHA512 12ba683b4f302b2563d036949161a55c3efd759e27519b757f257f5797d48b6a11c34084580b3669988d393c04574ab1f22af0e2ceb4b92d3499fc53831512e5
+AUX fastjet-contrib-1.049-musl.patch 416 BLAKE2B f781792afa8e5c7a979225c649df00e10d720d9576a53d68bbb359371cd035776a80a34f405d76707254ec2202c5cda557839e1dbe5478aba3464eee35f2fd7e SHA512 d17b3273ba09a4be6c15f451ec9b8bffb028115ba9e67c6a61b505a31ae2577ee2038c40d57e6b986b0b2f433c9e2eb623cea1f600147e5af7c3831a8b85e4a7
 AUX fastjet-contrib-1.049-soname.patch 667 BLAKE2B 14fd4ad56300414fc13b4ddd89e59ee064f1531e2217e0c5ca35e6a1567f9c18e88c8f06104dd0a3f28486fa86ecd3ebf495520f57d0fc12b0934e1004b4b2bb SHA512 5dd0999f6847f6bfdeabb0432bfe639f5f5d42171e21711959fe6155f73ec3e2dd6cdc2156345ba3cec2534f48c9977337372d15a04ab1e86697dbd7affb9fdd
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f SHA512 21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6
 EBUILD fastjet-contrib-1.049-r1.ebuild 1140 BLAKE2B 92961a7f96b6160647aa950e9f42d1543e307a017308b5692c971e42f69fc781c8bb005f8dbae1dddac7dfb2478160e82356bd82bbe03fb01ae2f4df3ff35eaa SHA512 9ee911ed8c7acd3f33ca9997948bea8ae2446080b726d31cca83d9c2bb18a631cf80e5d3098dc0ce9053f1dd0a82eca91377bc05474d93283abd2bde09800f60
+EBUILD fastjet-contrib-1.049-r2.ebuild 1176 BLAKE2B a1dff8e3cf2b57a58ea07abf421f5e14b78ee1f46b1ba6893820af9e7a7a99ec0c1fa270b53782134cbc5f4c1359f7282c243dc983bbd31e8338900ff2ffa3e8 SHA512 9d0f628b55a4756219c6381d1816c42fc4382bd9a80fa2a4a600d82b2e58f381b32b561de4f2ed07360253431406b5d53ab01fc2a1a3eb7476bb319d39b7220a
 MISC metadata.xml 702 BLAKE2B 14570ef3a3740d253725da436f3b496c479288aaa7c32c3e6fe16339f13b58d91b067a00e482b1ede080c5a1f735bdee9ce80ea3c234878caa5bc60a2cf65f03 SHA512 dc1e158453b8517eea9c2dc95f4caf5f6352498b6cbce29cd0d6f207548e877403a6a21471b69db48813a2cb327b172865e49c813ea3b6b0780f8ada6465a3c0
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
new file mode 100644
index 000000000000..e21a08bc6b6b
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-soname.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_configure() {
+	tc-export CXX AR RANLIB
+	./configure --prefix=/usr --fastjet-config=/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/files/fastjet-contrib-1.049-musl.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
new file mode 100644
index 000000000000..880e145ba060
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
@@ -0,0 +1,11 @@
+--- a/LundPlane/example_dpsi_slice.cc
++++ b/LundPlane/example_dpsi_slice.cc
+@@ -124,7 +124,7 @@
+ 
+   int index_of_max_kt_secondary = -1;
+   double dpsi;
+-  for (uint i_secondary=0; i_secondary<secondaries.size(); i_secondary++) {
++  for (unsigned int i_secondary=0; i_secondary<secondaries.size(); i_secondary++) {
+     if (secondaries[i_secondary]->z() > z2_cut) {
+ 
+       index_of_max_kt_secondary = i_secondary;