gentoo auto-resync : 22:07:2022 - 14:46:57

5 files changed, 168 insertions, 3 deletions

diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index a4b88bcd4d32..75a5d727c89a 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,4 +1,8 @@
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
+AUX fastjet-3.4.0-gfortran.patch 460 BLAKE2B 59fc23a0326274363bdaa325b279c3b798726b1d1e68ce24d591d74ece325533d04bb430b8d3cd9afe9041bb6ea35e1013836634c334984a2b38df53691d75e6 SHA512 c687213cf01ce3d46bbe17db48581dfe7980137d568e0cfc4c1b0665b189cfb64b2feba50763ae511688f10c4eb08e0c43260f76238b5e4c9ea0f00b281e157c
+AUX fastjet-3.4.0-system-siscone.patch 3905 BLAKE2B dbd08874af57cf611b40d4a0ec8c8acff5acff5a6a0959e45b486926a3e50e5ff2c4ac9992161e11666cf09ca52a189c51cb192f907c97b2d8b60c96f5a90fed SHA512 448171e01cc608b0b8e84d1a1bb4e2a146e81fefd6b660e149d181b5c6fdd71f8317e92fe301d47e359819cb03a757034d66a2ab5be96cc2b2d7fc500de6afcc
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
-EBUILD fastjet-3.0.6-r3.ebuild 1350 BLAKE2B 72ead73cf9b69a67b527f7ceb6c4d15e6b4d8d896c4cfc5f8abd3fd946635582adf6442548b6ba72b5b0eccaecbfbdb93403d7852e393359747c672380b992f4 SHA512 02dc1208066265536cb2625a6e7bbbe8237d5a402ea0dde136c9ea005fb4c66d11164dd69ceb57c779c4fa0be29893268c5debd022eb9b936abed8559bdcfef7
+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
 MISC metadata.xml 847 BLAKE2B e83be614f0f62c0134590b689846e3fd481d49268bc45d2cd0a8fcf4628d56551a76336843da0c596e992dd0aefa829de07cb0877d3bba8aa1123c7f9f54d062 SHA512 b9fc075c1fb0cd8da6f44ddc2ce55b4f3492bf23a6ec3a56865559afdfbd2a1d79bcd07d34974c5f44e96edca08830c057852fa85a7ab88b8b2f784c4a34519f
diff --git a/sci-physics/fastjet/fastjet-3.0.6-r3.ebuild b/sci-physics/fastjet/fastjet-3.0.6-r3.ebuild
index 083818379ede..b62fa18aba46 100644
--- a/sci-physics/fastjet/fastjet-3.0.6-r3.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cgal doc examples +plugins"
 
 RDEPEND="
-	cgal? ( sci-mathematics/cgal:=[shared(+)] )
+	cgal? ( <sci-mathematics/cgal-5.3:=[shared(+)] )
 	plugins? ( sci-physics/siscone:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
diff --git a/sci-physics/fastjet/fastjet-3.4.0.ebuild b/sci-physics/fastjet/fastjet-3.4.0.ebuild
new file mode 100644
index 000000000000..f114cdf358f0
--- /dev/null
+++ b/sci-physics/fastjet/fastjet-3.4.0.ebuild
@@ -0,0 +1,75 @@
+# 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
+"
+
+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"
+IUSE="cgal examples python +plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	cgal? ( <sci-mathematics/cgal-5.3:=[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) \
+		$(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/files/fastjet-3.4.0-gfortran.patch b/sci-physics/fastjet/files/fastjet-3.4.0-gfortran.patch
new file mode 100644
index 000000000000..639cbf253589
--- /dev/null
+++ b/sci-physics/fastjet/files/fastjet-3.4.0-gfortran.patch
@@ -0,0 +1,11 @@
+--- a/plugins/PxCone/Makefile.am	2022-07-20 18:25:01.390035710 +0200
++++ b/plugins/PxCone/Makefile.am	2022-07-20 18:25:43.261623399 +0200
+@@ -7,7 +7,7 @@
+ endif
+ libPxConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include
+ libPxConePlugin_la_SOURCES = pxcone.f PxConePlugin.cc
+-libPxConePlugin_la_LIBADD = ../../src/libfastjet.la
++libPxConePlugin_la_LIBADD = ../../src/libfastjet.la -lgfortran
+ 
+ EXTRA_DIST = makefile.static pxcone.h
+ 
diff --git a/sci-physics/fastjet/files/fastjet-3.4.0-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.4.0-system-siscone.patch
new file mode 100644
index 000000000000..0aa29d07ab38
--- /dev/null
+++ b/sci-physics/fastjet/files/fastjet-3.4.0-system-siscone.patch
@@ -0,0 +1,75 @@
+diff -Nur fastjet-3.0.6.orig/configure.ac fastjet-3.0.6/configure.ac
+--- fastjet-3.0.6.orig/configure.ac	2014-05-06 10:29:55.240632504 -0700
++++ fastjet-3.0.6/configure.ac	2014-05-06 10:36:20.156246416 -0700
+@@ -261,6 +261,12 @@
+ fi
+ 
+ dnl SISCone
++AC_ARG_WITH(bundle-siscone,
++	[  --with-bundle-siscone  Build the bundled SISCone library [default=no]],
++	[bundle_siscone=$withval],
++	[bundle_siscone=no])
++AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno)
++
+ ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
+ 	         [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
+                   CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])
+diff -Nur fastjet-3.0.6.orig/example/Makefile.am fastjet-3.0.6/example/Makefile.am
+--- fastjet-3.0.6.orig/example/Makefile.am	2014-05-06 10:29:55.239632499 -0700
++++ fastjet-3.0.6/example/Makefile.am	2014-05-06 10:36:20.156246416 -0700
+@@ -43,7 +43,7 @@
+ 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
+ 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ else
+ EXTRA_DIST += 03-plugin.cc
+ endif
+@@ -125,7 +125,7 @@
+ fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ if BUILD_PLUGIN_SISCONE
+ fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ endif
+ 
+ fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
+@@ -135,7 +135,7 @@
+ fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la 
+ if BUILD_PLUGIN_SISCONE
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ endif
+ if BUILD_PLUGIN_CDFCONES
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
+diff -Nur  fastjet-3.4.0/plugins/SISCone/Makefile.am.orig  fastjet-3.4.0/plugins/SISCone/Makefile.am
+--- fastjet-3.4.0/plugins/SISCone/Makefile.am.orig	2022-03-10 11:21:49.888900042 +0100
++++ fastjet-3.4.0/plugins/SISCone/Makefile.am	2022-03-10 11:23:07.790909024 +0100
+@@ -1,12 +1,22 @@
+-SUBDIRS = siscone fastjet .
++SUBDIRS = fastjet .
+
+ if MONOLITHIC_PLUGINS
+ noinst_LTLIBRARIES = libSISConePlugin.la
+ else
+ lib_LTLIBRARIES = libSISConePlugin.la
+ endif
+-libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include -I./siscone
++libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include
++
++if BUNDLE_SISCONE
++SUBDIRS += siscone
++libSISConePlugin_la_CXXFLAGS += -I$(srcdir)/siscone
++libSISConePlugin_la_LIBADD = \
++       $(top_builddir)/plugins/SISCone/siscone/siscone/libsiscone.la \
++       $(top_builddir)/plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++else
++libSISConePlugin_la_LIBADD = -lsiscone -lsiscone_spherical
++endif
+ libSISConePlugin_la_SOURCES = SISConeBasePlugin.cc SISConePlugin.cc SISConeSphericalPlugin.cc
+-libSISConePlugin_la_LIBADD = ../../src/libfastjet.la siscone/siscone/libsiscone.la siscone/siscone/spherical/libsiscone_spherical.la
++
+
+ EXTRA_DIST = makefile.static