Refactor whole PKGBUILD

3 files changed, 34 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 992bc6182292..3f9bd744b12a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = visicut-git
-	pkgdesc = a userfriendy, platform-independent tool for preparing, saving and sending jobs to Lasercutters, from git master
-	pkgver = 1.8.r65.5e579108
+	pkgdesc = A user-friendy, platform-independent tool for preparing, saving and sending jobs to laser cutters.
+	pkgver = 2.0.r7.g4054819
 	pkgrel = 1
 	url = https://visicut.org/
 	arch = any
-	license = LGPL
-	makedepends = ant>=1.10.5
+	license = LGPL-3.0-or-later
+	makedepends = maven
 	makedepends = git
-	optdepends = ant: Java Building tool
+	depends = java-runtime=11
 	provides = visicut
-	conflicts = visicut
-	source = VisiCut.git::git://github.com/t-oster/VisiCut.git
-	validpgpkeys = DF29C7472CA45E978A05883A69EBE9F6052F7F81
+	source = visicut-git::git+https://github.com/t-oster/VisiCut.git
 	md5sums = SKIP
 
 pkgname = visicut-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8ad99253638b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg
+/src
+/visicut-git
+/*.tar
diff --git a/PKGBUILD b/PKGBUILD
index b759aa0248e0..c1f629d05413 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,34 @@
-
-# Maintainer: Lukas Harbauer <lukas.harbauer@mailbox.org>
+# Maintainer: Visne <visne2 at proton dot me>
+# Contributor: Lukas Harbauer <lukas.harbauer@mailbox.org>
 pkgname=visicut-git
-pkgver=1.8.r65.5e579108
+pkgver=2.0.r7.g4054819
 pkgrel=1
-epoch=
-pkgdesc="a userfriendy, platform-independent tool for preparing, saving and sending jobs to Lasercutters, from git master"
-arch=(any)
-url="https://visicut.org/"
-license=('LGPL')
-groups=()
-depends=()
-makedepends=('ant>=1.10.5'
-             'git')
-checkdepends=()
-optdepends=('ant: Java Building tool')
-provides=(visicut)
-conflicts=(visicut)
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=('VisiCut.git::git://github.com/t-oster/VisiCut.git')
-noextract=()
-md5sums=(SKIP)
-validpgpkeys=(DF29C7472CA45E978A05883A69EBE9F6052F7F81)
-_gitname="VisiCut.git"
+pkgdesc='A user-friendy, platform-independent tool for preparing, saving and sending jobs to laser cutters.'
+arch=('any')
+url='https://visicut.org/'
+license=('LGPL-3.0-or-later')
+depends=('java-runtime=11')
+makedepends=('maven' 'git')
+provides=('visicut')
+source=("$pkgname::git+https://github.com/t-oster/VisiCut.git")
+md5sums=('SKIP')
 
-pkgver(){
-    cd "$_gitname"
-    printf "%s" "$(git describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+pkgver() {
+    cd "$pkgname"
+    git describe --match "[0-9]*" --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
-prepare(){
-    cd "$_gitname"
-    git submodule init
-    git submodule update
+
+prepare() {
+    cd "$pkgname"
+    git submodule update --init --recursive
 }
+
 build() {
-	cd "$_gitname"
-	    make
+    cd "$pkgname"
+    make
 }
 
-#check() {
-#	cd "$pkgname-$pkgver"
-#	make -k check
-#}
-
 package() {
-	cd "$_gitname"
-	make DESTDIR="$pkgdir/" install
+    cd "$pkgname"
+    make DESTDIR="$pkgdir/" install
 }