diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.5.0.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild
similarity index 95%
rename from dev-util/jd-gui-bin/jd-gui-bin-1.5.0.ebuild
rename to dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild
index f172a9573..175fc313c 100644
--- a/dev-util/jd-gui-bin/jd-gui-bin-1.5.0.ebuild
+++ b/dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild
@@ -17,8 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND="virtual/jre"
+DEPEND="${RDEPEND}
+	!dev-util/jd-gui"
 
 S="${WORKDIR}"
 
diff --git a/pentoo/pentoo-rce/pentoo-rce-2019.1.ebuild b/pentoo/pentoo-rce/pentoo-rce-2019.1-r1.ebuild
similarity index 84%
rename from pentoo/pentoo-rce/pentoo-rce-2019.1.ebuild
rename to pentoo/pentoo-rce/pentoo-rce-2019.1-r1.ebuild
index c50e417f5..716cffbab 100644
--- a/pentoo/pentoo-rce/pentoo-rce-2019.1.ebuild
+++ b/pentoo/pentoo-rce/pentoo-rce-2019.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="Pentoo RCE meta ebuild"
 HOMEPAGE="http://www.pentoo.ch"
@@ -13,7 +12,7 @@ KEYWORDS="amd64 arm x86"
 
 PDEPEND="hardened? ( sys-apps/paxctl )
 	sys-devel/gdb
-	dev-util/jd-gui-bin
+	|| ( dev-util/jd-gui dev-util/jd-gui-bin )
 	dev-util/jadx-bin
 
 	pentoo-full? (