gentoo auto-resync : 07:02:2025 - 00:11:15

3 files changed, 79 insertions, 9 deletions

diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
index 7327269878af..7973e64e7cfa 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -4,8 +4,9 @@ AUX fastjet-contrib-1.049-soname.patch 659 BLAKE2B 77fec5f2b470162550a5608b0e092
 AUX fastjet-contrib-1.055-ar-part2.patch 313 BLAKE2B 22e195593d004d198f3e5d1d47b1d4a705c7ef80812b2f0998487f76c79f161923577699904174574eccd46b90062e9c421ac7b12cc361cf8cf163160666866b SHA512 f44a5a932a6321f0c539e227481b38a1712a4308659870eb13cd3088c8c5e4b627afb1b4b16f7e65f80163a76e308ed6c7f56e671d112f7703a4dfd21c9aa7b8
 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 fjcontrib-1.049.tar.gz 850931 BLAKE2B ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f SHA512 21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6
-EBUILD fastjet-contrib-1.049-r2.ebuild 1176 BLAKE2B a1dff8e3cf2b57a58ea07abf421f5e14b78ee1f46b1ba6893820af9e7a7a99ec0c1fa270b53782134cbc5f4c1359f7282c243dc983bbd31e8338900ff2ffa3e8 SHA512 9d0f628b55a4756219c6381d1816c42fc4382bd9a80fa2a4a600d82b2e58f381b32b561de4f2ed07360253431406b5d53ab01fc2a1a3eb7476bb319d39b7220a
+DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce SHA512 b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95
 EBUILD fastjet-contrib-1.053.ebuild 1269 BLAKE2B 634dd077c79c50d0aec03936fe44946da5f754a6fe0679059e066fbb557f54367fa7161831e55e898eef155223719d792ebd9fc2423cd5b9a461166add8988ca SHA512 77fec427d37fdd693885672917ea0f03b3935159f16594ff457538c66dd0a7f68183cc1bf36435998ff7ec9367549813690d1d459be791ba5978a15f1f60251d
 EBUILD fastjet-contrib-1.055.ebuild 1323 BLAKE2B a2c37af8e46ca1bc65968e1b51c9a5d2ea85600daab1535cf24c96933388e0b834d328ea197db0666e38d635b4fb7a7a13cf96656fa958e26da6f401721fe10a SHA512 0134e9d34a33eac9ada3e0221e6980ca92415ba1c55e10ed5d595f03dde5afae85fec131197e42e972a5a0366990aef27106588f2aa97800b082d1a55a126d49
+EBUILD fastjet-contrib-1.100.ebuild 1283 BLAKE2B 5db5bab61582f178596f8134437879535e893a2471dd2ca5143eef6d8ef119ae363153d5818b3b981f5e8f33e22c491bd248945793c4efbba467d76ce63f0a30 SHA512 b2f5c3104c8c4ab4bdbe371358d5e06fcea06656495524b76351b5c5595f7618d2d1e6ce6c966c0807930346dcf9ad3821705b3cd549f5f809677588d7830ac5
+EBUILD fastjet-contrib-9999.ebuild 1590 BLAKE2B 05fad5b76df67b1848e4947dcd3a575bbed35e6d7e996b777df192c962b53b4c07f22255a1607635efc080024532660574c27d6f0307a47d078df5954cf33382 SHA512 84162beaa3c021366545e6a26c03e8e7ad7df170c0f24b9a2762bf169d5f4ccf7c92485dc88a45af1bf03a51001a680c7b77064f226ce9cc24ffb453005f78e1
 MISC metadata.xml 786 BLAKE2B 360809c0712d8499713b0448e3838843bbd7040487dd6e4c7a637f5ea0a487abe5b6723af5fb956ad169694b5362eff03302f3aba52f288c07371b1fff58adba SHA512 ab51afaf39009e6e0ac910e5ecc0dda1a329befc8fbfbb09b1f730a700f4817fb18c3a7466ef7e6cd419abf1378d96d5350277ffbc8cf0e77ce9171024c319df
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
index e21a08bc6b6b..516a6334c1bd 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,25 +10,33 @@ 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"
+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.0"
+DEPEND=">=sci-physics/fastjet-3.4.1"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-soname.patch
-	"${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${PN}-1.049-ar.patch
+	"${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3
 )
 
 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
+	./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() {
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
new file mode 100644
index 000000000000..d97361a5c0bc
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit subversion toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/"
+ESVN_REPO_URI="https://svn.hepforge.org/fastjetsvn/contrib/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+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
+)
+
+src_unpack() {
+	subversion_src_unpack
+	subversion_wc_info || die "subversion_wc_info fails."
+	# We need the .svn folder for fetching contributions => copy it
+	rsync -rlpgo "${ESVN_WC_PATH}/.svn" "${S}" || die "can't copy .svn."
+	cd "${S}" || die "svn should have created ${S}."
+	./scripts/update-contribs.sh || die "can't fetch contributions"
+}
+
+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
+}