3.3.3.r17

4 files changed, 73 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b303131edf5..be7dbbcf1b78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,19 @@
 pkgbase = pdftk-git
 	pkgdesc = Command-line tool for working with PDFs
-	pkgver = 3.0.0.r277.31e8eca
+	pkgver = 3.3.3.r17.gd0d4a0b
 	pkgrel = 1
 	url = https://gitlab.com/pdftk-java/pdftk
 	arch = any
-	license = GPL
-	checkdepends = java-hamcrest
-	checkdepends = junit
-	checkdepends = junit-system-rules
-	checkdepends = poppler
+	license = GPL-2.0-or-later
 	makedepends = git
-	makedepends = ant
-	makedepends = bcprov
-	makedepends = java-commons-lang
-	depends = java-runtime-headless
-	optdepends = bcprov: encrypted PDF support
-	optdepends = java-commons-lang: dump_data operation support
-	provides = pdftk
+	makedepends = gradle
+	makedepends = jdk17-openjdk
+	depends = bcprov
+	depends = java-commons-lang
+	depends = java-runtime-headless>=8
+	provides = pdftk=3.3.3
 	conflicts = pdftk
-	source = git+https://gitlab.com/pdftk-java/pdftk.git
-	source = pdftk.sh
-	sha512sums = SKIP
-	sha512sums = deceb38223617296c1cb7b6539632168922d39f8ba3bccb79eefafd3799afe0399429a7e51228fef26a6917170889f298a0ff6b2b9a9b3a3ab8bdaa28ecb739a
+	source = pdftk::git+https://gitlab.com/pdftk-java/pdftk.git
+	sha256sums = SKIP
 
 pkgname = pdftk-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index de3760effe55..21f38ea35b8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,76 @@
-# Maintainer: Jonas Witschel <diabonas@archlinux.org>
-pkgname=pdftk-git
-pkgver=3.0.0.r277.31e8eca
+# Maintainer:
+# Contributor: Jonas Witschel <diabonas@archlinux.org>
+
+# options
+: ${_jrever:=8}
+: ${_jdkver:=17}
+
+: ${_build_git:=true}
+
+unset _pkgtype
+[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git"
+
+# basic info
+_pkgname="pdftk"
+pkgname="$_pkgname${_pkgtype:-}"
+pkgver=3.3.3.r17.gd0d4a0b
 pkgrel=1
-pkgdesc='Command-line tool for working with PDFs'
+pkgdesc="Command-line tool for working with PDFs"
+url="https://gitlab.com/pdftk-java/pdftk"
+license=('GPL-2.0-or-later')
 arch=('any')
-url='https://gitlab.com/pdftk-java/pdftk'
-license=('GPL')
-depends=('java-runtime-headless')
-makedepends=('git' 'ant' 'bcprov' 'java-commons-lang')
-checkdepends=('java-hamcrest' 'junit' 'junit-system-rules' 'poppler')
-optdepends=('bcprov: encrypted PDF support'
-            'java-commons-lang: dump_data operation support')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=("git+$url.git" 'pdftk.sh')
-sha512sums=('SKIP'
-            'deceb38223617296c1cb7b6539632168922d39f8ba3bccb79eefafd3799afe0399429a7e51228fef26a6917170889f298a0ff6b2b9a9b3a3ab8bdaa28ecb739a')
+
+depends=(
+  "bcprov"
+  "java-commons-lang"
+  "java-runtime-headless>=${_jrever:-8}"
+)
+makedepends=(
+  "git"
+  "gradle"
+  "jdk${_jdkver}-openjdk"
+)
+
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "${pkgname%-git}"
-	git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
+  cd "$_pkgsrc"
+  local _tag=$(git tag | sort -rV | head -1)
+  local _version="${_tag#v}"
+  local _revision=$(git rev-list --count --cherry-pick "$_tag"...HEAD)
+  local _hash=$(git rev-parse --short=7 HEAD)
+  printf '%s.r%s.g%s' "${_version:?}" "${_revision:?}" "${_hash:?}"
 }
 
 prepare() {
-	cd "${pkgname%-git}"
-	mkdir lib
-	ln -s /usr/share/java/{bcprov/bcprov,commons-lang/commons-lang,hamcrest-core,junit,junit-system-rules/system-rules}.jar lib
-	# No need for code coverage reports during tests
-	sed -ri '/<\/?jacoco:coverage>/d' build.xml
+  [ -n "$_jdkver" ] && export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
+  [ -n "$_jdkver" ] && export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
+  :
 }
 
 build() {
-	cd "${pkgname%-git}"
-	ant jar
+  cd "$_pkgsrc"
+  gradle -Dorg.gradle.daemon=false build
 }
 
 check() {
-	cd "${pkgname%-git}"
-	ant test-run
+  cd "$_pkgsrc"
+  gradle -Dorg.gradle.daemon=false test
 }
 
 package() {
-	cd "${pkgname%-git}"
-	install -Dm644 build/jar/pdftk.jar -t "$pkgdir/usr/share/java/$pkgname"
-	install -Dm644 pdftk.1 -t "$pkgdir/usr/share/man/man1"
-	install -Dm755 "$srcdir/pdftk.sh" "$pkgdir/usr/bin/pdftk"
+  cd "$_pkgsrc"
+  install -Dm644 build/libs/pdftk.jar -t "$pkgdir/usr/share/java/$_pkgname"
+  install -Dm644 pdftk.1 -t "$pkgdir/usr/share/man/man1"
+
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/pdftk" <<END
+#!/usr/bin/env bash
+CP='/usr/share/java/bcprov/bcprov.jar:/usr/share/java/commons-lang/commons-lang.jar:/usr/share/java/$_pkgname/pdftk.jar'
+exec /usr/bin/java -cp "\$CP" com.gitlab.pdftk_java.pdftk "\$@"
+END
 }
diff --git a/pdftk.sh b/pdftk.sh
deleted file mode 100755
index 53a6286d4a3a..000000000000
--- a/pdftk.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-CP='/usr/share/java/bcprov/bcprov.jar:/usr/share/java/commons-lang/commons-lang.jar:/usr/share/java/pdftk-git/pdftk.jar'
-exec /usr/bin/java -cp "$CP" com.gitlab.pdftk_java.pdftk "$@"