Remodel PKGBUILD and surrounding files after [extra] package

- split package
- disabled spice for now, since it doesn't compile for some reason

1 files changed, 123 insertions, 38 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 253c657cd51a..b35b0b184f65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,34 @@
 # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Frederic Bezies <fredbezies@gmail.com>
+# Contributor: Sébastien "Seblu" Luttringer <seblu@seblu.net>
 
-pkgname=qemu-git
+pkgbase=qemu-git
 _gitname=qemu
-pkgver=2.4.r39316.gb041114
+pkgname=('qemu-git'
+         'qemu-block-iscsi-git'
+         'qemu-block-rbd-git'
+         'qemu-block-gluster-git'
+         'libcacard-git')
+pkgver=2.4.r40384.g2d69736
 pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. Git version."
 arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2')
-url="http://wiki.qemu.org/Index.html"
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
-         'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
-         'libgl' 'libpulse' 'libcap-ng' 'libaio' 'libseccomp' 'numactl'
-         'libiscsi' 'spice' 'usbredir' 'dtc' 'snappy' 'ceph' 'lzo' 'libepoxy')
-makedepends=('git' 'texi2html' 'perl' 'python2' 'spice-protocol')
-optdepends=('ovmf: Tianocore UEFI firmware for qemu')
-conflicts=('qemu' 'kvm' 'kvm-git' 'qemu-spice' 'libcacard' 'seabios' 'seabios-git')
-provides=('qemu' 'qemu-kvm' 'qemu-spice' 'libcacard' 'seabios' 'seabios-git')
-backup=('etc/qemu/target-x86_64.conf')
-source=('git://git.qemu.org/qemu.git'
-        '65-kvm.rules'
-        'qemu.install')
+license=('GPL2' 'LGPL2.1')
+url='http://wiki.qemu.org/'
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+             'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+             'libgl' 'libpulse' 'libcap-ng' 'libaio' 'libseccomp'
+             'libiscsi' 'python2'
+             'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy'
+             'dtc' 'libepoxy' 'git' 'texi2html' 'perl' 'numactl')
+source=(git://git.qemu.org/qemu.git
+        65-kvm.rules
+        qemu.install
+        qemu.sysusers)
 sha256sums=('SKIP'
-            '9c8a15c34461a9481a34ca9e0ab4ae3825eabe8fd863227f2445325413cd755c'
-            '9970c3050e8dc6153c5955d018d114f9fcbc091843b85f9e7b247eb28f09ba10')
-install='qemu.install'
-options=('!strip')
+            '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7'
+            '0df69a77645c9a05f98635773666b6212084525d7801ef8382242b06baebe5aa'
+            'dd43e2ef062b071a0b9d0d5ea54737f41600ca8a84a8aefbebb1ff09f978acfb')
 
 pkgver() {
 	cd "${srcdir}/$_gitname"
@@ -35,31 +37,114 @@ pkgver() {
 }
 
 build() {
-	cd $_gitname
-	# qemu vs. make 4 == bad
-  	export ARFLAGS="rv"
-  	# http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  	# gtk gui breaks keymappings at the moment
- 	./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
+  cd $_gitname
+  # qemu vs. make 4 == bad
+  export ARFLAGS="rv"
+  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+  export CFLAGS+=' -fPIC'
+  # gtk gui breaks keymappings at the moment
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
               --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
               --enable-docs --libexecdir=/usr/lib/qemu \
               --disable-gtk --enable-linux-aio --enable-seccomp \
-              --enable-spice --localstatedir=/var --disable-werror
-  	make V=99
+              --localstatedir=/var --enable-tpm \
+              --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
+  make V=99
 }
 
-package() {
-  cd $_gitname
+package_qemu-git() {
+  pkgdesc='A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. Git version.'
+  depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+           'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
+           'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
+           'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
+           'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
+  backup=('etc/qemu/target-x86_64.conf')
+  optdepends=('ovmf: Tianocore UEFI firmware for qemu'
+              'samba: SMB/CIFS server support'
+              'qemu-block-iscsi: iSCSI block support'
+              'qemu-block-rbd: RBD block support'
+              'qemu-block-gluster: glusterfs block support')
+  conflicts=('qemu' 'kvm' 'kvm-git' 'qemu-spice' 'seabios' 'seabios-git')
+provides=('qemu' 'qemu-kvm' 'qemu-spice' 'seabios' 'seabios-git')
+
+  options=(!strip)
+  install=qemu.install
 
-  make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+  make -C $_gitname DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+
+  cd "${pkgdir}"
   # remove conflicting /var/run directory
-  rm -r "${pkgdir}/var"
-  install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+  rm -r var
+
+  # systemd stuff
+  install -D -m644 "${srcdir}/65-kvm.rules" usr/lib/udev/rules.d/65-kvm.rules
+  install -D -m644 "${srcdir}/qemu.sysusers" usr/lib/sysusers.d/qemu.conf
+
   # bridge_helper needs suid
   # https://bugs.archlinux.org/task/32565
-  chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
+  chmod u+s usr/lib/qemu/qemu-bridge-helper
+
   # add sample config
-  mkdir -p ${pkgdir}/etc/qemu/
-  echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
+  echo 'allow br0' > etc/qemu/bridge.conf.sample
+
+  # manual striping in scripts directory
+  find usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null|while read binary ; do
+      case "$(file -bi "$binary")" in
+        *application/x-executable*) # Binaries
+        /usr/bin/strip $STRIP_BINARIES "$binary";;
+      esac
+    done
+
+  # remove libcacard files
+  rm -r usr/include/cacard
+  rm usr/lib/libcacard*
+  rm usr/lib/pkgconfig/libcacard.pc
+  rm usr/bin/vscclient
+
+  # remove splitted block modules
+  rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
 }
+
+package_libcacard-git() {
+  pkgdesc='Common Access Card (CAC) Emulation. Git version.'
+  depends=('glibc' 'nss' 'nspr' 'glib2')
+  conflicts=(libcacard)
+  provides=(libcacard)
+
+  cd "${pkgdir}"
+  install -d usr/{bin,lib/pkgconfig,include/cacard}
+  cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
+  cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
+  cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
+  cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
+}
+
+package_qemu-block-iscsi-git() {
+  pkgdesc='QEMU iSCSI block module. Git version.'
+  depends=('glibc' 'glib2' 'libiscsi')
+  conflicts=(qemu-block-iscsi)
+  provides=(qemu-block-iscsi)
+
+  install -D qemu-${pkgver}/block-iscsi.so "${pkgdir}"/usr/lib/qemu/block-iscsi.so
+}
+
+package_qemu-block-rbd-git() {
+  pkgdesc='QEMU RBD block module. Git version.'
+  depends=('glibc' 'glib2' 'ceph')
+  conflicts=(qemu-block-rbd)
+  provides=(qemu-block-rbd)
+
+  install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
+}
+
+package_qemu-block-gluster-git() {
+  pkgdesc='QEMU GlusterFS block module. Git version.'
+  depends=('glibc' 'glib2' 'glusterfs')
+  conflicts=(qemu-block-gluster)
+  provides=(qemu-block-gluster)
+
+  install -D qemu-${pkgver}/block-gluster.so "${pkgdir}"/usr/lib/qemu/block-gluster.so
+}
+
+# vim:set ts=2 sw=2 et: