diff --git a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
new file mode 100644
index 0000000000..4affa08955
--- /dev/null
+++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+inherit autotools java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes"
+HOMEPAGE="https://github.com/bsc-performance-tools/extrae"
+SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml"
+#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver
+#TODO: find out which FFT library is used
+#TODO: remove some useflags (boost fft elf dwarf)
+#TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj
+#TODO: support llvm libunwind, llvm rt, elftoolchain
+
+CDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/icu
+	sys-libs/libunwind
+	dev-libs/libxml2
+	dev-libs/papi
+	sys-apps/hwloc
+	sys-libs/glibc
+	sys-libs/zlib
+	virtual/mpi
+
+	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
+
+	boost? ( dev-libs/boost:= )
+	dwarf? ( dev-libs/libdwarf )
+	elf? ( virtual/libelf )
+	nanos? ( sys-cluster/nanos6 )
+	opencl? ( dev-util/opencl-headers )
+"
+DEPEND="
+	${CDEPEND}
+	java? ( virtual/jdk:1.8 )
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	virtual/opencl
+"
+BDEPEND="
+	doc? ( dev-python/sphinx )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+#	cupti? ( cuda )
+#	dyninst? ( boost dwarf elf )
+#	online? ( synapse )
+#	aspectj? ( java )
+#	spectral? ( fft )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${T}"
+		--datarootdir="${T}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/extrae/lib"
+
+		--disable-mic
+		--disable-online
+		--disable-peruse
+		--disable-pmapi
+		--disable-static
+
+		--enable-shared
+
+		--with-librt="${EPREFIX}/usr"
+		--with-mpi="${EPREFIX}/usr"
+		--with-papi="${EPREFIX}/usr"
+		--with-pic
+		--with-unwind="${EPREFIX}/usr"
+
+		--without-dyninst
+		--without-cupti
+		--without-memkind
+		--without-clustering
+		--without-java-aspectj
+		--without-java-aspectj-weaver
+		--without-synapse
+		--without-spectral
+		--without-openshmem
+		--without-gm
+		--without-mx
+
+		$(use_enable doc)
+		$(use_enable heterogeneous)
+		$(use_enable inotify)
+		$(use_enable instrument-dynamic-memory)
+		$(use_enable instrument-io)
+		$(use_enable instrument-syscall)
+		$(use_enable merge-in-trace)
+		$(use_enable nanos)
+		$(use_enable openmp)
+		$(use_enable sampling)
+		$(use_enable parallel-merge)
+		$(use_enable pebs-sampling)
+		$(use_enable posix-clock)
+		$(use_enable pthread)
+		$(use_enable single-mpi-lib)
+		$(use_enable smpss)
+		$(use_enable xml)
+	)
+#		--without-sionlib
+#--with-pmpi-hook                                                                                                                                 (Choose method to call PMPI (dlsym or pmpi))
+
+	if use boost; then
+		myconf+=( "--with-boost=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-boost" )
+	fi
+	if use dwarf; then
+		myconf+=( "--with-dwarf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-dwarf" )
+	fi
+	if use elf; then
+		myconf+=( "--with-elf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-elf" )
+	fi
+	if use fft; then
+		myconf+=( "--with-fft=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-fft" )
+	fi
+	if use java; then
+		myconf+=( "--with-java-jdk=$(java-config -O)" )
+	else
+		myconf+=( "--without-java-jdk" )
+	fi
+	if use opencl; then
+		myconf+=( "--with-opencl=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-opencl" )
+	fi
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	mkdir -p "${D}/$(python_get_sitedir)/" || die
+	mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die
+	python_optimize "${D}/$(python_get_sitedir)/pyextrae"
+
+	#super-duper workaround
+	mkdir -p "${ED}/usr/share/doc/${PF}" || die
+	mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die
+	mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die
+
+	if use doc ; then
+		mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die
+		mv "${T}/man" "${ED}/usr/share/" || die
+		docompress -x "/usr/share/doc/${PF}/html"
+	fi
+	docompress -x "/usr/share/doc/${PF}/examples"
+	docompress -x "/usr/share/doc/${PF}/tests"
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml
index 63ba6df57e..fb390763b4 100644
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -31,7 +31,7 @@ process). Extrae generates trace files that can be later visualized with <pkg>sy
 		<flag name="instrument-syscall">Enables instrumentation for system calls (other than I/O and mallocs)</flag>
 		<flag name="java">Enable support for tracing Java. This is necessary to create the connectors between |TRACE| and Java applications.</flag>
 		<flag name="merge-in-trace">Embed the merging process in the tracing library so the final tracefile can be generated automatically from the application run</flag>
-		<!--<flag name="nanos">Enable support for tracing <pkg>sys-cluster/nanos</pkg> run-time</flag>-->
+		<flag name="nanos">Enable support for tracing <pkg>sys-cluster/nanos</pkg> run-time</flag>
 		<!--<flag name="online">Enable on-line analysis</flag>-->
 		<flag name="opencl">Enable support for tracing OpenCL</flag>
 		<flag name="openmp">Enable support for tracing OpenMP</flag>