diff --git a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
index f353ab149a..83906e3ff6 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
@@ -29,14 +29,13 @@ CDEPEND="
 	app-arch/xz-utils
 	dev-libs/icu
 	dev-libs/libpfm
-	sys-libs/libunwind
 	dev-libs/libxml2
 	dev-libs/papi
 	sys-apps/hwloc
-	sys-libs/glibc
 	sys-libs/zlib
 	virtual/mpi
 
+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
 	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
 
 	boost? ( dev-libs/boost:= )
diff --git a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild b/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
index fc4335eb8b..da5d5f5908 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
@@ -29,14 +29,13 @@ CDEPEND="
 	app-arch/xz-utils
 	dev-libs/icu
 	dev-libs/libpfm
-	sys-libs/libunwind
 	dev-libs/libxml2
 	dev-libs/papi
 	sys-apps/hwloc
-	sys-libs/glibc
 	sys-libs/zlib
 	virtual/mpi
 
+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
 	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
 
 	boost? ( dev-libs/boost:= )
diff --git a/sys-cluster/extrae/extrae-3.8.3-r3.ebuild b/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
index 69d96736a0..43c1128094 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
@@ -29,14 +29,13 @@ CDEPEND="
 	app-arch/xz-utils
 	dev-libs/icu
 	dev-libs/libpfm
-	sys-libs/libunwind
 	dev-libs/libxml2
 	dev-libs/papi
 	sys-apps/hwloc
-	sys-libs/glibc
 	sys-libs/zlib
 	virtual/mpi
 
+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
 	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
 
 	boost? ( dev-libs/boost:= )