diff --git a/gui-libs/cubegui/Manifest b/gui-libs/cubegui/Manifest
index d48443b772..2ba0282afa 100644
--- a/gui-libs/cubegui/Manifest
+++ b/gui-libs/cubegui/Manifest
@@ -1 +1 @@
-DIST cubegui-4.7.tar.gz 10789553 BLAKE2B b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a SHA512 48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9
+DIST cubegui-4.7-9a161bfd.tar.gz 10696455 BLAKE2B 0f7a2c2af3dfbba3b0f505901f7b1efaea6b327bb7e88ee116a8774454f8b246ce01e732be28f2922b58320b2429b2988bed79e0af70e8b788ff7a638802d62c SHA512 ee22fdb7ffddcb9033e729a54ff3009baadc3774bb4434b890aac3527e62644af5a3ab89211a8d40eb6e754b7074b504e62bb711304d4388129a75962fae0743
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
similarity index 90%
rename from gui-libs/cubegui/cubegui-4.7.ebuild
rename to gui-libs/cubegui/cubegui-4.7-r1.ebuild
index 00067af6a7..5e8ec0bede 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
@@ -5,9 +5,13 @@ EAPI=8
 
 inherit bash-completion-r1 qmake-utils toolchain-funcs
 
+MYPV="9a161bfd"
+MYP="sources.${MYPV}"
+
 DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
 HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
-SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz"
+SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/${PN}/branches/master/${MYP}.tar.gz -> ${P}-${MYPV}.tar.gz"
+S="${WORKDIR}/${MYP}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -31,9 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="app-doc/doxygen[dot]"
 
-PATCHES=(
-	"${FILESDIR}/${P}-custom-compiler.patch"
-)
+# reconfigure needs custom autotools
 
 src_configure() {
 	tc-export CC CXX FC F77 CPP AR
@@ -74,10 +76,6 @@ src_configure() {
 	MPI_LDFLAGS=${LDFLAGS}
 	EOF
 
-	export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Core"
-	use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
-	use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
-
 	local myconf=(
 		--disable-platform-mic
 		--with-cubelib="${EPREFIX}/usr"