gentoo resync : 22.01.2021

2 files changed, 0 insertions, 84 deletions

diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 049bfd514a4a..765deb5cdd3a 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,4 +1,3 @@
-AUX fastjet-3.0.3-system-siscone.patch 4191 BLAKE2B 0de9757d64c735f49eabd836cd1edf0d6a33fe0e4e58a52794c3e5de2059276de68472f0426751984ce5547e8846ff77e8bb0f50f1807d68db83bb5183a9d781 SHA512 34ba5e61364f9fe090389edbeda4370b2707e89fab2a00e941cabe496f8e7cdd65fb1fccdb48f000247b0e6bb3abc79bb995931fd4a9709584eed8eaab42957c
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
 EBUILD fastjet-3.0.6-r1.ebuild 1247 BLAKE2B 9df00a2006025aa82f6294ed5b7e0b921453c7e1c316d947ca40a3ea9e582d79beb9978ac1f82caf5f1514fa24354620de3b2550807491637293f694ff5d2428 SHA512 16ff337d0ef81f76028335f80d31b0eafdfde521dc11527f4e87624ebcda23caa3afc3d1ca49f2a264bbed588499e7cd439436956355bc063a833bc9430276ed
diff --git a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
deleted file mode 100644
index b74b8e4e9033..000000000000
--- a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac
---- fastjet-3.0.3.orig/configure.ac	2012-06-25 15:15:32.000000000 +0100
-+++ fastjet-3.0.3/configure.ac	2012-07-24 18:39:11.000000000 +0100
-@@ -14,7 +14,7 @@
- dnl  - the first macro needs to place the files in the correct 
- dnl    dir in order to have the correct -I options for the remote build
- dnl  - see Makefile.am for distcleaning AX_PREFIX_CONFIG_H leftovers
--AM_CONFIG_HEADER(include/fastjet/config_raw.h:config.h.in)
-+AC_CONFIG_HEADERS(include/fastjet/config_raw.h:config.h.in)
- AX_PREFIX_CONFIG_H(include/fastjet/config_auto.h,FASTJET,include/fastjet/config_raw.h)
- 
- dnl check autoconf version
-@@ -252,6 +252,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.3.orig/example/Makefile.am fastjet-3.0.3/example/Makefile.am
---- fastjet-3.0.3.orig/example/Makefile.am	2012-06-13 15:14:58.000000000 +0100
-+++ fastjet-3.0.3/example/Makefile.am	2012-07-24 18:26:15.000000000 +0100
-@@ -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.0.3.orig/plugins/SISCone/Makefile.am fastjet-3.0.3/plugins/SISCone/Makefile.am
---- fastjet-3.0.3.orig/plugins/SISCone/Makefile.am	2012-06-13 15:14:51.000000000 +0100
-+++ fastjet-3.0.3/plugins/SISCone/Makefile.am	2012-07-24 18:36:56.000000000 +0100
-@@ -1,11 +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
-+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 = SISConePlugin.cc SISConeSphericalPlugin.cc
- 
- EXTRA_DIST = makefile.static