[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/paraver-kernel/files/, sys-cluster/paraver-kernel/

[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/paraver-kernel/files/, sys-cluster/paraver-kernel/

[Florian Schmaus]

commit:     083107b1546a15db147df96697e5f954a16a920d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Aug 18 00:37:17 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 02:22:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=083107b1

sys-cluster/paraver-kernel: initial import

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/paraver-kernel/Manifest                |   1 +
 ...kernel-4.9.0-fix-gcc-11-compilation-error.patch |  20 ++
 .../paraver-kernel-unbundle-libbsctools.patch      | 264 +++++++++++++++++++++
 sys-cluster/paraver-kernel/metadata.xml            |  19 ++
 .../paraver-kernel/paraver-kernel-4.9.0.ebuild     |  75 ++++++
 5 files changed, 379 insertions(+)

diff --git a/sys-cluster/paraver-kernel/Manifest b/sys-cluster/paraver-kernel/Manifest
new file mode 100644
index 000000000..db4733fe4
--- /dev/null
+++ b/sys-cluster/paraver-kernel/Manifest
@@ -0,0 +1 @@
+DIST paraver-kernel-4.9.0.tar.gz 2144621 BLAKE2B 93cb6a751462ff0f39261e89fba11664ac07ff20f557e41a899cf958fa5bc7751bca5fc7d1bb3c734cb3ba60e84e7c113ed86641e985a807814b0be039a943ac SHA512 efd781c2288e4b7ce847d6010fd79b83c9db32f5f9b4696009feaa56558aa1f20f86955e920dec6a6355377fe4cf09f9ed23caa55e63596dc0ebb289933cc149

diff --git a/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
new file mode 100644
index 000000000..a007d1b35
--- /dev/null
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
@@ -0,0 +1,20 @@
+From 6ed43d980aba622e27402efdaaf32591fcb72b02 Mon Sep 17 00:00:00 2001
+From: Eloy Martinez <eloy.martinez@bsc.es>
+Date: Wed, 30 Jun 2021 11:27:15 +0200
+Subject: [PATCH] Fixed GCC 11 compilation error
+
+---
+ api/recordlist.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/api/recordlist.h
++++ b/api/recordlist.h
+@@ -142,7 +142,7 @@ struct RLRecord
+ // r1 is less than r2?
+ struct ltrecord
+ {
+-  bool operator()( const RLRecord& r1, const RLRecord& r2 )
++  bool operator()( const RLRecord& r1, const RLRecord& r2 ) const
+   {
+     if ( r1.getTime() < r2.getTime() )
+       return true;

diff --git a/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
new file mode 100644
index 000000000..f760dd06a
--- /dev/null
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
@@ -0,0 +1,264 @@
+--- a/api/eventlabels.cpp
++++ b/api/eventlabels.cpp
+@@ -24,11 +24,6 @@
+ 
+ #include "eventlabels.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverEventType.h"
+-#include "utils/pcfparser/old/ParaverEventValue.h"
+-#endif
+-
+ using namespace std;
+ 
+ const string EventLabels::unknownLabel = "Unknown";
+--- a/api/eventlabels.h
++++ b/api/eventlabels.h
+@@ -29,11 +29,7 @@
+ #include <map>
+ #include "paraverkerneltypes.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ using namespace libparaver;
+ 
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -1,22 +1,7 @@
+-
+ pkglib_LTLIBRARIES = libparaver-api.la
+ 
+-
+-if MAKE_OLD_PCFPARSER
+-  PCFPARSER_FILES=  ../utils/pcfparser/old/LibException.cpp \
+-                    ../utils/pcfparser/old/ParaverEventType.cpp \
+-                    ../utils/pcfparser/old/ParaverEventValue.cpp \
+-                    ../utils/pcfparser/old/ParaverGradientColor.cpp \
+-                    ../utils/pcfparser/old/ParaverGradientNames.cpp \
+-                    ../utils/pcfparser/old/ParaverState.cpp \
+-                    ../utils/pcfparser/old/ParaverStatesColor.cpp \
+-                    ../utils/pcfparser/old/ParaverTraceConfig.cpp \
+-                    ../utils/pcfparser/old/ParaverTraceConfigGrammar.cpp 
+-else
+-  PCFPARSER_FILES=../utils/pcfparser/ParaverTraceConfig.cpp \
+-                  ../utils/pcfparser/UIParaverTraceConfig.cpp
+-endif
+-
++libparaver_api_la_LIBADD = -lparavertraceconfig
++libparaver_api_la_LDFLAGS = -lparavertraceconfig
+ 
+ libparaver_api_la_SOURCES = \
+                     cfg.cpp \
+@@ -53,8 +38,7 @@
+                     tracesoftwarecounters.cpp \
+                     window.cpp \
+                     workspace.cpp \
+-                    workspacemanager.cpp \
+-                    $(PCFPARSER_FILES)
++                    workspacemanager.cpp
+ 
+ include_HEADERS = \
+                   cfg.h\
+@@ -110,18 +94,6 @@
+                   traceeditstates.cpp\
+                   zoomhistory.cpp
+ 
+-install-data-hook:
+-	$(mkdir_p) $(DESTDIR)$(includedir)/utils/pcfparser
+-	cp -f ../utils/pcfparser/UIParaverTraceConfig.h $(DESTDIR)$(includedir)/utils/pcfparser
+-	cp -f ../utils/pcfparser/UIParaverTraceConfig.ipp $(DESTDIR)$(includedir)/utils/pcfparser
+-
+-	$(mkdir_p) $(DESTDIR)$(includedir)/utils/pcfparser/old
+-	cp -f ../utils/pcfparser/old/ParaverTraceConfig.h $(DESTDIR)$(includedir)/utils/pcfparser/old
+-
+-uninstall-hook:
+-	test -d $(DESTDIR)$(includedir)/utils/pcfparser && rm -rf $(DESTDIR)$(includedir)/utils/pcfparser
+-
+-
+ # Erases everything which should not be uploaded to CVS
+ mrproper: distclean
+ 	rm -fr Makefile.in
+--- a/api/paramedir.cpp
++++ b/api/paramedir.cpp
+@@ -54,11 +54,7 @@
+ #include "eventdrivencutter.h"
+ #include "eventtranslator.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ // PARAMEDIR OPTIONS
+ typedef struct TOptionParamedir
+--- a/api/statelabels.cpp
++++ b/api/statelabels.cpp
+@@ -24,10 +24,6 @@
+ 
+ #include "statelabels.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverState.h"
+-#endif
+-
+ using namespace std;
+ 
+ const string StateLabels::unknownLabel = "Unknown";
+--- a/api/statelabels.h
++++ b/api/statelabels.h
+@@ -28,11 +28,7 @@
+ #include <map>
+ #include "paraverkerneltypes.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ using namespace libparaver;
+ 
+--- a/api/trace.cpp
++++ b/api/trace.cpp
+@@ -24,13 +24,7 @@
+ #include "kernelconnection.h"
+ #include "trace.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#include "utils/pcfparser/old/ParaverStatesColor.h"
+-#include "utils/pcfparser/old/ParaverGradientColor.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ #include "progresscontroller.h"
+ #include <sstream>
+--- a/api/tracecutter.cpp
++++ b/api/tracecutter.cpp
+@@ -28,11 +28,7 @@
+ //#include "ktracecutter.h"
+ #include "kernelconnection.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ using namespace libparaver;
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,7 +52,6 @@
+ AC_CONFIG_HEADERS(config_traits.h)
+ AX_PROG_ENABLE_DEPENDENCIES_AWARE_INSTALL
+ AX_PROG_ENABLE_EXTENDED_OBJECTS
+-AX_PROG_ENABLE_OLD_PCFPARSER
+ AX_PROG_ENABLE_OMPSS
+ AX_PROG_ENABLE_OPENMP
+ AX_PROG_ENABLE_MINGW
+@@ -82,4 +81,4 @@
+ CXXFLAGS="-I../include/ -I../api/ -I../ -I../../ $CXXFLAGS $BOOST_CPPFLAGS $CXXFLAGS_EXTRAE $XML_CPPFLAGS $MINGW_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $BOOST_SERIALIZATION_LIB $BOOST_DATE_TIME_LIB $LDFLAGS_EXTRAE $BOOST_RPATH $XML_LIBS $MINGW_LIBS"
+ 
+-AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile utils/pcfparser/Makefile utils/pcfparser/old/Makefile])
++AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile])
+--- a/m4/macros.m4
++++ b/m4/macros.m4
+@@ -36,29 +36,6 @@
+ 
+ 
+ 
+-# AX_PROG_ENABLE_OLD_PCFPARSER
+-# ----------------------------
+-AC_DEFUN([AX_PROG_ENABLE_OLD_PCFPARSER],
+-[
+-   AC_ARG_ENABLE(old_pcfparser,
+-      AC_HELP_STRING(
+-         [--enable-old-pcfparser],
+-         [enable compilation with old pcfparser (default: disabled)]
+-      ),
+-      [enable_old_pcfparser="${enableval}"],
+-      [enable_old_pcfparser="no"]
+-   )
+-
+-   if test "${enable_old_pcfparser}" = "yes" ; then
+-      AC_MSG_NOTICE([Using old pcfparser.])
+-      AC_DEFINE([OLD_PCFPARSER], 1, [Old pcfparser enabled by user.])
+-   fi
+-
+-   AM_CONDITIONAL(MAKE_OLD_PCFPARSER, test "${enable_old_pcfparser}" = "yes" )
+-])
+-
+-
+-
+ # AX_PROG_ENABLE_OMPSS
+ # --------------------
+ AC_DEFUN([AX_PROG_ENABLE_OMPSS],
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -15,7 +15,7 @@
+ 	api/paramedir.cpp
+ 
+ paramedir_bin_LDADD = \
+-	-lz \
++	-lz -lparavertraceconfig \
+ 	api/libparaver-api.la \
+ 	src/libparaver-kernel.la
+ 
+--- a/src/ktraceeditactions.cpp
++++ b/src/ktraceeditactions.cpp
+@@ -42,11 +42,7 @@
+ #include "traceoptions.h"
+ #include "ParaverMetadataManager.h"
+ #include "ktrace.h"
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ using std::set;
+ 
+@@ -841,4 +837,4 @@
+   tmpSequence->executeNextAction( whichTrace );
+ 
+   return true;
+-}
+\ Manca newline alla fine del file
++}
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -58,7 +58,10 @@
+     traceeditblocks.cpp \
+     traceheaderexception.cpp\
+     tracestream.cpp
+-          
++
++libparaver_kernel_la_LIBADD = -lparavertraceconfig
++libparaver_kernel_la_LDFLAGS = -lparavertraceconfig
++
+ noinst_HEADERS = \
+     cell.cpp \
+     column.cpp \
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ 	include \
+-	pcfparser \
+ 	src
+ 
+ 

diff --git a/sys-cluster/paraver-kernel/metadata.xml b/sys-cluster/paraver-kernel/metadata.xml
new file mode 100644
index 000000000..b2e04beb0
--- /dev/null
+++ b/sys-cluster/paraver-kernel/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="extended-objects">Enable extra number of objects</flag>
+		<flag name="extrae">Enable extrae support</flag>
+		<flag name="ompss">Enable OmpSs parallel version</flag>
+		<flag name="openmp">Enable OpenMP parallel version</flag>
+		<flag name="otf2">Enable otf2 support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/bsc-performance-tools/paraver-kernel/issues</bugs-to>
+		<remote-id type="github">bsc-performance-tools/paraver-kernel</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild b/sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild
new file mode 100644
index 000000000..dde04b0a4
--- /dev/null
+++ b/sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="paraver kernel library"
+HOMEPAGE="
+	http://tools.bsc.es/paraver
+	https://github.com/bsc-performance-tools/paraver-kernel
+"
+SRC_URI="https://github.com/bsc-performance-tools/paraver-kernel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/clustering-suite-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extended-objects extrae ompss openmp otf2"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2
+	sys-libs/zlib
+	sys-cluster/libbsctools:=
+	extrae? ( sys-cluster/extrae )
+	otf2? ( sys-cluster/otf2 )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README NEWS AUTHORS ChangeLog )
+REQUIRED_USE="extrae? ( openmp )"
+PATCHES=(
+	"${FILESDIR}/${PN}-unbundle-libbsctools.patch"
+	"${FILESDIR}/${P}-fix-gcc-11-compilation-error.patch"
+)
+
+src_prepare() {
+	rm -r utils/pcfparser || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-shared
+		--with-boost="${EPREFIX}/usr"
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable extended-objects)
+		$(use_enable ompss)
+		$(use_enable openmp)
+	)
+
+	if use extrae; then
+		myconf+=( "--with-extrae=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-extrae" )
+	fi
+	if use otf2; then
+		myconf+=( "--with-otf2=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-otf2" )
+	fi
+
+	econf "${myconf[@]}" || die
+}
+
+src_install() {
+	default
+	einstalldocs
+	mv "${ED}/usr/$(get_libdir)/paraver-kernel"/* "${ED}/usr/$(get_libdir)" || die
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/paraver-kernel/files/, sys-cluster/paraver-kernel/

[Florian Schmaus]

commit:     90d89803d97f4d40c3cce629143edfc009a05213
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Jun  7 17:41:31 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 17:43:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90d89803

sys-cluster/paraver-kernel: link libxml2

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 ...araver-kernel-4.10.1-unbundle-libbsctools.patch | 60 +++++++++-------------
 ...10.1.ebuild => paraver-kernel-4.10.1-r1.ebuild} |  5 +-
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch b/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
index c54e943fb..3895473e6 100644
--- a/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
@@ -1,6 +1,5 @@
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/eventlabels.h paraver-kernel-4.10.1/api/eventlabels.h
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/eventlabels.h	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/eventlabels.h	2022-06-07 16:52:15.526426696 +0200
+--- a/api/eventlabels.h
++++ b/api/eventlabels.h
 @@ -32,7 +32,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -10,9 +9,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/Makefile.am paraver-kernel-4.10.1/api/Makefile.am
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/Makefile.am	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/Makefile.am	2022-06-07 17:07:09.261765112 +0200
+--- a/api/Makefile.am
++++ b/api/Makefile.am
 @@ -1,20 +1,6 @@
  
  pkglib_LTLIBRARIES = libparaver-api.la
@@ -71,9 +69,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  
  
  # Erases everything which should not be uploaded to CVS
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/paramedir.cpp paraver-kernel-4.10.1/api/paramedir.cpp
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/paramedir.cpp	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/paramedir.cpp	2022-06-07 16:55:57.063567741 +0200
+--- a/api/paramedir.cpp
++++ b/api/paramedir.cpp
 @@ -57,7 +57,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -83,9 +80,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  // PARAMEDIR OPTIONS
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/statelabels.h paraver-kernel-4.10.1/api/statelabels.h
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/statelabels.h	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/statelabels.h	2022-06-07 16:56:27.090733938 +0200
+--- a/api/statelabels.h
++++ b/api/statelabels.h
 @@ -31,7 +31,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -95,9 +91,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/trace.cpp paraver-kernel-4.10.1/api/trace.cpp
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/trace.cpp	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/trace.cpp	2022-06-07 16:56:49.155856065 +0200
+--- a/api/trace.cpp
++++ b/api/trace.cpp
 @@ -29,7 +29,7 @@
  #include "utils/pcfparser/old/ParaverStatesColor.h"
  #include "utils/pcfparser/old/ParaverGradientColor.h"
@@ -107,9 +102,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  #include "progresscontroller.h"
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/tracecutter.cpp paraver-kernel-4.10.1/api/tracecutter.cpp
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/tracecutter.cpp	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/api/tracecutter.cpp	2022-06-07 16:57:09.200968638 +0200
+--- a/api/tracecutter.cpp
++++ b/api/tracecutter.cpp
 @@ -31,7 +31,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -119,9 +113,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/configure.ac paraver-kernel-4.10.1/configure.ac
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/configure.ac	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/configure.ac	2022-06-07 16:58:23.699588409 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -55,7 +55,6 @@
  AC_CONFIG_HEADERS(config_traits.h)
  AX_PROG_ENABLE_DEPENDENCIES_AWARE_INSTALL
@@ -136,9 +129,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  
 -AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile utils/pcfparser/Makefile utils/pcfparser/old/Makefile])
 +AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile])
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/m4/macros.m4 paraver-kernel-4.10.1/m4/macros.m4
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/m4/macros.m4	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/m4/macros.m4	2022-06-07 16:58:46.022774121 +0200
+--- a/m4/macros.m4
++++ b/m4/macros.m4
 @@ -36,27 +36,6 @@
  
  
@@ -167,9 +159,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  
  
  # AX_PROG_ENABLE_OMPSS
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/Makefile.am paraver-kernel-4.10.1/Makefile.am
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/Makefile.am	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/Makefile.am	2022-06-07 16:59:30.543135745 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -11,7 +11,7 @@
  	api/paramedir.cpp
  
@@ -179,9 +170,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  	api/libparaver-api.la \
  	src/libparaver-kernel.la
  
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/ktraceeditactions.cpp paraver-kernel-4.10.1/src/ktraceeditactions.cpp
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/ktraceeditactions.cpp	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/src/ktraceeditactions.cpp	2022-06-07 17:00:17.452495350 +0200
+--- a/src/ktraceeditactions.cpp
++++ b/src/ktraceeditactions.cpp
 @@ -45,7 +45,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -198,9 +188,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
 -}
 \ Manca newline alla fine del file
 +}
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/Makefile.am paraver-kernel-4.10.1/src/Makefile.am
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/Makefile.am	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/src/Makefile.am	2022-06-07 17:01:37.570126911 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -58,7 +58,10 @@
      traceeditblocks.cpp \
      traceheaderexception.cpp\
@@ -213,9 +202,8 @@ diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  noinst_HEADERS = \
      cell.cpp \
      column.cpp \
-diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/utils/Makefile.am paraver-kernel-4.10.1/utils/Makefile.am
---- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/utils/Makefile.am	2022-05-30 11:36:33.000000000 +0200
-+++ paraver-kernel-4.10.1/utils/Makefile.am	2022-06-07 17:02:02.100351099 +0200
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
 @@ -1,6 +1,5 @@
  SUBDIRS = \
  	include \

diff --git a/sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild b/sys-cluster/paraver-kernel/paraver-kernel-4.10.1-r1.ebuild
similarity index 89%
rename from sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild
rename to sys-cluster/paraver-kernel/paraver-kernel-4.10.1-r1.ebuild
index 8ad0de49c..21e730e51 100644
--- a/sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild
+++ b/sys-cluster/paraver-kernel/paraver-kernel-4.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="paraver kernel library"
 HOMEPAGE="
@@ -41,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-ldflags '-lxml2'
 	local myconf=(
 		--disable-static
 		--enable-shared
@@ -68,6 +69,8 @@ src_configure() {
 src_install() {
 	default
 	einstalldocs
+	mkdir -p "${ED}/usr/share/${PN}" || die
+	mv "${ED}/usr/share/filters-config" "${ED}/usr/share/${PN}/" || die
 	mv "${ED}/usr/$(get_libdir)/paraver-kernel"/* "${ED}/usr/$(get_libdir)" || die
 	find "${ED}" -name '*.la' -delete || die
 }