From 2604dbf2cc255fd4e4cb0df2eb7f08449b9adbf4 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 22 Mar 2019 13:08:07 +0800
Subject: [PATCH] jd-gui-bin: 1.4.1 bump

---
 dev-util/jd-gui-bin/Manifest                  |  4 +-
 .../jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild     | 41 -------------------
 dev-util/jd-gui-bin/jd-gui-bin-1.4.0.ebuild   |  3 +-
 dev-util/jd-gui-bin/jd-gui-bin-1.4.1.ebuild   | 35 ++++++++++++++++
 4 files changed, 38 insertions(+), 45 deletions(-)
 delete mode 100644 dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
 create mode 100644 dev-util/jd-gui-bin/jd-gui-bin-1.4.1.ebuild

diff --git a/dev-util/jd-gui-bin/Manifest b/dev-util/jd-gui-bin/Manifest
index f84ed20e0..845e20e8b 100644
--- a/dev-util/jd-gui-bin/Manifest
+++ b/dev-util/jd-gui-bin/Manifest
@@ -1,2 +1,2 @@
-DIST jd-gui-0.3.5.linux.i686.tar.gz 1087841 SHA256 1bb7b12a6072091a434eab98f3f041c1f1e81ec0eeb04022dede0ca485fe3b4b SHA512 17342891e5f7e84317a211429b2f9026284a74a095bfe85ca1053c4ba2eb6aa14675e0722ddb352199fe28c69416cb1c8107704a8364b624970b491a19092855 WHIRLPOOL e221c0699199a28230d1d086b6762ad818a31a4ab2cec701f7ff48f4c36816c274c6523ed95b06b663c98817810c18aaa07e7ea9dc88511bcf19e6252af7c87b
-DIST jd-gui-1.4.0-0.noarch.rpm 7900421 SHA256 551942cba60e60c9c9e1686529d59d45123a9de7567a8d29a6ea1b21eabc1ae5 SHA512 98e281448f0eb97ac8ece517c6e3fc3d642b41552b2b9db1c20e85ac8628849f4ef47cdd6c8d6ee4a22f694377f2ee7d8bd78715579866d5195fd69266f87d4b WHIRLPOOL ba4ff1fa81b8e7ae1b16a706e6cbe10c94a2e3aa80a86df0a5d3c112e21d11d50f41aef5bba2029cbd69abad7c6240651567c6617d518d78d31b6b2108f97a93
+DIST jd-gui-1.4.0-0.noarch.rpm 7900421 BLAKE2B 7aa136912432cc0ffb9d2323dc7360a68955246c548923cc33e3c08dd63ca13320101f0bfa53497620a3924eb421bece5f928b3d0014e12a7589c85ee89bf598 SHA512 98e281448f0eb97ac8ece517c6e3fc3d642b41552b2b9db1c20e85ac8628849f4ef47cdd6c8d6ee4a22f694377f2ee7d8bd78715579866d5195fd69266f87d4b
+DIST jd-gui-1.4.1.rpm 8832316 BLAKE2B 29b4fa841ef0b0e848ba9709f11ee6da3ea824a2322a2db815f87e115439ce6b9c9409f6d6716c9806483de6986ecb17a4f21e40bf03802523face4e4b270b88 SHA512 32b965027ed2a0ad218fe89179c7f34478dc42949983bfc2f94b849b84af70243e88471310f4bf4fe8be22be9b2a898c3d2dffedc2159e2904810737f34c8ce2
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
deleted file mode 100644
index 67e023e13..000000000
--- a/dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib
-
-DESCRIPTION="A standalone graphical utility that displays Java source codes of .class file"
-HOMEPAGE="http://jd.benow.ca/"
-SRC_URI="http://jd.benow.ca/jd-gui/downloads/jd-gui-${PV}.linux.i686.tar.gz"
-
-LICENSE="Unknown"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="x11-libs/gtk+:2[abi_x86_32]"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	#remove gnome related stuff (nautilus)
-	rm -rf contrib
-}
-
-src_install() {
-	exeinto "/usr/bin"
-	doexe "${WORKDIR}/jd-gui"
-	dodoc readme.txt
-}
-
-pkg_postinst() {
-		einfo "JD-GUI is free for non-commercial use."
-		einfo "This means that JD-GUI shall not be included or embedded into commercial software products. "
-		einfo "Nevertheless, JD-GUI may be freely used for personal needs in a commercial or non-commercial environments."
-		ewarn "JD-GUI creates a jd-gui.cfg file in the current working directory."
-		ewarn "Make sure you run it in a directory you can remove afterwards"
-}
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.4.0.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.4.0.ebuild
index 9fe90a429..5fbab684d 100644
--- a/dev-util/jd-gui-bin/jd-gui-bin-1.4.0.ebuild
+++ b/dev-util/jd-gui-bin/jd-gui-bin-1.4.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -15,7 +14,7 @@ SRC_URI="https://github.com/java-decompiler/jd-gui/releases/download/v${PV}/${MY
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.4.1.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.4.1.ebuild
new file mode 100644
index 000000000..733f177cc
--- /dev/null
+++ b/dev-util/jd-gui-bin/jd-gui-bin-1.4.1.ebuild
@@ -0,0 +1,35 @@
+# 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}"
+}