cleanup

2 files changed, 25 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41e4fd41b948..6fa7caab09c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,34 @@
 pkgbase = foobnix-git
-	pkgdesc = Music player for Linux
-	pkgver = 3.1.r113.8ce2d8c2
+	pkgdesc = GTK+ music player
+	pkgver = 3.1.r143.88804cc7
 	pkgrel = 1
 	url = http://www.foobnix.com
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = python2-distutils-extra
-	depends = python2-chardet
-	depends = python2-cairo
-	depends = python2-simplejson
-	depends = python2-mutagen
+	makedepends = git
+	depends = python-chardet
+	depends = python-simplejson
+	depends = python-mutagen
 	depends = gst-plugins-good
 	depends = gst-plugins-base
-	depends = gst-python2
-	depends = webkitgtk
+	depends = gst-python
+	depends = webkit2gtk
 	depends = libkeybinder3
-	depends = gettext
 	depends = gst-plugins-bad
 	depends = gst-plugins-ugly
 	depends = gst-libav
 	depends = fuseiso
-	depends = python2-notify
+	depends = libnotify
 	depends = lame
 	depends = faac
-	depends = python2-keybinder2
+	depends = python3-keybinder
 	depends = ffmpeg
-	depends = python2-dbus
+	depends = python-dbus
+	optdepends = python-pylast: Last.FM support
 	provides = foobnix
 	conflicts = foobnix
-	source = git+https://github.com/foobnix/foobnix
+	source = git+https://github.com/foobnix/foobnix.git
 	sha256sums = SKIP
 
 pkgname = foobnix-git
diff --git a/PKGBUILD b/PKGBUILD
index 42f030e3151d..a6636a1e57b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,21 @@
-# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+# Maintainer:
+# Contributor: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=foobnix-git
-pkgver=3.1.r113.8ce2d8c2
+pkgver=3.1.r143.88804cc7
 pkgrel=1
-pkgdesc="Music player for Linux"
+pkgdesc="GTK+ music player"
 arch=('i686' 'x86_64')
 url="http://www.foobnix.com"
 license=('GPL3')
-depends=('python2-chardet' 'python2-cairo' 'python2-simplejson' 'python2-mutagen'
-		'gst-plugins-good' 'gst-plugins-base' 'gst-python2' 'webkitgtk' 'libkeybinder3' 'gettext'
-		'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'fuseiso' 'python2-notify' 'lame' 'faac'
-		'python2-keybinder2' 'ffmpeg' 'python2-dbus')
-makedepends=('python2-distutils-extra')
+depends=('python-chardet' 'python-simplejson' 'python-mutagen' 'gst-plugins-good'
+         'gst-plugins-base' 'gst-python' 'webkit2gtk' 'libkeybinder3' 'gst-plugins-bad'
+         'gst-plugins-ugly' 'gst-libav' 'fuseiso' 'libnotify' 'lame' 'faac'
+         'python3-keybinder' 'ffmpeg' 'python-dbus')
+makedepends=('git')
+optdepends=('python-pylast: Last.FM support')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/foobnix/foobnix')
+source=('git+https://github.com/foobnix/foobnix.git')
 sha256sums=('SKIP')
 
 pkgver() {
@@ -21,12 +23,7 @@ pkgver() {
 	printf "%s" "$(git describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
-build() {
-	cd "$srcdir/${pkgname%-git}"
-	python2 setup.py build
-}
-
 package() {
 	cd "$srcdir/${pkgname%-git}"
-	python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	python setup.py install --root="$pkgdir/" --optimize=1
 }