commit:     36257e57c59799e1bb5180594e4c08d93f55393d
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 02:05:53 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 02:29:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36257e57

app-emulation/libvirt: drop obsolete

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 app-emulation/libvirt/Manifest                |   3 -
 app-emulation/libvirt/libvirt-2.0.0-r3.ebuild | 394 --------------------------
 app-emulation/libvirt/libvirt-2.2.0-r1.ebuild | 391 -------------------------
 app-emulation/libvirt/libvirt-2.4.0-r1.ebuild | 393 -------------------------
 app-emulation/libvirt/libvirt-2.4.0.ebuild    | 391 -------------------------
 5 files changed, 1572 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 32cffcd..b7a111e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,8 +1,5 @@
 DIST libvirt-1.3.5-20160709.tar.xz 1336 SHA256 
d14b14661e9bd89a8805dd84d8ee5f8b39f428a4dcbf70693eea593328e28033 SHA512 
08ad8c691f145a3a8c27b594b486b9265777f756099c127e58fd76bac7249a0e84181a3f15da4cf64ffdcf35ff7e3a2f1f1ee50f3882df5d980ad7250a30e44e
 WHIRLPOOL 
8d8106314c2bed984db3947b51b90dadd45680a07d568cc980c6534ba2229bfff8d041ecf40898131030f3db8d6e223fe30ba3dc72b3fe7fedc02a77b5c37331
 DIST libvirt-1.3.5.tar.gz 35109092 SHA256 
93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 SHA512 
6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d
 WHIRLPOOL 
88ac308cc461efff842c27e40263a3b25ce0bc0ca310fb6e9def9126ab893fe43aed01bda9fc3615439ee797c36e2800f741b346e0b3d96aac64e7909c269879
-DIST libvirt-2.0.0.tar.xz 13161096 SHA256 
10e90af55e613953c0ddc60b4ac3a10c73c0f3493d7014259e3f012b2ffc9acb SHA512 
1182346e9268ec50cfd191a18172ad8ca80615a111547cc72fbe227cbbe9579263a1236f80cb36542272bdbf092e2184c9060b65c56dc2098076bbd1a89dd66c
 WHIRLPOOL 
3d6d9e307228f54993c6082f7787d678b2afe84d96b47889d1565e38da489fb99691aeb598831dff04cd9fe47448ea35dc1f5a44b3c6638816cf61533155688c
 DIST libvirt-2.1.0.tar.xz 13212368 SHA256 
1a799562337472ab00f76aa30a53d54c623c96633070ec53286c9cc2a456316b SHA512 
5ad1bcf4d28be39028db7b551c77947d56a7119501912fdf41b0d46467f9c37525d364854181bd084e2107e9cd459303856403e5330bd99458c32e42abb4059c
 WHIRLPOOL 
75485a02e9c1538f91379f6e702c39e5e7acd248221e01b797ec03930e92e7859c2986050c06009059f5cf9cff6bab131c1d6758d3950b201e5ce555e3b15a90
-DIST libvirt-2.2.0.tar.xz 13209684 SHA256 
e315a8d66aeeb0e7b6459e20b8abae16a23764c3f5d24c7d9462465d26791699 SHA512 
b441188e6a7a13e7ece116b8930f532e84810b90f4d44dea603441cc7044a06330094cd73349908a2c48339a745b77efdbf2fbb82ebe3488b4a8f53d787f29a5
 WHIRLPOOL 
bbb50d9f347b3a172c1135bb9456e7f8b7d41e18d42130ef7b27d68de14f6897d0feddae445d36aa1c7d1627b2446b0cbc6b5bf6913ecfc185a32a65f6278aeb
 DIST libvirt-2.3.0.tar.xz 13224384 SHA256 
e430e69b27d3f6c97255e638617b59b179618d531d81ac7dfe0783a1c1eeafd1 SHA512 
b815704a7d021895e94f34551f783b053f4dce3d6f792e0734b98745b8bd895ddb30250b3cf9b1ecc61bb2f09073a51bc75edb2745591d22d6a7ef2935eac701
 WHIRLPOOL 
d27df68a6464e763fb119d8926ba9d4ad1e47fa37e08aa14adeb3684d2675bb0d7be69b17e22e98fffe281393d37a4c7fdd318e1641e0a6767fcab63d5a790e5
-DIST libvirt-2.4.0.tar.xz 13237652 SHA256 
b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224 SHA512 
3f440daa08b9656dbfe8e8db4f0a4090f400abc3baa1a8b1e4e1b09d902bad536066f4e307736d46d1aae69f9f3c5283f5b75b3edca5bf598584b74745ec3509
 WHIRLPOOL 
b2bf734200d5c8670df053f1de3e28b59c34cf3648cdcb4ca15ec4c473fbb465325470ba2ef552912b244c5feb31e9766ee2faffe81ffa8eddf264aba9b2514e
 DIST libvirt-2.5.0.tar.xz 13638636 SHA256 
819dffefbfd6ae95dfe1b28cfdee15ebcf9f91bbd732157488a57705bf81cb1e SHA512 
256d6cae635851d710ffa3bdfd6b4d744687610b899a65821829af0f66a65e9c4ae287c8651534b40fc04f6525920b3704e90028a6f906af141cd61f2e79d10c
 WHIRLPOOL 
64ef68bba5b2b47ef8c191c3cadc8121267fc07f6fdc40f7969b3762bab222872b987ad8d04b22c2f6d6629d7599a7ff3263b3491f0143d59a172b269d81284c

diff --git a/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild 
b/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
deleted file mode 100644
index 363d808..00000000
--- a/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo-r1
-
-BACKPORTS=""
-
-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/${P}.tar.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       SRC_URI+=" ${BACKPORTS:+
-               
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-               
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}";
-       KEYWORDS="~amd64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps firewalld fuse glusterfs 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 zeroconf elibc_glibc
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       uml? ( libvirtd )
-       vepa? ( macvtap )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-# 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="
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       >=sys-apps/util-linux-2.17
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       sys-libs/readline:=
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       elibc_glibc? ( sys-libs/glibc[rpc(+)] )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6 )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       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[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtualbox? ( || ( app-emulation/virtualbox 
>=app-emulation/virtualbox-bin-2.2.0 ) )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               app-emulation/xen
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-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
-
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~DEVPTS_MULTIPLE_INSTANCES
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if $(kernel_is ge 3 6); then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               if $(kernel_is lt 4 5); then
-                       CONFIG_CHECK+=" ~MEMCG_KMEM "
-               fi
-       fi
-
-       use macvtap && CONFIG_CHECK+="
-               ~MACVTAP"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       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.3.0-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch 
\
-               "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \
-               "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-
-       [[ -n ${BACKPORTS} ]] &&
-               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
-                       EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
-       epatch_user
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       AUTOTOOLS_AUTORECONF=true
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with lvm storage-lvm)
-               $(use_with lvm storage-mpath)
-               $(use_with lxc)
-               $(use_with macvtap)
-               $(use_enable nls)
-               $(use_with numa numactl)
-               $(use_with numa numad)
-               $(use_with openvz)
-               $(use_with parted storage-disk)
-               $(use_with pcap libpcap)
-               $(use_with phyp)
-               $(use_with policykit polkit)
-               $(use_with qemu)
-               $(use_with qemu yajl)
-               $(use_with rbd storage-rbd)
-               $(use_with sasl)
-               $(use_with selinux)
-               $(use_with udev)
-               $(use_with uml)
-               $(use_with vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen)
-               $(use_with xen xen-inotify)
-               $(usex xen --with-libxl '')
-               $(use_with zeroconf avahi)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --with-qemu-group=$(usex caps qemu root)
-               --with-qemu-user=$(usex caps qemu root)
-               --with-remote
-               --with-storage-fs
-               --with-vmware
-
-               --disable-static
-               --disable-werror
-
-               --with-html-subdir=${PF}/html
-               --localstatedir=/var
-       )
-
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-       else
-               myeconfargs+=( $(use_with virtualbox vbox) )
-       fi
-
-       autotools-utils_src_configure
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-
-       # Workaround: Sometimes this subdirectory is missing and leads to a
-       # build failure.
-       mkdir -p "${BUILD_DIR}"/docs/internals
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       autotools-utils_src_compile install \
-               DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
-       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/sysconfig
-       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!
-
-       systemd_install_serviced \
-               "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-       systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd || die
-       newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       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
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
deleted file mode 100644
index 12eed00..00000000
--- a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo-r1
-
-BACKPORTS=""
-
-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/${P}.tar.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       SRC_URI+=" ${BACKPORTS:+
-               
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-               
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}";
-       KEYWORDS="~amd64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps firewalld fuse glusterfs 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 zeroconf elibc_glibc
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       uml? ( libvirtd )
-       vepa? ( macvtap )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-# 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="
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       >=sys-apps/util-linux-2.17
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       sys-libs/readline:=
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       elibc_glibc? ( sys-libs/glibc[rpc(+)] )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6 )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       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[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtualbox? ( || ( app-emulation/virtualbox 
>=app-emulation/virtualbox-bin-2.2.0 ) )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               app-emulation/xen
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-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
-
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use macvtap && CONFIG_CHECK+="
-               ~MACVTAP"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       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.3.0-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch 
\
-               "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \
-               "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-
-       [[ -n ${BACKPORTS} ]] &&
-               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
-                       EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
-       epatch_user
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       AUTOTOOLS_AUTORECONF=true
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with lvm storage-lvm)
-               $(use_with lvm storage-mpath)
-               $(use_with lxc)
-               $(use_with macvtap)
-               $(use_enable nls)
-               $(use_with numa numactl)
-               $(use_with numa numad)
-               $(use_with openvz)
-               $(use_with parted storage-disk)
-               $(use_with pcap libpcap)
-               $(use_with phyp)
-               $(use_with policykit polkit)
-               $(use_with qemu)
-               $(use_with qemu yajl)
-               $(use_with rbd storage-rbd)
-               $(use_with sasl)
-               $(use_with selinux)
-               $(use_with udev)
-               $(use_with uml)
-               $(use_with vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen)
-               $(use_with xen xen-inotify)
-               $(usex xen --with-libxl '')
-               $(use_with zeroconf avahi)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --with-qemu-group=$(usex caps qemu root)
-               --with-qemu-user=$(usex caps qemu root)
-               --with-remote
-               --with-storage-fs
-               --with-vmware
-
-               --disable-static
-               --disable-werror
-
-               --with-html-subdir=${PF}/html
-               --localstatedir=/var
-       )
-
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-       else
-               myeconfargs+=( $(use_with virtualbox vbox) )
-       fi
-
-       autotools-utils_src_configure
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       autotools-utils_src_compile install \
-               DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
-       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/sysconfig
-       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!
-
-       systemd_install_serviced \
-               "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-       systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd || die
-       newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       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
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-2.4.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-2.4.0-r1.ebuild
deleted file mode 100644
index 878fa13..00000000
--- a/app-emulation/libvirt/libvirt-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo-r1
-
-BACKPORTS=""
-
-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/${P}.tar.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       SRC_URI+=" ${BACKPORTS:+
-               
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-               
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}";
-       KEYWORDS="~amd64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps firewalld fuse glusterfs 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 zeroconf zfs elibc_glibc
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       uml? ( libvirtd )
-       vepa? ( macvtap )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-# 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="
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       >=sys-apps/util-linux-2.17
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       sys-libs/readline:=
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       elibc_glibc? ( sys-libs/glibc[rpc(+)] )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6 )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       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[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtualbox? ( || ( app-emulation/virtualbox 
>=app-emulation/virtualbox-bin-2.2.0 ) )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               app-emulation/xen
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-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
-
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use macvtap && CONFIG_CHECK+="
-               ~MACVTAP"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       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.3.0-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch 
\
-               "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \
-               "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-
-       [[ -n ${BACKPORTS} ]] &&
-               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
-                       EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
-       epatch_user
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       AUTOTOOLS_AUTORECONF=true
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with lvm storage-lvm)
-               $(use_with lvm storage-mpath)
-               $(use_with lxc)
-               $(use_with macvtap)
-               $(use_enable nls)
-               $(use_with numa numactl)
-               $(use_with numa numad)
-               $(use_with openvz)
-               $(use_with parted storage-disk)
-               $(use_with pcap libpcap)
-               $(use_with phyp)
-               $(use_with policykit polkit)
-               $(use_with qemu)
-               $(use_with qemu yajl)
-               $(use_with rbd storage-rbd)
-               $(use_with sasl)
-               $(use_with selinux)
-               $(use_with udev)
-               $(use_with uml)
-               $(use_with vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen)
-               $(use_with xen xen-inotify)
-               $(use_with xen libxl)
-               $(use_with zeroconf avahi)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --with-qemu-group=$(usex caps qemu root)
-               --with-qemu-user=$(usex caps qemu root)
-               --with-remote
-               --with-storage-fs
-               --with-vmware
-
-               --disable-static
-               --disable-werror
-
-               --with-html-subdir=${PF}/html
-               --localstatedir=/var
-       )
-
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-       else
-               myeconfargs+=( $(use_with virtualbox vbox) )
-       fi
-
-       autotools-utils_src_configure
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       autotools-utils_src_compile install \
-               DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
-       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/sysconfig
-       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!
-
-       systemd_install_serviced \
-               "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-       systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd || die
-       newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       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
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-2.4.0.ebuild 
b/app-emulation/libvirt/libvirt-2.4.0.ebuild
deleted file mode 100644
index 12eed00..00000000
--- a/app-emulation/libvirt/libvirt-2.4.0.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo-r1
-
-BACKPORTS=""
-
-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/${P}.tar.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       SRC_URI+=" ${BACKPORTS:+
-               
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-               
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}";
-       KEYWORDS="~amd64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps firewalld fuse glusterfs 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 zeroconf elibc_glibc
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       qemu? ( libvirtd )
-       uml? ( libvirtd )
-       vepa? ( macvtap )
-       virt-network? ( libvirtd )
-       virtualbox? ( libvirtd )
-       xen? ( libvirtd )"
-
-# 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="
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       >=sys-apps/util-linux-2.17
-       sys-devel/gettext
-       sys-libs/ncurses:0=
-       sys-libs/readline:=
-       apparmor? ( sys-libs/libapparmor )
-       audit? ( sys-process/audit )
-       caps? ( sys-libs/libcap-ng )
-       elibc_glibc? ( sys-libs/glibc[rpc(+)] )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6 )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       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[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       virt-network? (
-               net-dns/dnsmasq[script]
-               net-firewall/ebtables
-               >=net-firewall/iptables-1.4.10[ipv6]
-               net-misc/radvd
-               sys-apps/iproute2[-minimal]
-       )
-       virtualbox? ( || ( app-emulation/virtualbox 
>=app-emulation/virtualbox-bin-2.2.0 ) )
-       wireshark-plugins? ( net-analyzer/wireshark:= )
-       xen? (
-               app-emulation/xen
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-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
-
-       # Check kernel configuration:
-       CONFIG_CHECK=""
-       use fuse && CONFIG_CHECK+="
-               ~FUSE_FS"
-
-       use lvm && CONFIG_CHECK+="
-               ~BLK_DEV_DM
-               ~DM_MULTIPATH
-               ~DM_SNAPSHOT"
-
-       use lxc && CONFIG_CHECK+="
-               ~BLK_CGROUP
-               ~CGROUP_CPUACCT
-               ~CGROUP_DEVICE
-               ~CGROUP_FREEZER
-               ~CGROUP_NET_PRIO
-               ~CGROUP_PERF
-               ~CGROUPS
-               ~CGROUP_SCHED
-               ~CPUSETS
-               ~IPC_NS
-               ~MACVLAN
-               ~NAMESPACES
-               ~NET_CLS_CGROUP
-               ~NET_NS
-               ~PID_NS
-               ~POSIX_MQUEUE
-               ~SECURITYFS
-               ~USER_NS
-               ~UTS_NS
-               ~VETH
-               ~!GRKERNSEC_CHROOT_MOUNT
-               ~!GRKERNSEC_CHROOT_DOUBLE
-               ~!GRKERNSEC_CHROOT_PIVOT
-               ~!GRKERNSEC_CHROOT_CHMOD
-               ~!GRKERNSEC_CHROOT_CAPS"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       use macvtap && CONFIG_CHECK+="
-               ~MACVTAP"
-
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_MARK_T
-               ~BRIDGE_NF_EBTABLES
-               ~NETFILTER_ADVANCED
-               ~NETFILTER_XT_CONNMARK
-               ~NETFILTER_XT_MARK
-               ~NETFILTER_XT_TARGET_CHECKSUM"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~NET_ACT_POLICE
-               ~NET_CLS_FW
-               ~NET_CLS_U32
-               ~NET_SCH_HTB
-               ~NET_SCH_INGRESS
-               ~NET_SCH_SFQ"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       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.3.0-do_not_use_sysconf.patch \
-               "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch 
\
-               "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \
-               "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-
-       [[ -n ${BACKPORTS} ]] &&
-               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
-                       EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
-       epatch_user
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       AUTOTOOLS_AUTORECONF=true
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with lvm storage-lvm)
-               $(use_with lvm storage-mpath)
-               $(use_with lxc)
-               $(use_with macvtap)
-               $(use_enable nls)
-               $(use_with numa numactl)
-               $(use_with numa numad)
-               $(use_with openvz)
-               $(use_with parted storage-disk)
-               $(use_with pcap libpcap)
-               $(use_with phyp)
-               $(use_with policykit polkit)
-               $(use_with qemu)
-               $(use_with qemu yajl)
-               $(use_with rbd storage-rbd)
-               $(use_with sasl)
-               $(use_with selinux)
-               $(use_with udev)
-               $(use_with uml)
-               $(use_with vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen)
-               $(use_with xen xen-inotify)
-               $(usex xen --with-libxl '')
-               $(use_with zeroconf avahi)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --with-qemu-group=$(usex caps qemu root)
-               --with-qemu-user=$(usex caps qemu root)
-               --with-remote
-               --with-storage-fs
-               --with-vmware
-
-               --disable-static
-               --disable-werror
-
-               --with-html-subdir=${PF}/html
-               --localstatedir=/var
-       )
-
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-       else
-               myeconfargs+=( $(use_with virtualbox vbox) )
-       fi
-
-       autotools-utils_src_configure
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       autotools-utils_src_compile install \
-               DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
-       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/sysconfig
-       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!
-
-       systemd_install_serviced \
-               "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-       systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-       newinitd "${S}/libvirtd.init" libvirtd || die
-       newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       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
-}
-
-pkg_postinst() {
-       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-       fi
-
-       use libvirtd || return 0
-       # From here, only libvirtd-related instructions, be warned!
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-}

Reply via email to