From 33e5279d4106f08d43625b4b8ffafc3541199eec Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@pentoo.ch>
Date: Sun, 23 May 2021 14:18:34 +0800
Subject: [PATCH] dex2jar: fix bin symlink

---
 dev-util/dex2jar/Manifest                     |  1 -
 .../dex2jar/dex2jar-2.1_pre20150601.ebuild    | 35 -------------------
 ...uild => dex2jar-2.1_pre20180402-r1.ebuild} |  8 ++---
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 dev-util/dex2jar/dex2jar-2.1_pre20150601.ebuild
 rename dev-util/dex2jar/{dex2jar-2.1_pre20180402.ebuild => dex2jar-2.1_pre20180402-r1.ebuild} (77%)

diff --git a/dev-util/dex2jar/Manifest b/dev-util/dex2jar/Manifest
index 31f2fe7b5..97c4fafe2 100644
--- a/dev-util/dex2jar/Manifest
+++ b/dev-util/dex2jar/Manifest
@@ -1,2 +1 @@
-DIST dex-tools-2.1-20150601.060031-26.zip 2444873 BLAKE2B d5de1702c203108788af0d19f270c22f38f999a87dc3b9159e7269a8e756ff9fe47520e75c7ff0ac59933e0f5e47e46d699e83f7d40d34fff86cb3c90e604aca SHA512 978968100dd547aa1dc887e2791f12ad75891bae05ae51fc38b93337d772f08007058caaee2519d9f6cc12c50bd57c4c443e53139c1556ee4da5338aa6d28fe7
 DIST dex-tools-2.1-SNAPSHOT-20180327402.zip 5587331 BLAKE2B 49978549f9a6117a31814a08cd7a0be415b9d53ad64e815a7f0b06c95b3920a21ef210d31a762c413381344e533bec2d2f95bd634b6697a1ae2206f3bc29a3b6 SHA512 6e34bda6ba2bc94b40f23f565b4802168125f35b90a642b23119aa3f2e6c415365dc7b6d0b6a219253ea10a5c10142351471f6af9945c4e548e00f15a6767086
diff --git a/dev-util/dex2jar/dex2jar-2.1_pre20150601.ebuild b/dev-util/dex2jar/dex2jar-2.1_pre20150601.ebuild
deleted file mode 100644
index 9525ddf9f..000000000
--- a/dev-util/dex2jar/dex2jar-2.1_pre20150601.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=( $(ver_cut 1-2) )
-MY_PV_PRE="20150601.060031-26"
-
-DESCRIPTION="Tools to work with android .dex and java .class files"
-HOMEPAGE="https://github.com/pxb1988/dex2jar/releases"
-SRC_URI="https://github.com/pxb1988/dex2jar/releases/download/${MY_PV}-nightly-26/dex-tools-${MY_PV}-${MY_PV_PRE}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="|| ( virtual/jre virtual/jdk )"
-
-S="${WORKDIR}/${PN}-${MY_PV}-SNAPSHOT"
-
-src_prepare() {
-	rm *.bat
-	chmod a+x *.sh
-	rm *.txt
-
-	cd lib
-	rm *.txt
-}
-
-src_install() {
-	dodir /opt/"${PN}"
-	cp -R "${S}"/* "${ED}/opt/"${PN}"" || die "Install failed!"
-	for i in *.sh; do
-		dosym ${i} /usr/bin/${i##*/}
-	done
-}
diff --git a/dev-util/dex2jar/dex2jar-2.1_pre20180402.ebuild b/dev-util/dex2jar/dex2jar-2.1_pre20180402-r1.ebuild
similarity index 77%
rename from dev-util/dex2jar/dex2jar-2.1_pre20180402.ebuild
rename to dev-util/dex2jar/dex2jar-2.1_pre20180402-r1.ebuild
index 411767a21..89b266151 100644
--- a/dev-util/dex2jar/dex2jar-2.1_pre20180402.ebuild
+++ b/dev-util/dex2jar/dex2jar-2.1_pre20180402-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pxb1988/dex2jar/files/1867564/${MY_RND_PN}.zip -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="|| ( virtual/jre virtual/jdk )"
@@ -30,8 +30,8 @@ src_prepare() {
 
 src_install() {
 	dodir /opt/"${PN}"
-	cp -R "${S}"/* "${ED}/opt/"${PN}"" || die "Install failed!"
+	cp -R "${S}"/* "${ED}/opt/${PN}" || die "Install failed!"
 	for i in *.sh; do
-		dosym ${i} /usr/bin/${i##*/}
+		dosym "${EPREFIX}/opt/${PN}/${i}" "/usr/bin/${i##*/}"
 	done
 }