drop vulnerable version, CVE-2014-8131, bug #532204
authorMatthias Maier <tamiko@gentoo.org>
Thu, 11 Dec 2014 09:04:20 +0000 (09:04 +0000)
committerMatthias Maier <tamiko@gentoo.org>
Thu, 11 Dec 2014 09:04:20 +0000 (09:04 +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.9-r2.ebuild [deleted file]

index 61dfd733d78da25225283285798ce15a68425c0d..a51a5dbca1d525dbc6e7522e2d8afedb8e735ef5 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.395 2014/12/11 08:50:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.396 2014/12/11 09:04:07 tamiko Exp $
+
+  11 Dec 2014; Matthias Maier <tamiko@gentoo.org> -libvirt-1.2.9-r2.ebuild:
+  drop vulnerable version, CVE-2014-8131, bug #532204
 
   11 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libvirt-1.2.10-r1.ebuild:
   Stable for x86, wrt bug #532204
index 27a5bb507dfdecbe25ac03303bce8501614bfdcf..539b0fc0ffa54b9059a98b688fc3346b104eea76 100644 (file)
@@ -11,26 +11,24 @@ AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff9
 AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
 DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe
-DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 SHA512 e91367037622da17b5081ccf471e17d36f474596f19034b30e86f42940939340dc4cf455697e54bf9023005fc45cd9982a0f39d244373dd4d585fd7b9aee918c WHIRLPOOL 771025eb6fdda434f9413b03f6c6e0e8a36fd314eb650f913b695481adb71cff3a07ba19934857dcd468b6357c371ba3972a67b71c4ca29092c2094e482cb24d
 EBUILD libvirt-1.2.10-r1.ebuild 12688 SHA256 47d6a27a388747723581b9f7390618b86660d7c94d403374c99554c1459402bc SHA512 754110bcb5ad22868e847a261f8f9f1a314016851b1e3aa5203878f6d2826627cb0894e8c7609902837c163db664ec3e24c4ed28608cd0de8b54d4040734a5ff WHIRLPOOL c56a59b59ab42a58d54f376828ef8c4bdf6a5d54651fec03c5da68ebf14c13f1f019273eb8c1428ccd31ca22e68c4a44a108362caa7e7db510c0bf3599bf4373
-EBUILD libvirt-1.2.9-r2.ebuild 13051 SHA256 a4f70a8d9a50abfd64a5b99feb2e393ca28b3f4138c1f0825391e615b372df20 SHA512 43dbde43a3e5818f067379cbf120a56e56db9e46b2a95e5ebb34318378a4476716d97810170761262030d09821b2c53c518a3e9df8e33413ca8b122158be0818 WHIRLPOOL 42e404845712101d44308968f78e0bb063a5f9f9452f8fdcd47f32fdc02f520cdfb2c68bcbc21ce4b5a3f9cfad1dcc95ea6d63bc3b22d53ac492fcee328a0aa4
 EBUILD libvirt-9999.ebuild 12535 SHA256 0676fabd6df874db39ee2dd2b5fa68371b60b0d35ff7c8a795e946126a8239db SHA512 2de0cb161f528248e61efb192e58e002731a8fc7fef2e2a7133eff9468bdb30362124b1ccc361b38c8db815b17189fdb772ccc623af253acd3686b3b151f33a4 WHIRLPOOL 98f5d988f4e37cef561d6c58385c1002082cee045ae3d39be7cd0ecbcb2e3a3f203772c8e49aefeb373478260efdcd4fb590b4802a512767e7885bdc635fa635
-MISC ChangeLog 23301 SHA256 b4ea4533294a82b9c702ef819616d6336e93a4094448095cea9cd91974da6389 SHA512 57dca9883ad5966b4286849f801c378ded4f51ed6b838d23918966d98de8ae335f44c32b453c7e1e8e76cacc3cc48149d6a70b0c3d493a9f5c02da7da1b8e599 WHIRLPOOL 27640066c25348e21e7835979ae1cc54ade2349ec6cebd5f080f94aedc2e6747ad35f175275ab5adb01ed2f6560c956e7fc0659b41f665a8f9ce08105196b286
+MISC ChangeLog 23435 SHA256 3151d7c16863e78607f7404965dcba8aaa57575855f464f86cc945f86562f110 SHA512 c1f7e6a187ab6ff1497262386d19b851e7ab84743b88df3857b98f4188b8e0480039d0343a992ed0378ed07336e11d2715c77b6d988a2413794023b98a49b261 WHIRLPOOL 6fe4b11ef0dc598543b4618137427cb549683d787990885a6ad4d4041371faafaaa0e0a8e5353a045d37e6d9a22636ca6f430ec1f39903a59a5eb1a3907a300f
 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUiVrrAAoJELp701BxlEWfh5EP/RK7h+1flxVnpTJno1kj+ekr
-x5wJmlRSRmc3nG0/hDj21IKVlACqunXK5+xI6AgZUFzq1T1MtC1GnZN+PrGOqySa
-7Wk0eBBg0lqIGFkjWbjrQro3c3mXs9SDZvND86RQQ2LJ1NPkTiV/OjiB5CW+i8DM
-q2KCouUqtAIYbM2I0h8ecGf0qdKyJRRlrTNU6g6tbcPx5QO4B+qOnAhL1f4y/o9z
-t7awLEbSWImebZRxw5bTu67Ich7Sk2WgWJRiF5cA2OB8hTLSIBUPZIDWTNhrPBVq
-1qXcEMkyhCnPl5qjudlSyANM+lFebGUFtop9LzNlwiCErrNee9S92JkbAVqAq5c4
-a1FY12sjE2fjzZxjxI2exWxIzzrtEm6Z4kVVy9I204a55j9kXgF7/nv8ROWelAj2
-1po5zsFwGaEZ5+RfHjNEE2PQkUm3mSmEHoBxFgU30BLLWJ5KGh+Q0/brVXJFLxEB
-QZdaMUawIVv3DCxa2H0YZg3K0OimXat4Oz03bWstlEh++ZFEm2bXLDW/SC0uE4sT
-lWt8g76AG4BsypqC59pcdcUjEMdlKqOhSYr9zZ1KZTREpM6RQscMbg8bRctTEYms
-6+ScTqqA16U9rYKh47l7Jp4/LVprE0PpAyaOwxRo0lFhRfcCt2FYNdO15REc+A8o
-rH1Di/Yc8JqARu+oeoGO
-=D//x
+iQIcBAEBCAAGBQJUiV4IAAoJELhOzYlK7nn/+5UP/1jCiL+nmk6hEQhrWl0/aP9r
+xOgkrQAPRe3h7xycdAUDreQQy+QeMCppQdK7hVAdMQn/gbL36OBEKcdQY0yy+VxQ
+3HplKP0Zd91J8w11s+Go84annQfBdPweNihoFtedgtXhKLb/9Hom8uxE5G8kWkSq
+yD35mMhUI57QNgtQkvq5BqKMS3Kpwf+XeNxxK6EdWFLXmuEkg7fQ5Y+jv0in15IH
++u1CMXd1RFJUvc4I0ieKtemOy78H/ZRkZuXKmFclZ9WsCT9/AB+DcJXTGbUdSuj9
+RravG3A1LJiFVGKyeusOi0H4+mWzLQqXZUOMyywB/NwP5WuK4aUCCGgQpxxexoOb
+b1w27ZFnnBYQgHsu44u+h3YnhK8iU5gf5K39zWNB6Dngq3HS3+88r/FflF5Iis93
+Vc2Fz29M4vsaR/Oh5JNPnOoq9mL5nhfc/SQTgtnP8XdBc0IWgQRNO2xMHc9JGGQY
+wMV3iu2N5N4oHYA1GVCKUQNooZbFb27bVvW3ppospVH9qIwN6iH/m8+pkx01kEki
+uooTLaK4Ad3ryUkIYf+q4SdZbrgTbRdUzUWfXzn95uNQKtoyD9v3VzLrawtKRm5e
+dXG0htHjFVe6PNCYYrEsZNYCtqfmOYnCA/cPqrIxAIv9b2s79GGGbI70uXjdR6Xj
+58DYxZYdrD2xpwgNBXwj
+=mI1F
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.9-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.9-r2.ebuild
deleted file mode 100644 (file)
index d80ea9f..0000000
+++ /dev/null
@@ -1,455 +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.9-r2.ebuild,v 1.3 2014/11/08 18:09:43 ago Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-2
-       EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-       AUTOTOOLIZE=yes
-       SRC_URI=""
-       KEYWORDS=""
-else
-       SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-               ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-               ${BACKPORTS:+
-                       http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-       KEYWORDS="amd64 x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-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 ) )"
-# one? ( dev-libs/xmlrpc-c )
-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"
-       [[ -n ${BACKPORTS} ]] && \
-               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-                       epatch
-
-       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}"/${P}-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${P}-cve-2014-7823.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="${myconf} $(use_with libvirtd)"
-
-       ## enable/disable the daemon using avahi to find VMs
-       myconf="${myconf} $(use_with avahi)"
-
-       ## hypervisors on the local host
-       myconf="${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="${myconf} $(use_with openvz)"
-       myconf="${myconf} $(use_with lxc)"
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-       else
-               myconf="${myconf} $(use_with virtualbox vbox)"
-       fi
-       myconf="${myconf} $(use_with uml)"
-       myconf="${myconf} $(use_with qemu)"
-       myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-       myconf="${myconf} $(use_with phyp)"
-       myconf="${myconf} --with-esx"
-       myconf="${myconf} --with-vmware"
-
-       ## additional host drivers
-       myconf="${myconf} $(use_with virt-network network)"
-       myconf="${myconf} --with-storage-fs"
-       myconf="${myconf} $(use_with lvm storage-lvm)"
-       myconf="${myconf} $(use_with iscsi storage-iscsi)"
-       myconf="${myconf} $(use_with parted storage-disk)"
-       myconf="${myconf} $(use_with lvm storage-mpath)"
-       myconf="${myconf} $(use_with rbd storage-rbd)"
-       myconf="${myconf} $(use_with numa numactl)"
-       myconf="${myconf} $(use_with numa numad)"
-       myconf="${myconf} $(use_with selinux)"
-       myconf="${myconf} $(use_with fuse)"
-
-       # udev for device support details
-       myconf="${myconf} $(use_with udev)"
-
-       # linux capability support so we don't need privileged accounts
-       myconf="${myconf} $(use_with caps capng)"
-
-       ## auth stuff
-       myconf="${myconf} $(use_with policykit polkit)"
-       myconf="${myconf} $(use_with sasl)"
-
-       # network bits
-       myconf="${myconf} $(use_with macvtap)"
-       myconf="${myconf} $(use_with pcap libpcap)"
-       myconf="${myconf} $(use_with vepa virtualport)"
-       myconf="${myconf} $(use_with firewalld)"
-
-       ## other
-       myconf="${myconf} $(use_enable nls)"
-
-       # user privilege bits fir qemu/kvm
-       if use caps; then
-               myconf="${myconf} --with-qemu-user=qemu"
-               myconf="${myconf} --with-qemu-group=qemu"
-       else
-               myconf="${myconf} --with-qemu-user=root"
-               myconf="${myconf} --with-qemu-group=root"
-       fi
-
-       # audit support
-       myconf="${myconf} $(use_with audit)"
-
-       # wireshark dissector
-       myconf="${myconf} $(use_with wireshark-plugins wireshark-dissector)"
-
-       ## stuff we don't yet support
-       myconf="${myconf} --without-netcf"
-
-       # we use udev over hal
-       myconf="${myconf} --without-hal"
-
-       # locking support
-       myconf="${myconf} --without-sanlock"
-
-       # systemd unit files
-       myconf="${myconf} $(use_with systemd systemd-daemon)"
-       use systemd && myconf="${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 \
-               --docdir=/usr/share/doc/${PF} \
-               --with-remote \
-               --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
-}