libre/qemu-user-static: updated to 3.1.0

1 files changed, 14 insertions, 21 deletions

diff --git a/libre/qemu-user-static/PKGBUILD b/libre/qemu-user-static/PKGBUILD
index 5080f5f7b..5195ec1b9 100644
--- a/libre/qemu-user-static/PKGBUILD
+++ b/libre/qemu-user-static/PKGBUILD
@@ -19,18 +19,20 @@
 _pkgbase=qemu
 pkgname=(qemu-user-static qemu-user-static-binfmt)
 pkgdesc="A generic and open source machine emulator and virtualizer"
-pkgver=2.12.0
-pkgrel=1.static1
+pkgver=3.1.0
+pkgrel=1
+pkgrel+=.static1
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(GPL2 LGPL2.1)
 url="http://wiki.qemu.org/"
-makedepends=(pixman-static glib2-static pcre-static python2)
+depends=()
+makedepends=(pixman-static python glib2-static pcre-static)
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
         allow_elf64.patch)
-sha256sums=('e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc'
+sha512sums=('7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe'
             'SKIP'
-            '59751f1ed26ea61b2a37ebee4be6979e584a450b611282138a0893aa9173e2e4')
+            'b450625ff1e705f8c7eed9e2c0c4fe2179ca061df88a1a777c861c11d543c151cd0160f7f7227babdfe8b36000de084cbcb6fd7bf0f93d2f936c2e65082c82bf')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
 case $CARCH in
@@ -52,11 +54,13 @@ build() {
   local flags=(
     --static
     --disable-system # disable building qemu-system-$CPU, we only want qemu-$CPU
+    --enable-linux-user
+    --disable-modules
     --disable-guest-agent # disable building qemu-ga
+    --disable-guest-agent-msi
     --disable-tools # disable building the qemu-{io,nbd,img} tools
     --disable-blobs # disable installing firmware files used by system
     --disable-docs
-    --disable-modules # modules imply dynamic linking
 
     # jemalloc-static isn't packaged
     --disable-jemalloc
@@ -92,33 +96,26 @@ _build() (
     --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/qemu \
-    --python=/usr/bin/python2 \
+    --python=/usr/bin/python3 \
     --smbd=/usr/bin/smbd \
-    --with-gtkabi=3.0 \
     --with-sdlabi=2.0 \
     --enable-modules \
     --enable-jemalloc \
     "${@:2}"
 
-  make
+  make V=1
 )
 
 package_qemu-user-static() {
   pkgdesc="QEMU user-mode emulation (static binaries)"
 
-  provides=("qemu-static=$pkgver")
-  replaces=(qemu-static)
-  conflicts=(qemu-static)
-
   make -C build-static DESTDIR="$pkgdir" install "${@:2}"
 
-  rm -vr -- \
-     "$pkgdir"/usr/lib/ \
-     "$pkgdir"/usr/share/
+  rm -fvr -- "$pkgdir"/{var,usr/lib,usr/share}
 
   local prog
   for prog in "$pkgdir"/usr/bin/*; do
-    mv -nT -- "$prog" "${prog%-static}-static"
+    mv -vnT -- "$prog" "${prog%-static}-static"
   done
 }
 
@@ -126,10 +123,6 @@ package_qemu-user-static-binfmt() {
   pkgdesc="binfmt registration for QEMU user-mode emulation"
   depends=("qemu-user-static=$pkgver")
 
-  provides=("binfmt-qemu-static=$pkgver")
-  replaces=('binfmt-qemu-static')
-  conflicts=('binfmt-qemu-static')
-
   cd ${_pkgbase}-${pkgver}
 
   install -d "$pkgdir"/usr/lib/binfmt.d