qemu: update to 1.6.1.

common/shlibs

@@ -1415,3 +1415,4 @@ libgeocode-glib.so.0 geocode-glib-3.10.0_1
 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
 libpotrace.so.0 libpotrace-1.11_1
 libSDL2-2.0.so.0 SDL2-2.0.0_1
+libcacard.so.0 libcacard-1.6.1_1

srcpkgs/libcacard

@@ -0,0 +1 @@
+qemu

srcpkgs/libcacard-devel

@@ -0,0 +1 @@
+qemu

srcpkgs/qemu/template

@@ -1,38 +1,55 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
  --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen --enable-tpm
  --enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs
- --disable-gtk --enable-seccomp --enable-libusb --disable-glusterfs"
+ --disable-gtk --enable-seccomp --enable-libusb --disable-glusterfs
+ --localstatedir=/var"
 short_desc="Open Source Processor Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://qemu.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48
+checksum=fc736f44aa10478223c881310a7e40fc8386547e9cadf7d01ca4685951605294
 
 hostmakedepends="pkg-config perl python automake libtool flex"
 makedepends="attr-devel libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel
  libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 SDL-devel
  libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel
- libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel
+ libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel
  libbluetooth-devel libssh2-devel libusbx-devel pulseaudio-devel"
 
-pre_configure() {
-	sed -e "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g" -i pixman/configure.ac
+pre_build() {
+	sed -e 's,\$(ARFLAGS),rc,' -i dtc/Makefile
 }
 
 post_install() {
 	vinstall ${FILESDIR}/65-kvm.rules 644 usr/lib/udev/rules.d
 	# qemu-bridge-helper must be setuid for non privileged users.
 	chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
-	# Remove devel stuff.
-	rm -rf ${DESTDIR}/usr/{include,lib/pkgconfig,lib/*.a}
 }
 
+libcacard-devel_package() {
+	short_desc="Common Access Card (CAC) Emulation library - development files"
+	depends="nss-devel libcacard>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+libcacard_package() {
+	short_desc="Common Access Card (CAC) Emulation library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+	
 qemu_package() {
 	nostrip=yes
 	conf_files="/etc/qemu/target-x86_64.conf"