Rebase PKGBUILD on virt-manager in community and update for python 3

2 files changed, 30 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 825d5006a32f..002eb58b4dc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,66 +1,32 @@
-# Generated by mksrcinfo v8
-# Tue Apr 11 16:26:45 UTC 2017
 pkgbase = virt-manager-git
 	pkgdesc = Console user interface for managing virtual machines
-	pkgver = 1.4.0.r5022.7962672
+	pkgver = 1.5.0.r223.g3bc7ff24
 	pkgrel = 1
 	url = http://virt-manager.org/
 	arch = any
 	license = GPL
-	makedepends = intltool>=0.35.0
-	makedepends = dbus-python
-	makedepends = gtk-vnc
-	makedepends = rarian
-	makedepends = yajl
-	makedepends = librsvg
-	makedepends = libuser
-	makedepends = python2-cairo
-	makedepends = python2-ipy
-	makedepends = newt-syrup
-	makedepends = openbsd-netcat
-	makedepends = x11-ssh-askpass
-	makedepends = graphite
-	makedepends = spice-gtk3
-	makedepends = libvirt-glib
-	makedepends = vte3
 	makedepends = git
-	depends = python2
-	depends = libvirt-python2
-	depends = libxml2
-	depends = libvirt
+	makedepends = intltool
+	makedepends = python-cairo
+	depends = python-gobject
+	depends = libvirt-glib
+	depends = libvirt-python
+	depends = python-requests
 	depends = libosinfo
-	depends = python2-ipaddr
-	depends = python2-gobject
-	depends = python2-requests
-	source = git+https://github.com/virt-manager/virt-manager
-	md5sums = SKIP
+	source = git+https://github.com/virt-manager/virt-manager.git
+	sha512sums = SKIP
 
 pkgname = virt-install-git
 	provides = virt-install
 	conflicts = virt-install
 
 pkgname = virt-manager-git
-	depends = virt-install-git
-	depends = python2
-	depends = libvirt-python2
-	depends = libxml2
-	depends = libvirt
-	depends = python2-requests
-	depends = dbus-python
+	pkgdesc = Desktop user interface for managing virtual machines
+	depends = virt-install-git=1.5.0.r223.g3bc7ff24
+	depends = vte3
 	depends = gtk-vnc
-	depends = rarian
-	depends = yajl
-	depends = librsvg
-	depends = libuser
-	depends = python2-cairo
-	depends = python2-ipy
-	depends = newt-syrup
-	depends = openbsd-netcat
-	depends = x11-ssh-askpass
-	depends = graphite
 	depends = spice-gtk3
-	depends = libvirt-glib
-	depends = vte3
+	depends = python-cairo
 	provides = virt-manager
 	conflicts = virt-manager
 
diff --git a/PKGBUILD b/PKGBUILD
index 02e9081e8739..6d6f01a4c279 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,48 @@
 # $Id$
-# Original Community Repo
-# =======================
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
-# Modificationt to use Git Master Source
-# Maintainer: James Harvey <jamespharvey20@gmail.com>
-#    * This PKGBUILD as closely as possible matches community's virt-manager 1.2.1-1
-#    * All namcap warnings are identical, as of 1.2.1.r4564.466bf92
-
-pkgbase=virt-manager-git
 _pkgbase=virt-manager
+pkgbase=$_pkgbase-git
 pkgname=(virt-install-git virt-manager-git)
-pkgver=1.4.1.r5159.ff3b4dc5
+pkgver=1.5.0.r223.g3bc7ff24
 pkgrel=1
 pkgdesc="Console user interface for managing virtual machines"
 arch=('any')
 url="http://virt-manager.org/"
 license=('GPL')
-depends=('python2' 'libvirt-python2' 'libxml2' 'libvirt'
-	 'libosinfo' 'python2-ipaddr' 'python2-gobject' 'python2-requests')
-makedepends=('intltool>=0.35.0'
-	     'dbus-python' 'gtk-vnc' 'rarian'
-	     'yajl' 'librsvg' 'libuser' 'python2-cairo'
-	     'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass'
-	     'graphite' 'spice-gtk3'
-	     'libvirt-glib' 'vte3' 'git')
-source=("git+https://github.com/${_pkgbase}/${_pkgbase}")
-md5sums=('SKIP')
+depends=('python-gobject' 'libvirt-glib' 'libvirt-python'
+	 'python-requests' 'libosinfo')
+makedepends=('git' 'intltool' 'python-cairo')
+source=("git+https://github.com/virt-manager/virt-manager.git")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgbase}"
-  echo $(cat virtcli/cliconfig.py | grep '^__version__' | sed 's|^__version__ = "||' | sed 's|"$||').r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd "$srcdir/$_pkgbase"
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "$srcdir/$_pkgbase"
-  python2 setup.py build
+  python setup.py build
 }
 
 package_virt-install-git() {
-  conflicts=('virt-install')
   provides=('virt-install')
-
+  conflicts=('virt-install')
   cd "$srcdir/$_pkgbase"
-  python2 setup.py --no-update-icon-cache --no-compile-schemas install --root "$pkgdir"
-  python2 -m compileall "${pkgdir}/usr/share/virt-manager"
-  python2 -O -m compileall "${pkgdir}/usr/share/virt-manager"
+  python setup.py --no-update-icon-cache --no-compile-schemas install --root "$pkgdir"
+  python -m compileall "${pkgdir}/usr/share/virt-manager"
+  python -O -m compileall "${pkgdir}/usr/share/virt-manager"
   rm "${pkgdir}/usr/bin/virt-manager"
 }
 
 package_virt-manager-git() {
-  conflicts=('virt-manager')
+  pkgdesc="Desktop user interface for managing virtual machines"
+  depends=("virt-install-git=$pkgver" 'vte3' 'gtk-vnc' 'spice-gtk3' 'python-cairo')
   provides=('virt-manager')
-  depends=('virt-install-git'
-	    'python2' 'libvirt-python2' 'libxml2' 'libvirt' 'python2-requests'
-	    'dbus-python' 'gtk-vnc' 'rarian'
-	    'yajl' 'librsvg' 'libuser' 'python2-cairo'
-	    'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass'
-	    'graphite' 'spice-gtk3'
-	    'libvirt-glib' 'vte3')
+  conflicts=('virt-manager')
   cd "$srcdir/$_pkgbase"
   install -Dm 755 build/virt-manager -t "${pkgdir}/usr/bin"
 }