gentoo auto-resync : 22:10:2024 - 04:04:46

6 files changed, 22 insertions, 4 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 6d84e821437d..c5314f6da4f9 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 a0f2b1b79f45..7327269878af 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,10 +1,11 @@
 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
+AUX fastjet-contrib-1.049-soname.patch 659 BLAKE2B 77fec5f2b470162550a5608b0e0926a4139609b318c0fd5707e34a202e5d0975aedf4903ff60f4abfad6ff809ec7f468a154e43db65652ebabd738f7f5580818 SHA512 cb27f944edb21c0c2ad9537f2c6076632e7604e6c88dc1ffa834543d63a7935fa4a984131708587f6f6cd02b9a29972c0638feda76e144a27389e1a2e73b8420
+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
 EBUILD fastjet-contrib-1.053.ebuild 1269 BLAKE2B 634dd077c79c50d0aec03936fe44946da5f754a6fe0679059e066fbb557f54367fa7161831e55e898eef155223719d792ebd9fc2423cd5b9a461166add8988ca SHA512 77fec427d37fdd693885672917ea0f03b3935159f16594ff457538c66dd0a7f68183cc1bf36435998ff7ec9367549813690d1d459be791ba5978a15f1f60251d
-EBUILD fastjet-contrib-1.055.ebuild 1231 BLAKE2B 87b08312fb95cabd7e2f9bcdc1410d4197112b4a415aa924cf6e2f603a73c0b65ec4d5abb54527bc0b90153c1783506eaab761025dbd3b9fe90ded035e08192b SHA512 4709d60facdc12836a9c6a6d0fb5d854161c638adb766fe6000030cfa5469ba288abaa925ed1a423f6d67a2edd48b6bd5bb7ec724e4c328db57cb39080f7fc2b
-MISC metadata.xml 702 BLAKE2B 14570ef3a3740d253725da436f3b496c479288aaa7c32c3e6fe16339f13b58d91b067a00e482b1ede080c5a1f735bdee9ce80ea3c234878caa5bc60a2cf65f03 SHA512 dc1e158453b8517eea9c2dc95f4caf5f6352498b6cbce29cd0d6f207548e877403a6a21471b69db48813a2cb327b172865e49c813ea3b6b0780f8ada6465a3c0
+EBUILD fastjet-contrib-1.055.ebuild 1323 BLAKE2B a2c37af8e46ca1bc65968e1b51c9a5d2ea85600daab1535cf24c96933388e0b834d328ea197db0666e38d635b4fb7a7a13cf96656fa958e26da6f401721fe10a SHA512 0134e9d34a33eac9ada3e0221e6980ca92415ba1c55e10ed5d595f03dde5afae85fec131197e42e972a5a0366990aef27106588f2aa97800b082d1a55a126d49
+MISC metadata.xml 786 BLAKE2B 360809c0712d8499713b0448e3838843bbd7040487dd6e4c7a637f5ea0a487abe5b6723af5fb956ad169694b5362eff03302f3aba52f288c07371b1fff58adba SHA512 ab51afaf39009e6e0ac910e5ecc0dda1a329befc8fbfbb09b1f730a700f4817fb18c3a7466ef7e6cd419abf1378d96d5350277ffbc8cf0e77ce9171024c319df
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
index f48a5b1a4594..c337473684b1 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.049-soname.patch
 	"${FILESDIR}"/${PN}-1.049-ar.patch
+	"${FILESDIR}"/${PN}-1.055-ar-part2.patch # https://github.com/fjcontrib/fjcontrib/issues/3
 )
 
 src_configure() {
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
index fe3794d5e0f5..df8fd8d51bc9 100644
--- a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -5,7 +5,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_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
-+	$(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,-Ol -Wl,--as-needed -Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
++	$(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,--as-needed -Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
  
  fragile-shared-install: fragile-shared
  	utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ $(PREFIX)/lib
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch
new file mode 100644
index 000000000000..2bfb63960c6b
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch
@@ -0,0 +1,13 @@
+--- a/SignalFreeBackgroundEstimator/Makefile
++++ b/SignalFreeBackgroundEstimator/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
diff --git a/sci-physics/fastjet-contrib/metadata.xml b/sci-physics/fastjet-contrib/metadata.xml
index ae55524d0200..dba86d876d40 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -16,4 +16,7 @@
 	<longdescription lang="en">
 	The fastjet-contrib space is intended to provide a common location for access to 3rd party extensions of FastJet.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">fjcontrib/fjcontrib</remote-id>
+	</upstream>
 </pkgmetadata>