diff --git a/dev-libs/cubelib/cubelib-4.7.ebuild b/dev-libs/cubelib/cubelib-4.7-r1.ebuild
similarity index 62%
rename from dev-libs/cubelib/cubelib-4.7.ebuild
rename to dev-libs/cubelib/cubelib-4.7-r1.ebuild
index 56f15aa3bc..4b53db2bb3 100644
--- a/dev-libs/cubelib/cubelib-4.7.ebuild
+++ b/dev-libs/cubelib/cubelib-4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="General purpose C++ library and tools"
 HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
@@ -12,8 +12,24 @@ SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.g
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="R"
 
-DEPEND="dev-cpp/gtest"
+RDEPEND="
+	sys-libs/zlib
+	R? (
+		dev-lang/R
+		dev-R/Rcpp
+		dev-R/RInside
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
 
 src_prepare() {
 	rm -r vendor/googletest || die
@@ -24,8 +40,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-platform-mic
+		$(use_with R cube_dump_r)
 	)
-	econf "${myconf[@]}"
+	econf CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" "${myconf[@]}"
 }
 
 src_install() {
@@ -33,6 +50,7 @@ src_install() {
 	mv "${ED}/usr/share/doc/cubelib/example" "${ED}/usr/share/doc/${PF}/" || die
 	rm -r "${ED}/usr/share/doc/cubelib" || die
 	dodoc OPEN_ISSUES README
-	docompress -x "${ED}/usr/share/doc/${PF}/example"
+	docompress -x "/usr/share/doc/${PF}/example"
 	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/cubelib/metadata.xml b/dev-libs/cubelib/metadata.xml
index 6c0bdfd682..cdac0cffd2 100644
--- a/dev-libs/cubelib/metadata.xml
+++ b/dev-libs/cubelib/metadata.xml
@@ -5,4 +5,7 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<use>
+		<flag name="R">Use R for cube_dump</flag>
+	</use>
 </pkgmetadata>