diff --git a/dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2.ebuild b/dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2-r1.ebuild
similarity index 96%
rename from dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2.ebuild
rename to dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2-r1.ebuild
index 5e06d820e..de51fa127 100644
--- a/dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2.ebuild
+++ b/dev-util/AndroidProjectCreator-bin/AndroidProjectCreator-bin-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 #to add:
 # Fernflower, CFR, Procyon and JEB3
-DEPEND="dev-util/jd-gui-bin
+DEPEND="dev-util/jd-gui
 	dev-util/jadx-bin"
 RDEPEND="|| ( virtual/jre virtual/jdk )"
 
diff --git a/dev-util/jd-gui-bin/Manifest b/dev-util/jd-gui-bin/Manifest
deleted file mode 100644
index 2df26b1a4..000000000
--- a/dev-util/jd-gui-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jd-gui-1.4.3.rpm 2733888 BLAKE2B 165b3c1e36372c068f4cf6066118f369ca7d7eaad3b2ed96b612c082570950967ed56460ec5499bef42553568344b5d96b8ec890749193859dc796853e0d2f16 SHA512 583818e14d5cbd98575a2d48275687d9e251234aa86ccccd2a22a0465663939309a0506bda223e74df448d3f1a998eb8e0f2f247029d178a242a4af180fa2c01
-DIST jd-gui-1.5.0.jar 2965701 BLAKE2B 030b68f3448e39cd74dd1c2b65a597ce54800f6ca7407cb6926b4c4ded6ff95f23aef0620873e8cbc1fa43455ffbde65579c517912e29f70aa516adf18d40f19 SHA512 5fc66897e65eed86d7edbf134df16d4a0d2220e5149380207270d7489ee5952a4eb7fa5707c900111ef550d1756f7384bd7bd7f034d923eca30467b180c96184
diff --git a/dev-util/jd-gui-bin/files/jd-gui.desktop b/dev-util/jd-gui-bin/files/jd-gui.desktop
deleted file mode 100644
index 3d14ab436..000000000
--- a/dev-util/jd-gui-bin/files/jd-gui.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Comment=Java Decompiler JD-GUI
-Terminal=false
-Name=JD-GUI
-Exec=java -jar /opt/jd-gui/jd-gui.jar
-Type=Application
-Icon=jd-gui
diff --git a/dev-util/jd-gui-bin/files/jd_icon_128.png b/dev-util/jd-gui-bin/files/jd_icon_128.png
deleted file mode 100644
index b29e5a9f9..000000000
Binary files a/dev-util/jd-gui-bin/files/jd_icon_128.png and /dev/null differ
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.4.3.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.4.3.ebuild
deleted file mode 100644
index 733f177cc..000000000
--- a/dev-util/jd-gui-bin/jd-gui-bin-1.4.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="jd-gui"
-MY_P="jd-gui-${PV}"
-
-inherit eutils multilib rpm
-
-DESCRIPTION="A standalone graphical utility that displays Java source codes of .class file"
-HOMEPAGE="http://jd.benow.ca/"
-SRC_URI="https://github.com/java-decompiler/jd-gui/releases/download/v${PV}/${MY_P}.rpm"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/opt/jd-gui"
-
-src_install() {
-	dodir /opt/"${MY_PN}"
-	insinto /opt/"${MY_PN}"
-	doins "${MY_P}.jar"
-
-	doicon jd_icon_128.png
-	domenu jd-gui.desktop
-
-	echo -e "#!/bin/sh\njava -jar /opt/${MY_PN}/${MY_P}.jar >/dev/null 2>&1 &\n" > "${MY_PN}"
-	dobin "${MY_PN}"
-}
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild
deleted file mode 100644
index 175fc313c..000000000
--- a/dev-util/jd-gui-bin/jd-gui-bin-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="jd-gui"
-MY_P="${MY_PN}-${PV}"
-
-inherit desktop
-
-DESCRIPTION="A standalone Java Decompiler GUI"
-HOMEPAGE="http://jd.benow.ca/"
-SRC_URI="https://github.com/java-decompiler/jd-gui/releases/download/v${PV}/${MY_P}.jar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/jre"
-DEPEND="${RDEPEND}
-	!dev-util/jd-gui"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	dodir "${S}"
-	cp -L "${DISTDIR}/${A}" "${S}/" || die
-}
-
-src_install() {
-	dodir /opt/"${MY_PN}"
-	insinto /opt/"${MY_PN}"
-	doins "${MY_P}.jar"
-
-	doicon "${FILESDIR}/jd_icon_128.png"
-	domenu "${FILESDIR}/jd-gui.desktop"
-
-	echo -e "#!/bin/sh\njava -jar /opt/${MY_PN}/${MY_P}.jar >/dev/null 2>&1 &\n" > "${MY_PN}"
-	dobin "${MY_PN}"
-}
diff --git a/pentoo/pentoo-rce/pentoo-rce-2019.1-r2.ebuild b/pentoo/pentoo-rce/pentoo-rce-2019.1-r3.ebuild
similarity index 92%
rename from pentoo/pentoo-rce/pentoo-rce-2019.1-r2.ebuild
rename to pentoo/pentoo-rce/pentoo-rce-2019.1-r3.ebuild
index 7e684f85e..ba311c9f0 100644
--- a/pentoo/pentoo-rce/pentoo-rce-2019.1-r2.ebuild
+++ b/pentoo/pentoo-rce/pentoo-rce-2019.1-r3.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 arm x86"
 PDEPEND="hardened? ( sys-apps/paxctl )
 	sys-devel/gdb
 	dev-util/redasm
-	|| ( dev-util/jd-gui dev-util/jd-gui-bin )
+	dev-util/jd-gui
 	dev-util/jadx-bin
 	pentoo-full? (
 		dev-util/ghidra