diff --git a/dev-util/dex2jar/Manifest b/dev-util/dex2jar/Manifest
index 950815d32..32ac5741d 100644
--- a/dev-util/dex2jar/Manifest
+++ b/dev-util/dex2jar/Manifest
@@ -1,3 +1,2 @@
-DIST dex2jar-2.2_pre20211031.zip 5650065 BLAKE2B e70292592bb94a9aea474737d57517c902839b291592907869850346181649ddc248e3010cbb62e914a5f999c4d47a70820b04f6b9991fb2f38b3a859d6f2f42 SHA512 8eab8707baf7a9ab568fdc04f8c475dd8332e7b13d7945a4be554c7e7c912f6f720b72ca063c325304ef561efd7c151cb7dadc657c0865af8b2d1b70c88ded7a
 DIST dex2jar-2.3.zip 5662415 BLAKE2B 100589ba07ca4b542d5928ae143e044ed85b387f672881f3ca2af1163434678717da68a89ac43c9866c45401ee3207381a4bae126a6febb5c56669c797074bf3 SHA512 227f2f15c69f5563c848afc5e3965c1d4213d860b89ea1b04ae621b929d7500c6d260750038a3849f66da943cd77b1ed76715eb15d9e05ead4a2e83a62a6acc0
 DIST dex2jar-2.4.zip 19105975 BLAKE2B bbda5e123bdf500ff736fb38424002d41162ed1e5be34116e5722723ef13ea908ede4d8a3079bc1a376b1e47c985b0cd54ea5927edf774d1414d300de616a571 SHA512 8c1381920293195fba5ec4f9934d1cb0254cf94ef1dfb420519cf3da364c7e25fed7da7736692f36d3d068bdbbb46884d890ff43626b1b521823206f4666fc4f
diff --git a/dev-util/dex2jar/dex2jar-2.2_pre20211031.ebuild b/dev-util/dex2jar/dex2jar-2.2_pre20211031.ebuild
deleted file mode 100644
index f384094ed..000000000
--- a/dev-util/dex2jar/dex2jar-2.2_pre20211031.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="2.2-SNAPSHOT-2021-10-31"
-
-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/v${MY_PV}/dex-tools-${MY_PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="|| ( virtual/jre virtual/jdk )"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/dex-tools-2.2-SNAPSHOT"
-
-src_prepare() {
-	rm *.bat
-	chmod a+x *.sh
-	rm *.txt
-	cd lib
-	rm *.txt
-
-	eapply_user
-}
-
-src_install() {
-	dodir /opt/"${PN}"
-	cp -R "${S}"/* "${ED}/opt/${PN}" || die "Install failed!"
-	for i in *.sh; do
-		dosym "${EPREFIX}/opt/${PN}/${i}" "/usr/bin/${i##*/}"
-	done
-}
diff --git a/dev-util/dex2jar/dex2jar-2.3.ebuild b/dev-util/dex2jar/dex2jar-2.3.ebuild
index 3be09cc12..a41b15142 100644
--- a/dev-util/dex2jar/dex2jar-2.3.ebuild
+++ b/dev-util/dex2jar/dex2jar-2.3.ebuild
@@ -10,7 +10,6 @@ SRC_URI="https://github.com/pxb1988/dex2jar/releases/download/v${PV}/dex2jar-v2.
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
 RDEPEND="|| ( virtual/jre virtual/jdk )"
 BDEPEND="app-arch/unzip"
@@ -31,6 +30,6 @@ src_install() {
 	dodir /opt/"${PN}"
 	cp -R "${S}"/* "${ED}/opt/${PN}" || die "Install failed!"
 	for i in *.sh; do
-		dosym "${EPREFIX}/opt/${PN}/${i}" "/usr/bin/${i##*/}"
+		dosym -r "/opt/${PN}/${i}" "/usr/bin/${i##*/}"
 	done
 }
diff --git a/dev-util/dex2jar/dex2jar-2.4.ebuild b/dev-util/dex2jar/dex2jar-2.4.ebuild
index 765ab1baf..0cc945b72 100644
--- a/dev-util/dex2jar/dex2jar-2.4.ebuild
+++ b/dev-util/dex2jar/dex2jar-2.4.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 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/v2.4/dex-tools-v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/pxb1988/dex2jar/releases/download/v${PV}/dex-tools-v${PV}.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
 RDEPEND="|| ( virtual/jre virtual/jdk )"
 BDEPEND="app-arch/unzip"
@@ -31,6 +30,6 @@ src_install() {
 	dodir /opt/"${PN}"
 	cp -R "${S}"/* "${ED}/opt/${PN}" || die "Install failed!"
 	for i in *.sh; do
-		dosym "${EPREFIX}/opt/${PN}/${i}" "/usr/bin/${i##*/}"
+		dosym -r "/opt/${PN}/${i}" "/usr/bin/${i##*/}"
 	done
 }
diff --git a/dev-util/dex2jar/metadata.xml b/dev-util/dex2jar/metadata.xml
index ace7c2d3a..8926727f8 100644
--- a/dev-util/dex2jar/metadata.xml
+++ b/dev-util/dex2jar/metadata.xml
@@ -5,4 +5,7 @@
 		<email>unknown@pentoo.ch</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">pxb1988/dex2jar</remote-id>
+	</upstream>
 </pkgmetadata>