drop vulnerable version, CVE-2014-8131, bug #532204

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 19 insertions, 470 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 4c1a16792aaf..f08407294b4c 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -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.399 2014/12/12 09:10:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.400 2014/12/12 10:28:02 tamiko Exp $
+
+  12 Dec 2014; Matthias Maier <tamiko@gentoo.org> -libvirt-1.2.10-r1.ebuild:
+  drop vulnerable version, CVE-2014-8131, bug #532204
 
   12 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libvirt-1.2.10-r2.ebuild:
   Stable for x86, wrt bug #532204
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 09a67667f4f1..35236efff510 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -12,25 +12,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
-EBUILD libvirt-1.2.10-r1.ebuild 12688 SHA256 47d6a27a388747723581b9f7390618b86660d7c94d403374c99554c1459402bc SHA512 754110bcb5ad22868e847a261f8f9f1a314016851b1e3aa5203878f6d2826627cb0894e8c7609902837c163db664ec3e24c4ed28608cd0de8b54d4040734a5ff WHIRLPOOL c56a59b59ab42a58d54f376828ef8c4bdf6a5d54651fec03c5da68ebf14c13f1f019273eb8c1428ccd31ca22e68c4a44a108362caa7e7db510c0bf3599bf4373
 EBUILD libvirt-1.2.10-r2.ebuild 12737 SHA256 91df435d21611b5e8a0a316a148b0d5449360cad43d61f50c271b87ef8e8b91d SHA512 893277721e06f434efa5f54e102620ff4df71d70a910999caed4dd60075e18eb38aa409b743681a367db6043ae360008da9cfd62932967276a52b2dc6e5750ee WHIRLPOOL 81e528bd5fcc722e916cad403d4bab5fc9f256a1c632163140a6bce90310b9195779255468c52d0f61f2f13fca3a10573c50b5b09571defcea1557aa460d2d00
 EBUILD libvirt-9999.ebuild 12535 SHA256 0676fabd6df874db39ee2dd2b5fa68371b60b0d35ff7c8a795e946126a8239db SHA512 2de0cb161f528248e61efb192e58e002731a8fc7fef2e2a7133eff9468bdb30362124b1ccc361b38c8db815b17189fdb772ccc623af253acd3686b3b151f33a4 WHIRLPOOL 98f5d988f4e37cef561d6c58385c1002082cee045ae3d39be7cd0ecbcb2e3a3f203772c8e49aefeb373478260efdcd4fb590b4802a512767e7885bdc635fa635
-MISC ChangeLog 23876 SHA256 827f3e4cbc6984f3a491cd8ad4c46702de091da89894d534818551a94e5facf7 SHA512 292af117773dbc3bce245d06a6442dd9e6606cb0120742b7e91a409e42753ffb2f2769164859b10292cfa04c5b02e1ef4c21994a972980a8d2adccc2c741744c WHIRLPOOL 3f9cabfe4b978718db5ac14ccc6ce06d22d3d6da983020d5af812a0e73fb352011a0bfb5c2a66cb57e6995a0c0da744f54ca8e8e9d20fbc3c7faec1b194131c8
+MISC ChangeLog 24011 SHA256 4d4c2bf88dec74d52be1fb8c0d59f01b8bc387c440274973400a23270a778ca9 SHA512 e5845c48e562b4ab01d52920ae877a6f4508622386edb73bbef059b697c599259b1c3abb4f0e7995a883e28b329d2a8b5745db7be9abd68a22aaf3d25879dd51 WHIRLPOOL cbf32435228077f8f22900a53fe65ee7f346eb33eaae31793fe58aa10b58c5c151c45bea552281deda04c93747623bf66b33a82838bbcb8388c22ef85fa0b911
 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUirDzAAoJELp701BxlEWfFQEQAJD8DQe7z/YwKqV2TxmwXfHj
-oNLNUKJ8TCoGg3d40sitK1Msf8NpxSgXrFMRLthXLS94wDD/0VZ22LkzNBbKtt12
-QOYPhw/Q8z1T5v53so49aur1XNrKj1tr1h+TDiqlijg8/yo8IjA1DDMDrwBQAdlT
-nLFwZZn9LJZvGRvs3keL8wXfXSvLxmrj80YqP7eVpVCP9laDjbDPW6HFTbfEihJD
-Mllorh30qTblpcMQ2t35B5KUx1Yrwp9ZsiFOWXGN/BiEl+ZCrTeYy4yHdwvj/gDH
-ZI4qa9FFOtvwEMA1srNLKGinELewquN2XRwCF5+58zr4Ni+aE4R/o5577kKvuEHn
-HTT8IxTtvIx3UZ67BWgigPsd6jX4nH+CqWAfz0VE+sh+Bu9LFoCKzlFKudB1HMYh
-OkkhOlgZtAjR908fo5I6S8WOWGuNjxD6Te6owWPDoSJE7mo6BE/Y9xzsvWF4o6T3
-FxA0tSU4akRX5QyoW3JR6dROmbhSw5WNlu+Sjr6KvC47M46n2fTVFEgnJ5y89ASO
-dafEebJ/SyuFb3DSspEC8HPVoPuE+qFRetQ7ZHPx7xdx6p5+1Gk+Jb0wB88R5oM1
-h/lGVbFN9u2WZasqoRbuhjBBbTY7luQ60xGbaP7Zbfy4mJXTYWz31bVz5CJsL7Hx
-8NKhE9CLPEqHSgrueAoB
-=jnHw
+iQIcBAEBCAAGBQJUisMyAAoJELhOzYlK7nn/Kv4QAM8m8bbu2TGNclcR5qF6l2t0
+lkkwJVU1ZOzU5fdvZngEVALZwYp3qC6G5TKkm0jsNPWHFimTB67aHoRb9AeyrC2S
+2C5E1eD72li2PcAjtN9Pq5uan2o3MqoV4OZWhar/lLmFly09/HcMxABUsRCCuzMf
+WXQUq3wS04g7k76KYMznY8GNWRS4V2XydE/OZSc1yiRSe3oOW6Tu1i6WqvXWbfFw
+Dfk54CbrWNq0UHDQxfyH2d5C6ujKUFPZZlmOr6pq+PWp2xJB9PLhR+zljQ5dR51L
+plkk/z//ZxwXmSyLSYqEvavVEL4PSVsqaCrW1VUHviv8wUTTBqd2O3F8ig/JpugP
+Ffk8ElLmIS2sb6dgCBSrRi8r7jVs0795Bv7XR6ETWYBvCtXBX2pTDzH5/6dcgAaJ
+u6Go5n04PCFysAOczJF0NjB3HCbF9Ri4vMHAiwIwZaKwfAuwnYbBpDYR05zszCM9
+VGaxEGJgwO/MNi3KUrY60js+FCh3YlEeZKNqKKWrhWp7OFJV6Q703zKJjaz4AeXG
+hxG08Dp0qUyKMDF8YqngP+rdCeXPj0IxvCB1D65woh5NLk4ZtGe5AeuwTxK6HOk/
+vEXjl199mAidxSi0w7zSSpgqy4141hQCaIg0J5jrSMR8zQ8y+AhId/5wJ/jCtOcV
+jB/chZufzt0Zp87jC9NV
+=+Yj9
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-1.2.10-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r1.ebuild
deleted file mode 100644
index ce4c6cb4e99c..000000000000
--- a/app-emulation/libvirt/libvirt-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,453 +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-r1.ebuild,v 1.3 2014/12/11 08:50:50 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
-
-	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
-}