reorganize

2 files changed, 41 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69df1196a144..ac04faddb386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = amitools
 	pkgdesc = Various tools for using AmigaOS programs on other platforms
 	pkgver = 0.7.0
-	pkgrel = 3
-	url = https://github.com/cnvogelg/amitools
+	pkgrel = 4
+	url = https://pypi.org/project/amitools
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cython
-	makedepends = git
 	makedepends = python-build
 	makedepends = python-installer
 	makedepends = python-setuptools
@@ -16,9 +15,7 @@ pkgbase = amitools
 	depends = glibc
 	depends = python
 	depends = python-lhafile
-	provides = amitools
-	conflicts = amitools
-	source = amitools::git+https://github.com/cnvogelg/amitools#tag=v0.7.0
-	sha256sums = SKIP
+	source = amitools-0.7.0.tar.gz::https://files.pythonhosted.org/packages/source/a/amitools/amitools-0.7.0.tar.gz
+	sha256sums = 0a5b6a1a15c317cf7542c467dc7c8e3240f06ace320a597d25793a34c1e8c492
 
 pkgname = amitools
diff --git a/PKGBUILD b/PKGBUILD
index 69719d1f6910..833e4ccfde6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,15 @@
+# Maintainer:
 # Contributor: quellen <lodgerz@gmail.com>
-_pkgname=amitools
+
+_pkgname="amitools"
 pkgname="$_pkgname"
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Various tools for using AmigaOS programs on other platforms"
 arch=('i686' 'x86_64')
 url="https://github.com/cnvogelg/amitools"
 license=('GPL')
+
 depends=(
   'glibc'
   'python'
@@ -14,25 +17,50 @@ depends=(
 )
 makedepends=(
   'cython'
-  'git'
   'python-build'
   'python-installer'
   'python-setuptools'
   'python-setuptools-scm'
   'python-wheel'
 )
-provides=("$_pkgname")
-conflicts=(${provides[@]})
 
-source=("$_pkgname"::"git+$url#tag=v$pkgver")
-sha256sums=('SKIP')
+if [ x"$_pkgname" == x"$pkgname" ] ; then
+  # normal package
+  _pkgsrc="$_pkgname-$pkgver"
+  _module="amitools"
+
+  url="https://pypi.org/project/amitools"
+
+  source+=(
+    "$_pkgname-$pkgver.tar.gz"::"https://files.pythonhosted.org/packages/source/${_module::1}/$_module/$_module-$pkgver.tar.gz"
+  )
+  sha256sums+=(
+    '0a5b6a1a15c317cf7542c467dc7c8e3240f06ace320a597d25793a34c1e8c492'
+  )
+else
+  # x-git package
+  _pkgsrc="$_pkgname"
+
+  makedepends+=('git')
+
+  provides+=("$_pkgname")
+  conflicts+=(${provides[@]})
+
+  source+=("$_pkgname"::"git+$url")
+  sha256sums+=('SKIP')
+
+  pkgver() {
+    cd "$srcdir/$_pkgsrc"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/; s/-/./g; s/^v//'
+  }
+fi
 
 build() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgsrc"
   python -m build --no-isolation --wheel
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgsrc"
   python -m installer --destdir="$pkgdir" dist/*.whl
 }