drop vulnerable, bug #533286, CVE-2014-8135, CVE-2014-8136
authorMatthias Maier <tamiko@gentoo.org>
Wed, 24 Dec 2014 15:05:15 +0000 (15:05 +0000)
committerMatthias Maier <tamiko@gentoo.org>
Wed, 24 Dec 2014 15:05:15 +0000 (15:05 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

app-emulation/libvirt/ChangeLog
app-emulation/libvirt/Manifest
app-emulation/libvirt/libvirt-1.2.10-r2.ebuild [deleted file]

index 667700736f025bdca2ede477ef002dba4cc20562..f925611db67c9114c57ead4536dc310828db0e1c 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.410 2014/12/24 13:19:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.411 2014/12/24 15:05:04 tamiko Exp $
+
+  24 Dec 2014; Matthias Maier <tamiko@gentoo.org> -libvirt-1.2.10-r2.ebuild:
+  drop vulnerable, bug #533286, CVE-2014-8135, CVE-2014-8136
 
   24 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libvirt-1.2.10-r3.ebuild:
   Stable for x86, wrt bug #533286
index d988cce5ef78904978c7634bf0094daea8f33b7e..f41145b380657fd61a28f7ed32729caca88bbbd5 100644 (file)
@@ -14,26 +14,25 @@ AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0ef
 DIST libvirt-1.2.10-20141223.tar.xz 5012 SHA256 a1d31d12f04631e46748b6dfc6893d20127bd97204415c9642b1af68077d68b4 SHA512 70148beb288d0df468bd3c82b42da1ccae54f4914514f7bd9817a4aa6e6bb54d21aba58ce9ab6cb35ec539af8c6ce9f5c2f91f1a67f29824bcf0a13e6c1a2975 WHIRLPOOL 0569ad4b4222f968684ab2e108bd761bdb750eb59348e70c38ebc809a9ee0cb74445126d2517f5b660a5600d4de9c20d3f3d7f96abff1cc9d3e2b5a834fc87f4
 DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe
 DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75
-EBUILD libvirt-1.2.10-r2.ebuild 12737 SHA256 91df435d21611b5e8a0a316a148b0d5449360cad43d61f50c271b87ef8e8b91d SHA512 893277721e06f434efa5f54e102620ff4df71d70a910999caed4dd60075e18eb38aa409b743681a367db6043ae360008da9cfd62932967276a52b2dc6e5750ee WHIRLPOOL 81e528bd5fcc722e916cad403d4bab5fc9f256a1c632163140a6bce90310b9195779255468c52d0f61f2f13fca3a10573c50b5b09571defcea1557aa460d2d00
 EBUILD libvirt-1.2.10-r3.ebuild 12910 SHA256 4eac551d9554018b4655b90c4922ef77c4ecd60138bed71f2c992f3b59095953 SHA512 75275888371a78891f4397847cbb61c249f66c03e0243edff748a912490ac217f05a2ea0a041122cfbe7c5e70bb055b899a67d07a8463ff1d9434e9f0bbe04f5 WHIRLPOOL b9a984362f41ad84b20985651e94a66087f208b9930c6b4c628b62a52a8d53cc220bc57bd3d98ba80871ac9c99788bce62516bd9411189287d43a8bdef952083
 EBUILD libvirt-1.2.11-r2.ebuild 12679 SHA256 6e4bad045b0c8cf22dfd2a26e3278636fafb6156f447a2b7a531f8a008283d3b SHA512 7e71e2f98d6871f1fd3084aec1783fd59b85b74dd55dd8cc297f8b501a7b3c911930162eab056b65dfd0af75012e6b6d444767d025b6ecea8438af6755f3041f WHIRLPOOL 9c689c6f015179b618ad4e197d5897f4813b7a8d7157c8293e735559a4111652f3b89ae61156dec8e984e8df180ca0935af85dbf1808d1fd54ee5f48dcd5d774
 EBUILD libvirt-9999.ebuild 12695 SHA256 f984980eaec7fa121b5b5d3d9e44c4b8aed1161f88aebe6bcf9514face3b1540 SHA512 9299a530f8160abde0101dc27da8641bd176907a66d2e792f2d3588b5dea61637ef0e64f8ec07bc10508c6c3d60692209a4aefd0e60d2b0a8ba9d152be0fe255 WHIRLPOOL fb4564bb4e2410259cf7f0093edf6b6845e52275047d308645064a262439eb2646e1fff7af97bf30e4c093e766f6b2262404ea0cdcdd2010e15f28074bed052f
-MISC ChangeLog 25562 SHA256 4cac2815e516d2741c1a048bd9ac394334752f992cdd41766294f0609db46bc1 SHA512 7fe50c5c38111ba50d37af9a463df5ef256988101ac588151a5952fd4bf26911a11bf9101f846d90ad503ebdb990b01d64630a8d92c37f879583271b95085703 WHIRLPOOL 6731693c6f8e297629dec634d7cd906e501c087e3bad10aa3baa037ff3224900a99817263918c1f48943a1e92a590202b349f69f718839d4af13f0e8ea81ceed
+MISC ChangeLog 25704 SHA256 005166e3c54d1d8812616c5274ecfd5c7a3525f17f5636e9112f5645f7a8ae65 SHA512 dd470e89b4d17840e4367eb8a7368b8c205d2ba1de84a6d36ae903ecc1eebafaa5004c951d1e7b65433a439c5cf51f073151207d7a0fb5b7c0d7898a6ab05254 WHIRLPOOL d76673341d455ec61b7118b45ecf24064b1ec26d907ee869d5a083bfc421990726e7d0870167f7212e84987cc3ed21faa79ad096199e0d0700eed3c5726e4580
 MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUmr1dAAoJELp701BxlEWfNRwQALn/0XBO9T3tgmo3EEKIfY60
-NCRlJe9LWYUMwVDI59EiRamLQe4ecGvd3wH3aKYXWjA8TGjRrNvaNyBMrpoVU5w3
-tLL1KcIqiYkX1DWZR0Qu1/jdp/BB+yy8V5DqhjCq1+600wdUAoO4h+j8Ge+xY+zO
-pT0gbtiHL3SMuntemrz7EwVtOS8EIuH+6AkNDL8n0vP+s/S80U9SHDBBj2SnOQ69
-YLUffvII3qoJ+aPqdqPNk9ROuuzdtGDRN79pNJiY3H+/cwpHSk2KR7HauCg4XpSE
-u6ybMbhlw/oD5yOglfAT3mmeB8Q15I14AWOuQb4FNGWkafpwoNDcnLWDUWHem2pn
-2EEXFE7f74m+cy8OQlYKW8LSJ75ajvVsJBc1R6e9W3Moo6/u6l59az2UX1Lam5bz
-rTskUc55Xcia4pZHsmRXw80jNqZg6gaUrlJrvd+vub9qMD1nbj1qPZvqzJmH1Qgl
-cA/N/pXG/xwgldhFmsOe8Sn7EXhXI8SSlTLolQLPNTkP9V5znwrEJgHUTBO4xveG
-S0yZ2H5fusQ8o1CEymXd7cc2qHc7eD+jH9mOZ3pGyv6LA3VRnRvUEkqTBKjRrCV5
-OEKvOM9grXMRZUKCKSrGWNYMWJ1P9AdCG0TpsS5jiMaTD+3/c4IG4RctElciUety
-0p2QbWu343YIcc8iRhTC
-=pKew
+iQIcBAEBCAAGBQJUmtYhAAoJELhOzYlK7nn/4L0QAM4IHgzgVnxUS2Wh7z6+9ZEm
+o8XVdNzepF07WXfJ0sV6dBd216N2Tj5PC6hkOd71ruaNCM6Yk+eFWbClQ19VMwsw
+EZK8y8hU1siAuyqCqozMTXvmgx+gRsxzrZNPuuds3meIubz+fnTk6KJfKhruY/Bq
+/3rpxtQzVIQP8kf5RrryMi/xU7n73rsr4xWOKq5A/hzcAeVuQljzDYEuOiSwIrdI
+MKVaTLb5wqaJC1Jd4SD4yQKyKNjg/mkO2dEiEAtRM1R5nbQwcvzG+cndph/hIAbY
+1QUN0vOMFrWXaQT1PUdfaHynHPDp6XcKK9wBcPXCMe+YbyXbvRbJCIrHAW0o7pLQ
+1zXvNA3krxHfnWLUcguX/QOOO2UiBi7HSNZzjKKmVGkFUDO65DeqUitFyW5JLNdt
+fMlXvUiZMo6av5g7hV2t+aYO9/h+u814k5I1IwBdXRR+JpwNpssZ3dg/rwhFk+N0
+4LBCCvFg74YSrFvudZSen2+xNA7gV5hopUJcJZu7jKCkfWzV4xb3JCKagqs5awZS
+fRPtdM0/ObXIdDnuhAiDQZlLV+jIqaWyxhREXjC6Ux61GuBXJTeQoxRcvLMWyN9r
+9XzusbffpFfr9NX6zN90KSyzbiSak715/Adgl8/GEi9T4VSuw/dFln6L/vcZluHV
+RmDSrBqSFGsXfftukg/D
+=88xL
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.10-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r2.ebuild
deleted file mode 100644 (file)
index 181393b..0000000
+++ /dev/null
@@ -1,454 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10-r2.ebuild,v 1.3 2014/12/12 09:10:10 ago Exp $
-
-EAPI=5
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-       SRC_URI=""
-       KEYWORDS=""
-       SLOT="0"
-else
-       # Versions with 4 numbers are stable updates:
-       if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-               SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
-       else
-               SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
-       fi
-       KEYWORDS="amd64 x86"
-       SLOT="0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-       nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
-       selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
-       elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       uml? ( libvirtd )
-       vepa? ( macvtap )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )
-       virt-network? ( libvirtd )
-       firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-       sys-libs/ncurses
-       >=net-misc/curl-7.18.0
-       dev-libs/libgcrypt:0
-       >=dev-libs/libxml2-2.7.6
-       dev-libs/libnl:3
-       >=net-libs/gnutls-1.0.25
-       net-libs/libssh2
-       sys-apps/dmidecode
-       >=sys-apps/util-linux-2.17
-       sys-devel/gettext
-       >=net-analyzer/netcat6-1.0-r2
-       app-misc/scrub
-       audit? ( sys-process/audit )
-       avahi? ( >=net-dns/avahi-0.6[dbus] )
-       caps? ( sys-libs/libcap-ng )
-       fuse? ( >=sys-fs/fuse-2.8.6 )
-       iscsi? ( sys-block/open-iscsi )
-       lxc? ( !systemd? ( sys-power/pm-utils ) )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       openvz? ( sys-kernel/openvz-sources )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-               !systemd? ( sys-power/pm-utils )
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       systemd? ( sys-apps/systemd )
-       virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? ( app-emulation/xen-tools app-emulation/xen )
-       udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-       virt-network? ( net-dns/dnsmasq[script]
-               >=net-firewall/iptables-1.4.10
-               net-misc/radvd
-               net-firewall/ebtables
-               sys-apps/iproute2[-minimal]
-               firewalld? ( net-firewall/firewalld )
-       )
-       elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
-       bind-interfaces\n
-       interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-LXC_CONFIG_CHECK="
-       ~CGROUPS
-       ~CGROUP_FREEZER
-       ~CGROUP_DEVICE
-       ~CGROUP_CPUACCT
-       ~CGROUP_SCHED
-       ~CGROUP_PERF
-       ~BLK_CGROUP
-       ~NET_CLS_CGROUP
-       ~CGROUP_NET_PRIO
-       ~CPUSETS
-       ~RESOURCE_COUNTERS
-       ~NAMESPACES
-       ~UTS_NS
-       ~IPC_NS
-       ~PID_NS
-       ~NET_NS
-       ~USER_NS
-       ~DEVPTS_MULTIPLE_INSTANCES
-       ~VETH
-       ~MACVLAN
-       ~POSIX_MQUEUE
-       ~SECURITYFS
-       ~!GRKERNSEC_CHROOT_MOUNT
-       ~!GRKERNSEC_CHROOT_DOUBLE
-       ~!GRKERNSEC_CHROOT_PIVOT
-       ~!GRKERNSEC_CHROOT_CHMOD
-       ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-       ~BRIDGE_NF_EBTABLES
-       ~BRIDGE_EBT_MARK_T
-       ~NETFILTER_ADVANCED
-       ~NETFILTER_XT_TARGET_CHECKSUM
-       ~NETFILTER_XT_CONNMARK
-       ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
-       ~BRIDGE_EBT_T_NAT
-       ~NET_SCH_HTB
-       ~NET_SCH_SFQ
-       ~NET_SCH_INGRESS
-       ~NET_CLS_FW
-       ~NET_CLS_U32
-       ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-pkg_setup() {
-       enewgroup qemu 77
-       enewuser qemu 77 -1 -1 qemu kvm
-
-       # Some people used the masked ebuild which was not adding the qemu
-       # user to the kvm group originally. This results in VMs failing to
-       # start for some users. bug #430808
-       egetent group kvm | grep -q qemu
-       if [[ $? -ne 0 ]]; then
-               gpasswd -a qemu kvm
-       fi
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       kernel_is ge 3 6 &&     LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-       use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
-       use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-       use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
-       use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-}
-
-src_prepare() {
-       touch "${S}/.mailmap"
-
-       if [[ ${PV} = *9999* ]]; then
-               # git checkouts require bootstrapping to create the configure script.
-               # Additionally the submodules must be cloned to the right locations
-               # bug #377279
-               ./bootstrap || die "bootstrap failed"
-               (
-                       git submodule status | sed 's/^[ +-]//;s/ .*//'
-                       git hash-object bootstrap.conf
-               ) >.git-module-status
-       fi
-
-       epatch \
-               "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${PN}-1.2.9-fix-firewalld-configuration.patch \
-               "${FILESDIR}"/${P}-cve-2014-7823.patch \
-               "${FILESDIR}"/${P}-cve-2014-8131.patch \
-               "${FILESDIR}"/${P}-cve-2014-8131-part2.patch
-
-       epatch_user
-
-       [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-       # Tweak the init script
-       local avahi_init=
-       local iscsi_init=
-       local rbd_init=
-       local firewalld_init=
-       cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
-       use avahi && avahi_init='avahi-daemon'
-       use iscsi && iscsi_init='iscsid'
-       use rbd && rbd_init='ceph'
-       use firewalld && firewalld_init='need firewalld'
-
-       sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-       sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-       sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-       sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-       local myconf=""
-
-       ## enable/disable daemon, otherwise client only utils
-       myconf+=" $(use_with libvirtd)"
-
-       ## enable/disable the daemon using avahi to find VMs
-       myconf+=" $(use_with avahi)"
-
-       ## hypervisors on the local host
-       myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
-       myconf+=" --without-xenapi"
-       if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-               myconf+=" --with-libxl"
-       else
-               myconf+=" --without-libxl"
-       fi
-       myconf+=" $(use_with openvz)"
-       myconf+=" $(use_with lxc)"
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
-       else
-               myconf+=" $(use_with virtualbox vbox)"
-       fi
-       myconf+=" $(use_with uml)"
-       myconf+=" $(use_with qemu)"
-       myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
-       myconf+=" $(use_with phyp)"
-       myconf+=" --with-esx"
-       myconf+=" --with-vmware"
-
-       ## additional host drivers
-       myconf+=" $(use_with virt-network network)"
-       myconf+=" --with-storage-fs"
-       myconf+=" $(use_with lvm storage-lvm)"
-       myconf+=" $(use_with iscsi storage-iscsi)"
-       myconf+=" $(use_with parted storage-disk)"
-       myconf+=" $(use_with lvm storage-mpath)"
-       myconf+=" $(use_with rbd storage-rbd)"
-       myconf+=" $(use_with numa numactl)"
-       myconf+=" $(use_with numa numad)"
-       myconf+=" $(use_with selinux)"
-       myconf+=" $(use_with fuse)"
-
-       # udev for device support details
-       myconf+=" $(use_with udev)"
-       myconf+=" --without-hal"
-
-       # linux capability support so we don't need privileged accounts
-       myconf+=" $(use_with caps capng)"
-
-       ## auth stuff
-       myconf+=" $(use_with policykit polkit)"
-       myconf+=" $(use_with sasl)"
-
-       # network bits
-       myconf+=" $(use_with macvtap)"
-       myconf+=" $(use_with pcap libpcap)"
-       myconf+=" $(use_with vepa virtualport)"
-       myconf+=" $(use_with firewalld)"
-
-       ## other
-       myconf+=" $(use_enable nls)"
-
-       # user privilege bits fir qemu/kvm
-       if use caps; then
-               myconf+=" --with-qemu-user=qemu"
-               myconf+=" --with-qemu-group=qemu"
-       else
-               myconf+=" --with-qemu-user=root"
-               myconf+=" --with-qemu-group=root"
-       fi
-
-       # audit support
-       myconf+=" $(use_with audit)"
-
-       # wireshark dissector
-       myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
-       ## stuff we don't yet support
-       myconf+=" --without-netcf"
-
-       # locking support
-       myconf+=" --without-sanlock"
-
-       # systemd unit files
-       myconf+=" $(use_with systemd systemd-daemon)"
-       use systemd && myconf+=" --with-init-script=systemd"
-
-       # this is a nasty trick to work around the problem in bug
-       # #275073. The reason why we don't solve this properly is that
-       # it'll require us to rebuild autotools (and we don't really want
-       # to do that right now). The proper solution has been sent
-       # upstream and should hopefully land in 0.7.7, in the mean time,
-       # mime the same functionality with this.
-       case ${CHOST} in
-               *cygwin* | *mingw* )
-                       ;;
-               *)
-                       ac_cv_prog_WINDRES=no
-                       ;;
-       esac
-
-       econf \
-               ${myconf} \
-               --disable-static \
-               --disable-werror \
-               --with-remote \
-               --docdir=/usr/share/doc/${PF} \
-               --localstatedir=/var
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       # Explicitly allow parallel build of tests
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       emake install \
-               DESTDIR="${D}" \
-               HTML_DIR=/usr/share/doc/${PF}/html \
-               DOCS_DIR=/usr/share/doc/${PF} \
-               EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
-               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-               || die "emake install failed"
-
-       find "${D}" -name '*.la' -delete || die
-
-       # Remove bogus, empty directories. They are either not used, or
-       # libvirtd is able to create them on demand
-       rm -rf "${D}"/etc/sysconf
-       rm -rf "${D}"/var/cache
-       rm -rf "${D}"/var/run
-       rm -rf "${D}"/var/log
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       use systemd && \
-               systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
-
-       newinitd "${S}/libvirtd.init" libvirtd || die
-       newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-       newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
-
-       readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-       # we only ever want to generate this once
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       # We really don't want to use or support old PolicyKit cause it
-       # screws with the new polkit integration
-       if has_version sys-auth/policykit; then
-               rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-       fi
-
-       # Only sysctl files ending in .conf work
-       dodir /etc/sysctl.d
-       mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       if ! use policykit; then
-               elog "To allow normal users to connect to libvirtd you must change the"
-               elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       readme.gentoo_print_elog
-
-       if use caps && use qemu; then
-               elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-               elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-       fi
-
-       if [[ -n "${REPLACING_VERSIONS}" ]]; then
-               elog ""
-               elog "The systemd service-file configuration under /etc/sysconfig has"
-               elog "been removed. Please use"
-               elog "    /etc/systemd/system/libvirt.d/00gentoo.conf"
-               elog "to control the '--listen' parameter for libvirtd. The configuration"
-               elog "for the libvirt-guests.service is now found under"
-               elog "    /etc/libvirt/libvirt-guests.conf"
-               elog "The openrc configuration has not been changed. Thus no action is"
-               elog "required for the openrc service manager."
-               elog ""
-       fi
-}