From 2fe99a534e6b3c09997d951cc18b9e912ba08b45 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Sat, 26 Sep 2015 08:33:58 +0800
Subject: [PATCH] jd-gui: fix issue #10

---
 dev-util/jd-gui-bin/Manifest                  |  1 -
 dev-util/jd-gui-bin/jd-gui-bin-0.3.4.ebuild   | 42 -------------------
 ....3.5.ebuild => jd-gui-bin-0.3.5-r1.ebuild} | 15 ++++---
 3 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 dev-util/jd-gui-bin/jd-gui-bin-0.3.4.ebuild
 rename dev-util/jd-gui-bin/{jd-gui-bin-0.3.5.ebuild => jd-gui-bin-0.3.5-r1.ebuild} (82%)

diff --git a/dev-util/jd-gui-bin/Manifest b/dev-util/jd-gui-bin/Manifest
index dfed22ec2..ba606c961 100644
--- a/dev-util/jd-gui-bin/Manifest
+++ b/dev-util/jd-gui-bin/Manifest
@@ -1,2 +1 @@
-DIST jd-gui-0.3.4.linux.i686.tar.gz 1087617 SHA256 de1f70aa0d98bc22b23996cdb2439d2c53804480dc6089dc684ca972b31f1364 SHA512 c14fe7d60cb81c1ed338f4af0ae63e5e1970b72792693322056a057d7b72b0d192f71e18d0366c4cc996ae609d538184db744bd03d62492d8ec68450ea71e77e WHIRLPOOL d690c0a6d94955f413dfc33c831a5fa7e08cd1a2fac5081b90b3b8db58fb204975a1c183505141bdf7edfd599dfd32b8dd4b656ecf487c3034d562089fabb597
 DIST jd-gui-0.3.5.linux.i686.tar.gz 1087841 SHA256 1bb7b12a6072091a434eab98f3f041c1f1e81ec0eeb04022dede0ca485fe3b4b SHA512 17342891e5f7e84317a211429b2f9026284a74a095bfe85ca1053c4ba2eb6aa14675e0722ddb352199fe28c69416cb1c8107704a8364b624970b491a19092855 WHIRLPOOL e221c0699199a28230d1d086b6762ad818a31a4ab2cec701f7ff48f4c36816c274c6523ed95b06b663c98817810c18aaa07e7ea9dc88511bcf19e6252af7c87b
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-0.3.4.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-0.3.4.ebuild
deleted file mode 100644
index e86eeff1c..000000000
--- a/dev-util/jd-gui-bin/jd-gui-bin-0.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-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"
-
-S=${WORKDIR}
-
-#pkg_nofetch() {
-#	einfo "Please download ${P}.linux.i686.tar.gz"
-#	einfo "from ${HOMEPAGE} and place it in ${DISTDIR}"
-#}
-
-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-0.3.5.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
similarity index 82%
rename from dev-util/jd-gui-bin/jd-gui-bin-0.3.5.ebuild
rename to dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
index 07ebcac14..67e023e13 100644
--- a/dev-util/jd-gui-bin/jd-gui-bin-0.3.5.ebuild
+++ b/dev-util/jd-gui-bin/jd-gui-bin-0.3.5-r1.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI="4"
+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"
 
-S=${WORKDIR}
+DEPEND=""
+RDEPEND="x11-libs/gtk+:2[abi_x86_32]"
 
-#pkg_nofetch() {
-#	einfo "Please download ${P}.linux.i686.tar.gz"
-#	einfo "from ${HOMEPAGE} and place it in ${DISTDIR}"
-#}
+S="${WORKDIR}"
 
 src_prepare() {
 	#remove gnome related stuff (nautilus)