commit:     75352bea6963ac12faff5c565e2b9e19e8b19ef4
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 15:39:24 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 16:29:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75352bea

app-emulation/libvirt: drop old

Bug: https://bugs.gentoo.org/711306
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/libvirt/Manifest                |   4 -
 app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 384 --------------------------
 app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 379 -------------------------
 app-emulation/libvirt/libvirt-5.6.0.ebuild    | 379 -------------------------
 app-emulation/libvirt/libvirt-5.8.0.ebuild    | 383 -------------------------
 app-emulation/libvirt/metadata.xml            |   3 -
 6 files changed, 1532 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index cf8fd919a80..1ffffaf9d5e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,2 @@
 DIST libvirt-5.10.0.tar.xz 8732120 BLAKE2B 
9b191a624cca2c84d157482c48cd4eec0456382aa861958880bbbdc25785625386f63320a0626e52683776cca25c4af80ee65d19349ed0b2862e76a074e4e419
 SHA512 
bb518a6aa6731a7de4b24fc7b8ffdcd2cdd84dfe49047374e0f02265c274eb06dbe1732c9cc4954412853d36d9dd5c1124fb8a5e37f4c01654d85013773ffa23
-DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B 
d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c
 SHA512 
378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
-DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 
4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe
 SHA512 
47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
-DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B 
dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7
 SHA512 
95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
-DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B 
ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1
 SHA512 
73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 
669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f
 SHA512 
64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c

diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
deleted file mode 100644
index 73ffa5123b7..00000000000
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 
readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://libvirt.org/git/libvirt.git";
-       SRC_URI=""
-       KEYWORDS="amd64 x86"
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz";
-       KEYWORDS="amd64 ~arm64 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 +dbus firewalld fuse glusterfs iscsi iscsi-direct
-       +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
-       policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
-       wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       qemu? ( 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="
-       acct-user/qemu
-       policykit? ( acct-group/libvirt )
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       net-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       !sys-apps/systemd[-cgroup-hybrid(+)]
-       >=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 )
-       dbus? ( sys-apps/dbus )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       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
-       )
-       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-1.5.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-4.6.0
-               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}
-       ${PYTHON_DEPS}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-       "${FILESDIR}"/${PN}-5.2.0-md-clear.patch
-)
-
-pkg_setup() {
-       # 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
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~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"
-
-       default
-
-       if [[ ${PV} = *9999* ]]; then
-               # Reinitialize submodules as this is required for gnulib's 
bootstrap
-               git submodule init
-               # 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 .gnulib | awk '{ print $1 }'
-                   git hash-object bootstrap.conf
-                   git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-               ) >.git-module-status
-       fi
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r17" "${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"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with iscsi-direct storage-iscsi-direct)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen libxl)
-               $(use_with zeroconf avahi)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-
-               --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
-
-       econf "${myeconfargs[@]}"
-
-       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
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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
-       newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
deleted file mode 100644
index c444b69c7db..00000000000
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 
readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://libvirt.org/git/libvirt.git";
-       SRC_URI=""
-       KEYWORDS="amd64 x86"
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz";
-       KEYWORDS="amd64 ~arm64 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 +dbus dtrace firewalld fuse glusterfs iscsi
-       iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-       parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
-       virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       qemu? ( 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="
-       acct-user/qemu
-       policykit? ( acct-group/libvirt )
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       net-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       !sys-apps/systemd[-cgroup-hybrid(+)]
-       >=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 )
-       dbus? ( sys-apps/dbus )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       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
-       )
-       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-1.5.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-4.6.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-       # 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
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~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"
-
-       default
-
-       if [[ ${PV} = *9999* ]]; then
-               # Reinitialize submodules as this is required for gnulib's 
bootstrap
-               git submodule init
-               # 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 .gnulib | awk '{ print $1 }'
-                   git hash-object bootstrap.conf
-                   git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-               ) >.git-module-status
-       fi
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with dtrace)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with iscsi-direct storage-iscsi-direct)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen libxl)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-
-               --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
-
-               --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
-
-       econf "${myeconfargs[@]}"
-
-       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
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild 
b/app-emulation/libvirt/libvirt-5.6.0.ebuild
deleted file mode 100644
index 7c37c5926e7..00000000000
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 
readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://libvirt.org/git/libvirt.git";
-       SRC_URI=""
-       KEYWORDS=""
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz";
-       KEYWORDS="~amd64 ~arm64 ~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 +dbus dtrace firewalld fuse glusterfs iscsi
-       iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-       parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
-       virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       qemu? ( 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="
-       acct-user/qemu
-       policykit? ( acct-group/libvirt )
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       net-libs/rpcsvc-proto
-       >=net-misc/curl-7.18.0
-       sys-apps/dmidecode
-       !sys-apps/systemd[-cgroup-hybrid(+)]
-       >=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 )
-       dbus? ( sys-apps/dbus )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       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
-       )
-       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-1.5.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-4.6.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.6.0-do-not-use-sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-       # 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
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~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"
-
-       default
-
-       if [[ ${PV} = *9999* ]]; then
-               # Reinitialize submodules as this is required for gnulib's 
bootstrap
-               git submodule init
-               # 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 .gnulib | awk '{ print $1 }'
-                   git hash-object bootstrap.conf
-                   git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-               ) >.git-module-status
-       fi
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with dtrace)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with iscsi-direct storage-iscsi-direct)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen libxl)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-
-               --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
-
-               --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
-
-       econf "${myeconfargs[@]}"
-
-       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
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild 
b/app-emulation/libvirt/libvirt-5.8.0.ebuild
deleted file mode 100644
index 796534d0663..00000000000
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 
readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://libvirt.org/git/libvirt.git";
-       SRC_URI=""
-       KEYWORDS="amd64 x86"
-       SLOT="0"
-else
-       SRC_URI="https://libvirt.org/sources/${P}.tar.xz";
-       KEYWORDS="amd64 ~arm64 ~ppc64 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 +dbus dtrace firewalld fuse glusterfs iscsi
-       iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-       parted pcap phyp pm-utils policykit +qemu rbd sasl selinux +udev +vepa
-       virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       qemu? ( 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="
-       acct-user/qemu
-       policykit? ( acct-group/libvirt )
-       app-misc/scrub
-       dev-libs/libgcrypt:0
-       dev-libs/libnl:3
-       >=dev-libs/libxml2-2.7.6
-       >=net-analyzer/openbsd-netcat-1.105-r1
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       net-libs/rpcsvc-proto
-       >=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 )
-       dbus? ( sys-apps/dbus )
-       dtrace? ( dev-util/systemtap )
-       firewalld? ( >=net-firewall/firewalld-0.6.3 )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       pm-utils? ( sys-power/pm-utils )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-1.5.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-4.6.0
-               app-emulation/xen-tools:=
-       )
-       udev? (
-               virtual/udev
-               >=x11-libs/libpciaccess-0.10.9
-       )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-       # 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
-               ~IP_NF_FILTER
-               ~IP_NF_MANGLE
-               ~IP_NF_NAT
-               ~IP_NF_TARGET_MASQUERADE
-               ~IP6_NF_FILTER
-               ~IP6_NF_MANGLE
-               ~IP6_NF_NAT"
-       # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="
-               ~BRIDGE_EBT_T_NAT
-               ~IP_NF_TARGET_REJECT
-               ~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"
-
-       default
-
-       if [[ ${PV} = *9999* ]]; then
-               # Reinitialize submodules as this is required for gnulib's 
bootstrap
-               git submodule init
-               # 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 .gnulib | awk '{ print $1 }'
-                   git hash-object bootstrap.conf
-                   git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-               ) >.git-module-status
-       fi
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with dtrace)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with iscsi-direct storage-iscsi-direct)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 pm-utils )
-               $(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 vepa virtualport)
-               $(use_with virt-network network)
-               $(use_with wireshark-plugins wireshark-dissector)
-               $(use_with xen libxl)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-
-               --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
-
-               --localstatedir="$EPREFIX/var"
-               --with-runstatedir="$EPREFIX/run"
-       )
-
-       if use virtualbox && has_version app-emulation/virtualbox-ose; then
-               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-       else
-               myeconfargs+=( $(use_with virtualbox vbox) )
-       fi
-
-       econf "${myeconfargs[@]}"
-
-       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
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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
-       rm -rf "${D}"/run
-
-       newbashcomp "${S}/tools/bash-completion/vsh" virsh
-       bashcomp_alias virsh virt-admin
-
-       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
-       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/metadata.xml 
b/app-emulation/libvirt/metadata.xml
index 16c0b4752e5..920d0228def 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -71,9 +71,6 @@
        <flag name="pcap">
                Support auto learning IP addreses for routing
        </flag>
-       <flag name="pm-utils">
-               Add runtime support for <pkg>sys-power/pm-utils</pkg>
-       </flag>
        <flag name="macvtap">
                Support for MAC-based TAP (macvlan/macvtap). For networking 
instead
                of the normal TUN/TAP.

Reply via email to