6 files changed, 86 insertions, 3 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 6f1325492a22..c35ab352ab93 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 11efbb258b01..13bc3d7ef828 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,4 +1,4 @@
 AUX fastjet-contrib-1.049-soname.patch 772 BLAKE2B 88c50c5f425aba7d4eaf760def43baa145d15c550a3e857b70b3a98d0796e2a2f912e7ac652ae559fcf26ddb67013df392851398f92eb2b8362cbf84ebb8dae3 SHA512 715c269c80421baa682b2eda604ff60e21cf08a754ba8051dd684f9c846e444f57735f98102582ee81d975294b7f5873d265e4c8951dade91c5817f065970bef
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f SHA512 21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6
-EBUILD fastjet-contrib-1.049.ebuild 1017 BLAKE2B e06a205ac569fb59a80e007cba0aa00264fa14856caa05e621de7e02cb70a6f538e9f46eaaf92d18904ab7aeb202118bff162b9f206363418a6bdce51fdcbf64 SHA512 bb413688d0f482d434726ca46f2657c1c9ff154260297223503a68888217ea839fcb599b6dedf93d64d509868a24abad661542e74214b4c715dee7b1f675c464
+EBUILD fastjet-contrib-1.049.ebuild 1072 BLAKE2B 181c61cc4da8f1435cb91b5fd442404af996fe8f994e3e113148ae770ed9e30664a6deaeaf325ca80998b272144f05c2b1f961f961a454440f24f55d367fc8cc SHA512 7f5a9064856de9f5c1177cbfa345dec171971d38a7d5dc88d23d77e50b072f27d7bff59df5cc2fd993f313d886c6289d4f3763bcb26fe1e60c4f835206398285
 MISC metadata.xml 539 BLAKE2B a45a74080df65fd40841789ca8465301103cea5c6da01882f17d3153b45ef1bba36440d776ceea6214cf1fa63195fd4c425f249ecd78782116a31c5b3288dc56 SHA512 1e76b7065a64af7bb43284d20817827227d0a70070c7684348f8a093b2330c6e407fa6c237570bb4d002088a7cbcbaa7f150f6d6cc95eab2cb3d3ead4755c5c5
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
index c5de8596605c..cf942ac11e58 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 MY_PN=fjcontrib
 MY_P=${MY_PN}-${PV}
 
@@ -23,7 +25,8 @@ PATCHES=(
 )
 
 src_configure() {
-	./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	CXX=`tc-getCXX`
+	./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 src_compile() {
 	emake
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 75a5d727c89a..4fa10956c279 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -4,5 +4,6 @@ AUX fastjet-3.4.0-system-siscone.patch 3905 BLAKE2B dbd08874af57cf611b40d4a0ec8c
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
 DIST fastjet-3.4.0.tar.gz 2959127 BLAKE2B c99e89ee5cea3fd4e3edebdfebb50efd3c58e7ab15215a384c44120ac930882bd2d4e446b61977fe65dcc49056b958c6510abb7c5889024ae49776b1955bd023 SHA512 af8aeb6197f6bd82ec5f127647f49cd5d455c20e614c23d928b850fc97bc12c70cf6e3b09f1bb0308c2a080fcd4fa13416eea0195695060efaa0e400a687d7b7
 EBUILD fastjet-3.0.6-r3.ebuild 1355 BLAKE2B 4c95e8fbaa04c8d213957e0d3b8059df285b4a83dea0237e51176f3d498e549f9764162406d79da42adb036cc52b11b60f287be6cef79a1a02951a114408e62f SHA512 9d2932b070827a824f590adfea08380899fc55f89bc071dccd9e642e9627e25e176d3db8b9732ba35d5ff12db7d47291a01db8865b4c2d9f3fcddd35de9ad52e
-EBUILD fastjet-3.4.0.ebuild 1521 BLAKE2B a07989493610619222d6f615136658c897a1e03637e3f31b9552e4480319f1672b00139b7f0145ee970498e654e2e828f1deee76134200886b148db524427393 SHA512 edabb05c03476796f53d63e7847720acb73d4f3612fa5ff9bc80803a5344f3cf3c52c5f18b558d49964de60abd957cede86c427d5db5282705d49985b0a57dd0
+EBUILD fastjet-3.4.0-r1.ebuild 1720 BLAKE2B 051b884b8e6cdfb5e9edee88e6b626a6aff0c21305eb8469fdd118feef57d1d3795dafcfa94c8518af867d170193e72f5c9dc52dfc085fb7f2afc574a1dc603b SHA512 5e3eb62201458cd2e1dad102982804afde4eca0b70be115f95b7a982edfb123c28413ef49902b8bcebbfa07c962a83a11da9c160691841715f0f01ded1048976
+EBUILD fastjet-3.4.0.ebuild 1541 BLAKE2B 7d0bfbe23d1085d947b70a7cb18bf3c531c5498c0525ca64450f38ad3c6709ac8c5dcb8fb5be8ea9626aee792ff6f370efe0994dc6199b2c1e4db20f07860da6 SHA512 362cae71d3e60f4938f16a3fa85419361cb9efa95d9170288e5b80a278fc815b348f4f600806fa53b697c6a33821672d7d6bb6fced8a0a440f1b50e12970df20
 MISC metadata.xml 847 BLAKE2B e83be614f0f62c0134590b689846e3fd481d49268bc45d2cd0a8fcf4628d56551a76336843da0c596e992dd0aefa829de07cb0877d3bba8aa1123c7f9f54d062 SHA512 b9fc075c1fb0cd8da6f44ddc2ce55b4f3492bf23a6ec3a56865559afdfbd2a1d79bcd07d34974c5f44e96edca08830c057852fa85a7ab88b8b2f784c4a34519f
diff --git a/sci-physics/fastjet/fastjet-3.4.0-r1.ebuild b/sci-physics/fastjet/fastjet-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..530a7302df44
--- /dev/null
+++ b/sci-physics/fastjet/fastjet-3.4.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=plugins
+PYTHON_COMPAT=( python3_{8..11} )
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+	media-gfx/graphviz
+	media-libs/freetype
+	virtual/latex-base
+"
+
+inherit autotools docs flag-o-matic fortran-2 python-single-r1
+
+DESCRIPTION="A software package for jet finding in pp and e+e- collisions"
+HOMEPAGE="https://fastjet.fr/"
+SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cgal examples python +plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# cgal is header-only in version 5.4 and up. We need to use the
+# special --enable-cgal-header-only argument to use these versions.
+DEPEND="
+	cgal? ( >=sci-mathematics/cgal-5.4:=[shared(+)] )
+	plugins? ( sci-physics/siscone:= )
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/fortran"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-siscone.patch
+	"${FILESDIR}"/${P}-gfortran.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use cgal && \
+		has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp
+
+	econf \
+		$(use_enable cgal cgal-header-only) \
+		$(use_enable plugins allplugins) \
+		$(use_enable plugins allcxxplugins) \
+		--enable-shared \
+		--enable-static=no \
+		--disable-static \
+		--disable-auto-ptr  \
+		$(use_enable python pyext)
+}
+
+src_compile() {
+	default
+	docs_compile
+}
+
+src_install() {
+	default
+	if use examples; then
+		emake -C example maintainer-clean
+		find example -iname 'makefile*' -delete || die
+
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-physics/fastjet/fastjet-3.4.0.ebuild b/sci-physics/fastjet/fastjet-3.4.0.ebuild
index f114cdf358f0..a190b2a60f8f 100644
--- a/sci-physics/fastjet/fastjet-3.4.0.ebuild
+++ b/sci-physics/fastjet/fastjet-3.4.0.ebuild
@@ -9,6 +9,7 @@ DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	media-gfx/graphviz
 	media-libs/freetype
+	virtual/latex-base
 "
 
 inherit autotools docs flag-o-matic fortran-2 python-single-r1