From 10f7729c732fd68c6ed5c24c94503ba011aa03c7 Mon Sep 17 00:00:00 2001
From: Jonas Stein <jstein@gentoo.org>
Date: Sun, 5 May 2019 23:58:28 +0200
Subject: [PATCH] dev-util/ghidra: ebuild cleanup

Add missing || die
remove dead code
add variable ${PN}
---
 dev-util/ghidra/ghidra-9.0.2-r1.ebuild | 46 +++++++++++---------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/dev-util/ghidra/ghidra-9.0.2-r1.ebuild b/dev-util/ghidra/ghidra-9.0.2-r1.ebuild
index 384f0c4fe..43f219597 100644
--- a/dev-util/ghidra/ghidra-9.0.2-r1.ebuild
+++ b/dev-util/ghidra/ghidra-9.0.2-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A software reverse engineering framework"
 HOMEPAGE="https://www.nsa.gov/ghidra"
-SRC_URI="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${PV}_build.tar.gz
+SRC_URI="https://github.com/NationalSecurityAgency/${PN}/archive/Ghidra_${PV}_build.tar.gz
 	https://github.com/pxb1988/dex2jar/releases/download/2.0/dex-tools-2.0.zip
 	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar
 	https://sourceforge.net/projects/catacombae/files/HFSExplorer/0.21/hfsexplorer-0_21-bin.zip
 	mirror://sourceforge/yajsw/yajsw/yajsw-stable-12.12.zip
-	https://dev.pentoo.ch/~blshkv/distfiles/ghidra-${PV}-gradle-dependencies.tar.gz"
-#run: pentoo/scripts/gradle_dependencies.py from "${S}" directory to generate dependencies
-#tar cvzf ./ghidra-9.0.2-gradle-dependencies.tar.gz -C /var/tmp/portage/dev-util/ghidra-9.0.2/work ghidra-Ghidra_9.0.2_build/dependencies/
+	https://dev.pentoo.ch/~blshkv/distfiles/${P}-gradle-dependencies.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -20,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=virtual/jdk-1.8
 	dev-java/gradle-bin:5.2.1
 	sys-devel/bison
@@ -28,38 +26,34 @@ DEPEND="${DEPEND}
 	dev-java/oracle-jdk-bin:11
 	app-arch/unzip"
 
-S="${WORKDIR}/ghidra-Ghidra_${PV}_build"
+S="${WORKDIR}/${PN}-Ghidra_${PV}_build"
 
 src_unpack() {
 	#https://github.com/NationalSecurityAgency/ghidra/blob/05ad1aa9f3a28721467ae288be6769f226f7147d/DevGuide.md
 	unpack ${A}
-	mkdir -p "${S}/.gradle/flatRepo"
-	cd "${S}/.gradle"
+	mkdir -p "${S}/.gradle/flatRepo" || die "(1) mkdir failed"
+	cd "${S}/.gradle"                || die "(2) cp failed"
 
 	unpack dex-tools-2.0.zip
-	cp dex2jar-2.0/lib/dex-*.jar ./flatRepo || die "unable to copy some dist files"
+	cp dex2jar-2.0/lib/dex-*.jar ./flatRepo || die "(3) cp failed"
 
-	cp "${DISTDIR}/AXMLPrinter2.jar" ./flatRepo  || die "unable to copy some dist files"
+	cp "${DISTDIR}/AXMLPrinter2.jar" ./flatRepo  || die "(4) cp failed"
 
 	unpack hfsexplorer-0_21-bin.zip
-	cp lib/*.jar ./flatRepo || die "unable to copy some dist files"
+	cp lib/*.jar ./flatRepo            || die "(5) cp failed"
 
-#	cp "${DISTDIR}"/jython-standalone-2.7.1.jar ./flatRepo || die "unable to copy some dist files"
-
-	#/var/tmp/portage/dev-util/ghidra-9.0.2/work/ghidra.bin/Ghidra/Features/GhidraServer/yajsw-stable-12.12.zip'
-	mkdir -p "${WORKDIR}"/ghidra.bin/Ghidra/Features/GhidraServer/
-	cp "${DISTDIR}"/yajsw-stable-12.12.zip "${WORKDIR}"/ghidra.bin/Ghidra/Features/GhidraServer/ || die "unable to copy some dist files"
-
-	cd "${S}"
+	mkdir -p "${WORKDIR}"/ghidra.bin/Ghidra/Features/GhidraServer/ || die "(6) mkdir failed"
+	cp "${DISTDIR}"/yajsw-stable-12.12.zip "${WORKDIR}"/ghidra.bin/Ghidra/Features/GhidraServer/ || die "(7) cp failed"
+	cd "${S}" || die "(8) cd failed"
 }
 
 src_prepare() {
-	sed -i 's|gradle.gradleVersion != "5.0"|gradle.gradleVersion <= "5.0"|g' build.gradle || die 'sed failed'
-	mkdir -p ".gradle/init.d"
-	cp "${FILESDIR}"/repos.gradle .gradle/init.d
-	sed -i "s|S_DIR|${S}|g" .gradle/init.d/repos.gradle
+	sed -i 's|gradle.gradleVersion != "5.0"|gradle.gradleVersion <= "5.0"|g' build.gradle || die "(9) sed failed"
+	mkdir -p ".gradle/init.d"                       || die "(10) mkdir failed"
+	cp "${FILESDIR}"/repos.gradle .gradle/init.d    || die "(11) cp failed"
+	sed -i "s|S_DIR|${S}|g" .gradle/init.d/repos.gradle || die "(12) sed failed"
 	#remove build date so we can unpack dist.zip later
-	sed -i "s|_\${rootProject.BUILD_DATE_SHORT}||g" gradleScripts/distribution.gradle
+	sed -i "s|_\${rootProject.BUILD_DATE_SHORT}||g" gradleScripts/distribution.gradle || die "(13) sed failed"
 	eapply_user
 }
 
@@ -79,8 +73,8 @@ src_install() {
 	#it is easier to unpack existing archive
 	dodir /usr/share
 	unzip build/dist/ghidra_9.0.2_PUBLIC_linux64.zip -d "${ED}"/usr/share/ || die "unable to unpack dist zip"
-	mv "${ED}"/usr/share/ghidra_9.0.2 "${ED}"/usr/share/ghidra
+	mv "${ED}"/usr/share/ghidra_9.0.2 "${ED}"/usr/share/ghidra || die "mv failed"
 	#fixme: add doc flag
-	rm -r  "${ED}"/usr/share/ghidra/docs/
+	rm -r  "${ED}"/usr/share/ghidra/docs/ || die "rm failed"
 	dosym "${EPREFIX}"/usr/share/ghidra/ghidraRun /usr/bin/ghidra
 }