gentoo auto-resync : 26:08:2022 - 14:52:16

5 files changed, 265 insertions, 11 deletions

diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
index 65c5c57cf701..13c8b4a2325a 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,4 +1,5 @@
-AUX fastjet-contrib-1.049-soname.patch 772 BLAKE2B 88c50c5f425aba7d4eaf760def43baa145d15c550a3e857b70b3a98d0796e2a2f912e7ac652ae559fcf26ddb67013df392851398f92eb2b8362cbf84ebb8dae3 SHA512 715c269c80421baa682b2eda604ff60e21cf08a754ba8051dd684f9c846e444f57735f98102582ee81d975294b7f5873d265e4c8951dade91c5817f065970bef
+AUX fastjet-contrib-1.049-ar.patch 5345 BLAKE2B d372187f781da47b128c5cdde8909da4c5b1db7ffb3dede72248db9238efd7e399c292a6a2f7d93d879da1120b9ec860076ee3402ed02f6bf7b002e4c962f01a SHA512 12ba683b4f302b2563d036949161a55c3efd759e27519b757f257f5797d48b6a11c34084580b3669988d393c04574ab1f22af0e2ceb4b92d3499fc53831512e5
+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.ebuild 1072 BLAKE2B 181c61cc4da8f1435cb91b5fd442404af996fe8f994e3e113148ae770ed9e30664a6deaeaf325ca80998b272144f05c2b1f961f961a454440f24f55d367fc8cc SHA512 7f5a9064856de9f5c1177cbfa345dec171971d38a7d5dc88d23d77e50b072f27d7bff59df5cc2fd993f313d886c6289d4f3763bcb26fe1e60c4f835206398285
-MISC metadata.xml 540 BLAKE2B 8e945d39f95e0a19d18d7dcfc6fd8993bfa33b579dbbd95ec0b1edca68a0fd821c0bacb93a9d66133ed48447c2d740ab71b54cfadd856c2d34820e878fb4a527 SHA512 c5f54be55050cc9f675c32262363399d83dbe82f7b4b8f6c01d3f099b40dfee50cae56af5bf49bb8061d0711b9ae706f79f90776e07d37a91698c21990567144
+EBUILD fastjet-contrib-1.049-r1.ebuild 1140 BLAKE2B 92961a7f96b6160647aa950e9f42d1543e307a017308b5692c971e42f69fc781c8bb005f8dbae1dddac7dfb2478160e82356bd82bbe03fb01ae2f4df3ff35eaa SHA512 9ee911ed8c7acd3f33ca9997948bea8ae2446080b726d31cca83d9c2bb18a631cf80e5d3098dc0ce9053f1dd0a82eca91377bc05474d93283abd2bde09800f60
+MISC metadata.xml 702 BLAKE2B 14570ef3a3740d253725da436f3b496c479288aaa7c32c3e6fe16339f13b58d91b067a00e482b1ede080c5a1f735bdee9ce80ea3c234878caa5bc60a2cf65f03 SHA512 dc1e158453b8517eea9c2dc95f4caf5f6352498b6cbce29cd0d6f207548e877403a6a21471b69db48813a2cb327b172865e49c813ea3b6b0780f8ada6465a3c0
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
index cf942ac11e58..5327d49c484d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
@@ -22,12 +22,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-soname.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_configure() {
-	CXX=`tc-getCXX`
-	./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	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
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
new file mode 100644
index 000000000000..b7578bd76738
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
@@ -0,0 +1,247 @@
+--- a/Centauro/Makefile
++++ b/Centauro/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)
+--- a/ClusteringVetoPlugin/Makefile
++++ b/ClusteringVetoPlugin/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)
+--- a/ConstituentSubtractor/Makefile
++++ b/ConstituentSubtractor/Makefile
+@@ -41,8 +41,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)
+--- a/EnergyCorrelator/Makefile
++++ b/EnergyCorrelator/Makefile
+@@ -40,8 +40,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)
+--- a/FlavorCone/Makefile	
++++ b/FlavorCone/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)
+--- a/GenericSubtractor/Makefile
++++ b/GenericSubtractor/Makefile
+@@ -38,8 +38,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)
+--- a/JetCleanser/Makefile
++++ b/JetCleanser/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)
+--- a/JetFFMoments/Makefile
++++ b/JetFFMoments/Makefile
+@@ -34,8 +34,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
+ 
+ examples: example
+ 
+--- a/JetsWithoutJets/Makefile
++++ b/JetsWithoutJets/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)
+--- a/LundPlane/Makefile
++++ b/LundPlane/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)
+--- a/Nsubjettiness/Makefile
++++ b/Nsubjettiness/Makefile
+@@ -40,8 +40,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) $(EXAMPLES2)
+--- a/QCDAwarePlugin/Makefile	
++++ b/QCDAwarePlugin/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)
+--- a/RecursiveTools/Makefile
++++ b/RecursiveTools/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)
+--- a/ScJet/Makefile
++++ b/ScJet/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)
+--- a/scripts/internal/Template/Makefile
++++ b/scripts/internal/Template/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)
+--- a/SoftKiller/Makefile
++++ b/SoftKiller/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)
+--- a/SubjetCounting/Makefile
++++ b/SubjetCounting/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)
+--- a/ValenciaPlugin/Makefile
++++ b/ValenciaPlugin/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)
+--- a/VariableR/Makefile
++++ b/VariableR/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/files/fastjet-contrib-1.049-soname.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
index 5f69900cdc30..fe3794d5e0f5 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
@@ -1,5 +1,5 @@
---- fjcontrib-1.046.orig/Makefile.in	2022-03-10 13:44:33.963887464 +0100
-+++ fjcontrib-1.046/Makefile.in	2022-03-10 13:45:02.573890763 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -54,7 +54,7 @@
  
  fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
diff --git a/sci-physics/fastjet-contrib/metadata.xml b/sci-physics/fastjet-contrib/metadata.xml
index 1a470bb15f7b..ae55524d0200 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+	<maintainer type="person" proxied="yes">
+		<email>alexander@neuwirth-informatik.de</email>
+		<name>Alexander Puck Neuwirth</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	The fastjet-contrib space is intended to provide a common location for access to 3rd party extensions of FastJet.
 	</longdescription>