Rework package, use perl dependencies

2 files changed, 36 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a84c0b0763d5..64f3028b6e8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
 pkgbase = altium2kicad-git
 	pkgdesc = Altium to KiCad converter for PCB and schematics
-	pkgver = r219.f7e739f
-	pkgrel = 4
+	pkgver = r238.f9eb66d
+	pkgrel = 1
 	url = https://github.com/thesourcerer8/altium2kicad
-	arch = i686
-	arch = x86_64
-	arch = armv6
-	arch = armv6h
-	arch = armv7h
+	arch = any
 	license = AGPL3
 	depends = perl
-	conflicts = perl-math-bezier
+	depends = perl-math-bezier
+	depends = perl-math-geometry-planar
 	source = git+https://github.com/thesourcerer8/altium2kicad
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 669f4ee138f4..fe4b79c3bf14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,46 @@
+#shellcheck shell=bash
 # Maintainer: Salamandar <felix@piedallu.me>
 
 _pkgname=altium2kicad
 
 pkgname=${_pkgname}-git
-pkgver=r219.f7e739f
-pkgrel=4
+pkgver=r238.f9eb66d
+pkgrel=1
 pkgdesc="Altium to KiCad converter for PCB and schematics"
-arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
+arch=( 'any' )
 url="https://github.com/thesourcerer8/altium2kicad"
-license=('AGPL3')
-depends=(
-  'perl'
-)
-source=(
-  "git+${url}"
-)
-sha256sums=(
-  'SKIP'
-)
-
-conflicts=( 'perl-math-bezier' )
+license=( 'AGPL3' )
+depends=( 'perl' 'perl-math-bezier' 'perl-math-geometry-planar' )
+source=( "git+${url}" )
+sha256sums=( 'SKIP' )
 
 pkgver() {
-  cd "${_pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$_pkgname"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 build() {
-  :
+    :
 }
 
 package () {
-  cd "${_pkgname}"
-
-  # Install license file
-  install -Dm644 -t "${pkgdir}/usr/share/licenses/${_pkgname}" \
-    "LICENSE"
-
-  # Install readmes
-  install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}" \
-    "README.md" "Tests.md"
-
-  # # Install Freecad macro
-  # install -Dm644 "step2wrl.FCMacro" \
-  #   "${pkgdir}/usr/share/"
-
-  # Install Perl libraries
-  find "Math" -type f -exec \
-    install -Dm644 "{}" "${pkgdir}/usr/lib/perl5/5.30/vendor_perl/{}" \;
-
-  # Install executables
-  install -d "${pkgdir}/usr/bin"
-  for exe in "unpack" "convertpcb" "convertschema" ; do
-    install -Dm755 -t "${pkgdir}/usr/lib/altium2kicad" "${exe}.pl"
-    ln -s "/usr/lib/altium2kicad/${exe}.pl" "${pkgdir}/usr/bin/altium2kicad_${exe}"
-  done
-
+    cd "$_pkgname"
+
+    # Install license file
+    install -Dm644 -t "$pkgdir/usr/share/licenses/$_pkgname" \
+      "LICENSE"
+
+    # Install readmes
+    install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname" \
+      "README.md" "Tests.md"
+
+    # # Install Freecad macro
+    # install -Dm644 "step2wrl.FCMacro" \
+    #   "$pkgdir/usr/share/"
+
+    # Install executables
+    install -d "$pkgdir/usr/bin"
+    for exe in "unpack" "convertpcb" "convertschema" ; do
+        install -Dm755 -t "$pkgdir/usr/lib/altium2kicad" "${exe}.pl"
+        ln -s "/usr/lib/altium2kicad/${exe}.pl" "$pkgdir/usr/bin/altium2kicad_${exe}"
+    done
 }