Update AUR with changes to PKGBUILD

2 files changed, 34 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8db28109b131..0b442f7e48d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = athenaeum-git
 	pkgdesc = A libre replacement for Steam
-	pkgver = r141.668867a
+	pkgver = v0.3.0.r0.668867a
 	pkgrel = 1
 	url = https://gitlab.com/librebob/athenaeum
 	arch = any
-	license = GPL-3.0-or-later
+	license = GPL3
 	makedepends = git
+	makedepends = python-setuptools
 	depends = flatpak
-	depends = python
-	depends = pyqt5-common
 	depends = python-pyqt5
-	depends = python-sip-pyqt5
 	depends = python-peewee
 	depends = python-dateutil
-	depends = qt5-base
 	depends = qt5-svg
 	depends = qt5-quickcontrols2
-	depends = qt5-declarative
-	depends = sqlite
+	provides = athenaeum
+	conflicts = athenaeum
 	source = git+https://gitlab.com/librebob/athenaeum.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = athenaeum-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0889151bec68..5fb788602c96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,40 @@
-# Maintainer: librebob librebob@protonmail.com
+# Maintainer: librebob <librebob at protonmail dot com>
 pkgname=athenaeum-git
-_pkgname=athenaeum
 _pkgdomain=com.gitlab.librebob.Athenaeum
-pkgver=r141.668867a
+pkgver=v0.3.0.r0.668867a
 pkgrel=1
 pkgdesc="A libre replacement for Steam"
-arch=(any)
+arch=('any')
 url="https://gitlab.com/librebob/athenaeum"
-license=('GPL-3.0-or-later')
-depends=('flatpak' 'python' 'pyqt5-common' 'python-pyqt5' 'python-sip-pyqt5' 'python-peewee' 'python-dateutil' 'qt5-base' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-declarative' 'sqlite')
-makedepends=('git')
-
+license=('GPL3')
+depends=('flatpak' 'python-pyqt5' 'python-peewee' 'python-dateutil' 'qt5-svg' 'qt5-quickcontrols2')
+makedepends=('git' 'python-setuptools')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 source=("git+https://gitlab.com/librebob/athenaeum.git")
-md5sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver() {
-    cd $srcdir/$_pkgname
-    # Git, no tags available
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$srcdir/${pkgname%-git}"
+	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
+build() {
+	cd "$srcdir/${pkgname%-git}"
+	python setup.py build
+}
 
 package() {
-  cd $srcdir/$_pkgname
-
-  for i in 32 48 64 96 128 256 512; do
-    install -Dm644 $_pkgname/resources/icons/hicolor/${i}x${i}/$_pkgdomain.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgdomain.png"
-  done
-
-  install -Dm644 $_pkgname/resources/$_pkgdomain.desktop \
-    "$pkgdir/usr/share/applications/$_pkgdomain.desktop"
-
-  install -Dm644 $_pkgname/resources/$_pkgdomain.appdata.xml \
-    "$pkgdir/usr/share/appdata/$_pkgdomain.appdata.xml"
-
-  python setup.py install --root="$pkgdir" --optimize=1 --prefix=/usr
-}
+	cd "$srcdir/${pkgname%-git}"
+	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	for i in 16 32 48 64 96 128 256 512; do
+		install -Dm644 "${pkgname%-git}/resources/icons/hicolor/${i}x${i}/$_pkgdomain.png" \
+			"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgdomain.png"
+	done
+	install -Dm644 "${pkgname%-git}/resources/$_pkgdomain.desktop" \
+		"$pkgdir/usr/share/applications/$_pkgdomain.desktop"
+	install -Dm644 "${pkgname%-git}/resources/$_pkgdomain.appdata.xml" \
+		"$pkgdir/usr/share/appdata/$_pkgdomain.appdata.xml"
+	sed -i 's%#!/usr/bin/python2%#!/usr/bin/python%g' \
+		$pkgdir/usr/lib/python3.7/site-packages/athenaeum/appstream/{store.py,errors.py,utils.py,__init__.py,component.py}
+}
\ No newline at end of file