diff --git a/dev-java/jd-core/Manifest b/dev-java/jd-core/Manifest
index e96ef7270..dd2cec200 100644
--- a/dev-java/jd-core/Manifest
+++ b/dev-java/jd-core/Manifest
@@ -1 +1,2 @@
 DIST jd-core-1.0.5.tar.gz 772979 BLAKE2B c29f07ca99bc50f93aeca6bb03b315522d24997b73219aaad01937cc2bfc1f3a716dc8561386f9e1780f7becbe49c07c1d5063c148235171d7c623f6ee5dc173 SHA512 8389024bd7b6b4df41f3415e882ee70f464664061050153c056dbf6bf67ae1a19941739656a98c4e458d64c3c6e500575943c09bc669c9bcefc9f18f09672043
+DIST jd-core-1.0.6.tar.gz 783111 BLAKE2B 4b5a2c41866c00c8b9ab30ae4821ea11e67920fde9a6d86038d44b946c5c5046aad4495774749c173559399650ffb55bb871ff5a4caced75c8273915f65f2ce0 SHA512 fe32e74bc8651a4aa67240fe799c96d4e84183fe698ab209ace8d0a87b89299922efcf7aed0768f4abef45248849cc7c8f4810229149cb8d0c562cbf2fbefb56
diff --git a/dev-java/jd-core/jd-core-1.0.6.ebuild b/dev-java/jd-core/jd-core-1.0.6.ebuild
new file mode 100644
index 000000000..1d79b601e
--- /dev/null
+++ b/dev-java/jd-core/jd-core-1.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JD-Core is a JAVA decompiler written in JAVA"
+HOMEPAGE="http://jd.benow.ca/"
+SRC_URI="https://github.com/java-decompiler/jd-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/jre"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.8.0"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java/org/jd/core/v1"
+
+#java_prepare() {
+#src_prepare() {
+#java-utils-2_src_prepare
+java-pkg-2_src_prepare(){
+	local base_dir="target/classes/"
+	[[ ! -d "${base_dir}" ]] && mkdir -p "${base_dir}META-INF"
+#Main-Class: ${MAIN_CLASS}" \
+	echo "Manifest-Version: 1.0
+JD-Core-Version: ${PV}" \
+		>> "${base_dir}META-INF/MANIFEST.MF"
+	default
+}
diff --git a/dev-util/jd-gui/Manifest b/dev-util/jd-gui/Manifest
index 9480b0bf3..591e44119 100644
--- a/dev-util/jd-gui/Manifest
+++ b/dev-util/jd-gui/Manifest
@@ -4,3 +4,5 @@ DIST jd-gui-1.6.0-dependencies.tar.gz 13517862 BLAKE2B 7654cfb67193c8efb6e465367
 DIST jd-gui-1.6.0.tar.gz 337609 BLAKE2B 8022ee483176929f102d99069e1b7e6564f2f7b11d662885ae83c8d8b3fb29ecc6259ee6384a031679a802778484298c5d5846a8910b9c09ee8e5eddf1a0b0e9 SHA512 3a4df46667cd708d961e1f6811d4c75e7929f97a7fa15460f540146c3398e6bc5fb9a9cf5e6b123a3322478f3053cd569480663dbcd002c360811523f84cf621
 DIST jd-gui-1.6.1-dependencies.tar.gz 13516887 BLAKE2B 2e79062261e7a6792c0ac3deae363c5ce92695fb5d7e89c74da857b1cdc85af0d78fc6ffd691bc95c71f970b97884280d814af8a019124ff04f2f5edf93f91cb SHA512 09f92e7118b1f3635b70e6eb847e1294f1a1340e3a3e5c5ba373098efaab28b95fbc08ce28bef75fba2aa025fbfdb881f66103bc7ccad97d9114dba6ef327406
 DIST jd-gui-1.6.1.tar.gz 337719 BLAKE2B a6fecb07fdbd879ff34feea1d7ab7642404dbde8f94c2e8ad86ec68601fde6667589300ede6a1136fad903b85e93e17967c537392b3a3821cf2781835c252575 SHA512 868090572b73f5f6755af16ca94d0ac10f7cccd4cf476525c56f97126694608db07ab9397651764f770e7d8c34e569cd156d7160f9db37a3c71fb2d86526275c
+DIST jd-gui-1.6.2-dependencies.tar.gz 13510602 BLAKE2B 97f3370db436bcd6be8ce52fa40f5183e8634c6c922a35e3272d3ee77920fa3ed0105e2a68e77ecc63ae2a87a66f9ab170d4a6456a14d59144ce8574976473eb SHA512 f4b9cf4728e50b0dc47450cc7bce18d3dc56a1684066333038db1a63a283e58f2384d132b8abfc49e8dd7b368a49b741df39cc44a3dcb024afc1d5ba56ec8466
+DIST jd-gui-1.6.2.tar.gz 338499 BLAKE2B 43e2497390d34895a1036a0da2c2d18000b583e4c2ed70eb14399a2bdc7321c6bfadfddda9632febfb810d2f4e9e399af6734160024a67818b79ad3d17c5c759 SHA512 4ef8158b16558d5102c9d77459d4f456a6250844ceefe385ad70b9d2ee2285aea32ed51001960c25f6949c34d5616bbbad5604a4df6dc5d33f5bfe35bf468449
diff --git a/dev-util/jd-gui/jd-gui-1.6.2.ebuild b/dev-util/jd-gui/jd-gui-1.6.2.ebuild
new file mode 100644
index 000000000..a2163c835
--- /dev/null
+++ b/dev-util/jd-gui/jd-gui-1.6.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="A standalone Java Decompiler GUI"
+HOMEPAGE="http://jd.benow.ca/"
+SRC_URI="https://github.com/java-decompiler/jd-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.pentoo.ch/~blshkv/distfiles/${P}-dependencies.tar.gz"
+
+# run: pentoo/scripts/gradle_dependencies.py from "${S}" directory to generate dependencies
+# tar cvzf ./${P}-dependencies.tar.gz ./dependencies/
+#FIXME: gradle convert to publishToMavenLocal and mavenLocal()
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="virtual/jre"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-11
+	dev-java/gradle-bin:5.2.1
+	!dev-util/jd-gui-bin"
+
+src_prepare() {
+	eapply "${FILESDIR}"/1.5.2-build.patch
+
+	mkdir -p ".gradle/init.d"
+	cp "${FILESDIR}"/1.5.2-repos.gradle .gradle/init.d/repos.gradle    || die "cp failed"
+	sed -i "s|WORK_DIR|${WORKDIR}|g" .gradle/init.d/repos.gradle || die "sed failed"
+
+
+	sed -i "s|WORK_DIR|${WORKDIR}|g" build.gradle || die "sed failed"
+	eapply_user
+}
+
+src_compile() {
+	GRADLE="gradle-5.2.1 --gradle-user-home .gradle --console rich --no-daemon"
+	GRADLE="${GRADLE} --offline"
+	${GRADLE} jar -x check -x test || die
+}
+
+src_install() {
+	insinto /usr/share/"${PN}"
+	doins "build/libs/${P}.jar"
+
+	doicon ./src/linux/resources/jd_icon_128.png
+	domenu ./src/linux/resources/jd-gui.desktop
+
+	echo -e "#!/bin/sh\njava -jar /usr/share/${PN}/${P}.jar >/dev/null 2>&1 &\n" > "${PN}"
+	dobin "${PN}"
+}