From 1cbc3d0746dee8720f29ad2c2ad3a15883c5a70a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 3 Sep 2020 17:29:55 +1000
Subject: [PATCH] apache-jmeter: update to 5.3, remove noarch.

---
 srcpkgs/apache-jmeter/template | 37 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/apache-jmeter/template b/srcpkgs/apache-jmeter/template
index 73f8f06fd96..d89be6346d2 100644
--- a/srcpkgs/apache-jmeter/template
+++ b/srcpkgs/apache-jmeter/template
@@ -1,43 +1,40 @@
 # Template file for 'apache-jmeter'
 pkgname=apache-jmeter
-version=5.1.1
-revision=2
-hostmakedepends="openjdk8 apache-ant"
+version=5.3
+revision=1
+hostmakedepends="openjdk8 gradle"
 depends="virtual?java-runtime"
 short_desc="Application to load test functional behavior and measure performance"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://jmeter.apache.org/"
-distfiles="http://apache.osuosl.org//jmeter/source/apache-jmeter-${version}_src.tgz"
-checksum=133fee3ccc300c759b5fbba4dd870db8e69aa0f72eca080fb37a8fb56c6caf6b
-broken="http://apache.osuosl.org//jmeter/source/apache-jmeter-5.1.1_src.tgz: Not Found"
-
-do_configure() {
-	ant download_jars
-}
+distfiles="http://apache.osuosl.org/jmeter/source/apache-jmeter-${version}_src.tgz"
+checksum=727d7c0cf2b72c0c3983c603a6700df7b797dbcbf19dcd7fa2aa457627324ff0
 
 do_build() {
-	ant install
+	# Tests fail -- they are too dependent on networking environment
+	gradle -PchecksumIgnore -x test createDist
 }
 
 do_install() {
-	rm -Rf src test build bin/testfiles
+	rm -rf build.gradle.kts buildSrc gradle* LICENSE licenses NOTICE \
+	 settings.gradle.kts *.md
+
+	vmkdir usr/share/doc/apache-jmeter
+	vcopy xdocs/* usr/share/doc/apache-jmeter
+	rm -rf xdocs
 
-	vlicense LICENSE
-	vmkdir /usr/libexec/apache-jmeter
-	vcopy . /usr/libexec/apache-jmeter
+	vmkdir usr/libexec/apache-jmeter
+	vcopy * usr/libexec/apache-jmeter
 
-	vmkdir /usr/bin
+	vmkdir usr/bin
 	ln -s /usr/libexec/apache-jmeter/bin/jmeter ${DESTDIR}/usr/bin/jmeter
 }
 
 apache-jmeter-doc_package() {
-	archs=noarch
 	short_desc+=" - documentation"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove /usr/libexec/apache-jmeter/xdocs
-		vmove /usr/libexec/apache-jmeter/docs
-		vmove /usr/libexec/apache-jmeter/printable_docs
+		vmove usr/share/doc
 	}
 }