[gentoo-commits] proj/musl:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/

[Anthony G. Basile]

commit:     064bbc524f208807c821e22a606d34ee6a04103e
Author:     g3ngr33n <gengreen <AT> tutanota <DOT> com>
AuthorDate: Thu Feb 21 15:01:39 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 11:04:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=064bbc52

Small fix libvirt

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 app-emulation/libvirt/Manifest                     |   1 +
 app-emulation/libvirt/files/README.gentoo-r2       |  58 +++
 ...irt-1.2.16-fix_paths_in_libvirt-guests_sh.patch |  19 +
 .../libvirt-3.10.0-r2-fix_paths_for_apparmor.patch |  77 ++++
 .../files/libvirt-4.10.0-fix_apparmor_rules.patch  |  14 +
 .../libvirt/files/libvirt-4.10.0-musl.patch        |  10 +
 .../files/libvirt-4.5.0-do_not_use_sysconf.patch   | 216 ++++++++++++
 .../libvirt-4.5.0-fix_typo_in_apparmor_rule.patch  |  13 +
 .../files/libvirt-5.0.0-do-not-use-sysconf.patch   | 216 ++++++++++++
 .../libvirt-5.0.0-fix-paths-for-apparmor.patch     | 110 ++++++
 .../files/libvirt-5.1.0-do-not-use-sysconf.patch   | 216 ++++++++++++
 app-emulation/libvirt/files/libvirt-guests.confd   |  68 ++++
 app-emulation/libvirt/files/libvirt-guests.init-r2 | 235 +++++++++++++
 app-emulation/libvirt/files/libvirt-guests.init-r3 | 236 +++++++++++++
 app-emulation/libvirt/files/libvirtd.confd-r5      |  18 +
 app-emulation/libvirt/files/libvirtd.init-r16      |  34 ++
 app-emulation/libvirt/files/libvirtd.service.conf  |  10 +
 app-emulation/libvirt/files/libvirtd.tmpfiles.conf |   1 +
 app-emulation/libvirt/files/virtlockd.init-r1      |  23 ++
 app-emulation/libvirt/files/virtlogd.init-r1       |  23 ++
 app-emulation/libvirt/libvirt-4.10.0.ebuild        | 388 +++++++++++++++++++++
 app-emulation/libvirt/metadata.xml                 | 102 ++++++
 22 files changed, 2088 insertions(+)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
new file mode 100644
index 0000000..d9d3295
--- /dev/null
+++ b/app-emulation/libvirt/Manifest
@@ -0,0 +1 @@
+DIST libvirt-4.10.0.tar.xz 14841188 BLAKE2B b52f2ed1c4c65930339a6b6fc9e7b034c7661edc0defdd78642f305b97332c33247bfc552efc43aa75a8d360c0d721d1a58a22fa7a016e7cf14ee2219d70a762 SHA512 a4f97aed6299c7954518ab88738ab781cee0755bfd64094a44468f77f99cac5eb2bc74ecd6aec90177317606ebd073292f5b5d0056054d1d94973fa938589fbd

diff --git a/app-emulation/libvirt/files/README.gentoo-r2 b/app-emulation/libvirt/files/README.gentoo-r2
new file mode 100644
index 0000000..1c086c1
--- /dev/null
+++ b/app-emulation/libvirt/files/README.gentoo-r2
@@ -0,0 +1,58 @@
+Important: The openrc libvirtd init script is now broken up into two
+separate services: libvirtd, that solely handles the daemon, and
+libvirt-guests, that takes care of clients during shutdown/restart of the
+host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
+and enable the service and start it:
+
+	$ rc-update add libvirt-guests
+	$ service libvirt-guests start
+
+
+For the basic networking support (bridged and routed networks) you don't
+need any extra software. For more complex network modes including but not
+limited to NATed network, you can enable the 'virt-network' USE flag. It
+will pull in required runtime dependencies
+
+
+If you are using dnsmasq on your system, you will have to configure
+/etc/dnsmasq.conf to enable the following settings:
+
+	bind-interfaces
+	interface or except-interface
+
+Otherwise you might have issues with your existing DNS server.
+
+
+For openrc users:
+
+	Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
+	libvirtd.
+
+	Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
+	the host. The default configuration will suspend and resume running kvm
+	guests with 'managedsave'. This behavior can be changed under
+	/etc/conf.d/libvirt-guests
+
+
+For systemd users:
+
+	Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
+	to control the '--listen' parameter for libvirtd.
+
+	The configuration for the 'libvirt-guests.service' is found under
+	/etc/libvirt/libvirt-guests.conf"
+
+
+If you have built libvirt with policykit support, a new group "libvirt" has
+been created. Simply add a user to the libvirt group in order to grant
+administrative access to libvirtd. Alternatively, drop a custom policykit
+rule into /etc/polkit-1/rules.d.
+
+If you have built libvirt without policykit support (USE=-policykit), you
+must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf
+in order to allow normal users to connect to libvirtd.
+
+
+If libvirtd is built with USE=caps, libvirt will now start qemu/kvm VMs
+with non-root privileges. Ensure any resources your VMs use are accessible
+by qemu:qemu.

diff --git a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 0000000..ddedb1f
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,19 @@
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 7f74b85..ea58119 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -41,11 +41,11 @@ CONNECT_RETRIES=10
+ RETRIES_SLEEP=1
+ SYNC_TIME=0
+ 
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 

diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch
new file mode 100644
index 0000000..f1360ae
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch
@@ -0,0 +1,77 @@
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index ef2f79db3..d8cdb9b3f 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXTRA_DIST = \
+ 	apparmor/TEMPLATE.lxc \
+ 	apparmor/libvirt-qemu \
+ 	apparmor/libvirt-lxc \
+-	apparmor/usr.lib.libvirt.virt-aa-helper \
++	apparmor/usr.libexec.virt-aa-helper \
+ 	apparmor/usr.sbin.libvirtd \
+ 	lxcconvert/virt-lxc-convert \
+ 	polkit/libvirt-acl.rules \
+@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
+-	apparmor/usr.lib.libvirt.virt-aa-helper \
++	apparmor/usr.libexec.virt-aa-helper \
+ 	apparmor/usr.sbin.libvirtd \
+ 	$(NULL)
+ 
+diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
+index d4fad85a1..0b22009e5 100644
+--- a/examples/apparmor/libvirt-qemu
++++ b/examples/apparmor/libvirt-qemu
+@@ -86,6 +86,8 @@
+   /usr/share/AAVMF/** r,
+   /usr/share/qemu-efi/** r,
+   /usr/share/slof/** r,
++  /usr/share/seavgabios/** r,
++  /usr/share/edk2-ovmf/** r,
+ 
+   # access PKI infrastructure
+   /etc/pki/libvirt-vnc/** r,
+diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
+similarity index 92%
+rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper
+rename to examples/apparmor/usr.libexec.virt-aa-helper
+index bd6181d00..4086f140a 100644
+--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/examples/apparmor/usr.libexec.virt-aa-helper
+@@ -1,7 +1,7 @@
+ # Last Modified: Mon Apr  5 15:10:27 2010
+ #include <tunables/global>
+ 
+-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
++profile virt-aa-helper /usr/libexec/virt-aa-helper {
+   #include <abstractions/base>
+ 
+   # needed for searching directories
+@@ -32,7 +32,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+   deny /dev/mapper/ r,
+   deny /dev/mapper/* r,
+ 
+-  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
++  /usr/libexec/virt-aa-helper mr,
+   /{usr/,}sbin/apparmor_parser Ux,
+ 
+   /etc/apparmor.d/libvirt/* r,
+diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
+index 8d61d154e..656a5595b 100644
+--- a/examples/apparmor/usr.sbin.libvirtd
++++ b/examples/apparmor/usr.sbin.libvirtd
+@@ -84,8 +84,10 @@
+   audit deny /sys/kernel/security/apparmor/.* rwxl,
+   /sys/kernel/security/apparmor/profiles r,
+   /usr/{lib,lib64}/libvirt/* PUxr,
+-  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
+-  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
++  /usr/libexec/libvirt_parthelper ix,
++  /usr/libexec/libvirt_iohelper ix,
+   /etc/libvirt/hooks/** rmix,
+   /etc/xen/scripts/** rmix,
+ 

diff --git a/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch b/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch
new file mode 100644
index 0000000..e561bf4
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch
@@ -0,0 +1,14 @@
+diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+index de94368..5fbae27 100644
+--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+@@ -39,6 +39,9 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+   /etc/apparmor.d/libvirt/* r,
+   /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
+ 
++  # Gentoo specific path for uefi firmware
++  /usr/share/edk2-ovmf/* r,
++
+   # for backingstore -- allow access to non-hidden files in @{HOME} as well
+   # as storage pools
+   audit deny @{HOME}/.* mrwkl,

diff --git a/app-emulation/libvirt/files/libvirt-4.10.0-musl.patch b/app-emulation/libvirt/files/libvirt-4.10.0-musl.patch
new file mode 100644
index 0000000..6f826c7
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.10.0-musl.patch
@@ -0,0 +1,10 @@
+--- a/src/storage/storage_backend_fs.c
++++ b/src/storage/storage_backend_fs.c
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <paths.h>
+ 
+ #include "virerror.h"
+ #include "storage_backend_fs.h"
\ No newline at end of file

diff --git a/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch
new file mode 100644
index 0000000..3e430cb
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch
@@ -0,0 +1,216 @@
+From a365e2d5b4af1ab2be743773412fe265579a9a0b Mon Sep 17 00:00:00 2001
+Message-Id: <a365e2d5b4af1ab2be743773412fe265579a9a0b.1529989118.git.mprivozn@××××××.com>
+From: Michal Privoznik <mprivozn@××××××.com>
+Date: Tue, 26 Jun 2018 06:51:06 +0200
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com>
+---
+ src/Makefile.am                  | 29 ++++++-----------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 17 ++++-------------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 21 insertions(+), 43 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index db8c8ebd1a..63d7a9ca46 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -757,23 +757,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
+-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-
+-uninstall-sysconfig:
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+-
+ SYSVINIT_FILES_IN += \
+ 	locking/virtlockd.init.in \
+ 	$(NULL)
+@@ -814,14 +797,14 @@ uninstall-logrotate:
+ endif ! WITH_LIBVIRTD
+ 
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+-install-init:: $(SYSVINIT_FILES) install-sysconfig
++install-init:: $(SYSVINIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
+ 	for f in $(SYSVINIT_FILES:%.init=%) ; \
+ 	do \
+ 	  $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \
+ 	done
+ 
+-uninstall-init:: uninstall-sysconfig
++uninstall-init::
+ 	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%)
+ 	rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
+ 
+@@ -859,14 +842,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
+ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_UPSTART
+ 
+-install-upstart: install-sysconfig
++install-upstart:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
+ 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
+ 	done
+ 
+-uninstall-upstart: uninstall-sysconfig
++uninstall-upstart:
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+ 	  tgt=`basename $$f` ; \
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 3c9d587032..2449b201d9 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 3d9ae36150..43736191d5 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 7f689e08a8..239beeced9 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 1452d984a0..cef08741cb 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
+ 	uninstall-bash-completion
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-
+-uninstall-sysconfig:
+-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
+-
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
+ 
+ install-initscript: libvirt-guests.init
+@@ -359,8 +350,8 @@ uninstall-initscript:
+ 
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ BUILT_SOURCES += libvirt-guests.init
+-install-init: install-sysconfig install-initscript
+-uninstall-init: uninstall-sysconfig uninstall-initscript
++install-init: install-initscript
++uninstall-init: uninstall-initscript
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT
+ install-init:
+ uninstall-init:
+@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 491ca62138..f0f417bffb 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 669b046507..45b0b9ea46 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+ #URIS=default
+-- 
+2.16.4
+

diff --git a/app-emulation/libvirt/files/libvirt-4.5.0-fix_typo_in_apparmor_rule.patch b/app-emulation/libvirt/files/libvirt-4.5.0-fix_typo_in_apparmor_rule.patch
new file mode 100644
index 0000000..4d1bfaf
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.5.0-fix_typo_in_apparmor_rule.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/apparmor/usr.libexec.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
+index d21723f..99ab4ea 100644
+--- a/examples/apparmor/usr.libexec.virt-aa-helper
++++ b/examples/apparmor/usr.libexec.virt-aa-helper
+@@ -50,7 +50,7 @@ profile virt-aa-helper /usr/libexec/virt-aa-helper {
+   @{HOME}/** r,
+   /var/lib/libvirt/images/ r,
+   /var/lib/libvirt/images/** r,
+-  /var/lib/nova/instances/_base/* r
++  /var/lib/nova/instances/_base/* r,
+   /{media,mnt,opt,srv}/** r,
+   # For virt-sandbox
+   /{,var/}run/libvirt/**/[sv]d[a-z] r,

diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch
new file mode 100644
index 0000000..d4e37e4
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.0.0-do-not-use-sysconf.patch
@@ -0,0 +1,216 @@
+From 947ef7a44e94989f324e0d533499454d540fdef9 Mon Sep 17 00:00:00 2001
+Message-Id: <947ef7a44e94989f324e0d533499454d540fdef9.1547196492.git.mprivozn@××××××.com>
+From: Michal Privoznik <mprivozn@××××××.com>
+Date: Tue, 26 Jun 2018 06:51:06 +0200
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com>
+---
+ src/Makefile.am                  | 29 ++++++-----------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 17 ++++-------------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 21 insertions(+), 43 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cd386297ed..52a63885d6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
+-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-
+-uninstall-sysconfig:
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+-
+ SYSVINIT_FILES_IN += \
+ 	locking/virtlockd.init.in \
+ 	$(NULL)
+@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ initdir = $(sysconfdir)/rc.d/init.d
+ 
+-install-init:: $(SYSVINIT_FILES) install-sysconfig
++install-init:: $(SYSVINIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(initdir)
+ 	for f in $(SYSVINIT_FILES:%.init=%) ; \
+ 	do \
+ 	  $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
+ 	done
+ 
+-uninstall-init:: uninstall-sysconfig
++uninstall-init::
+ 	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
+ 	rmdir $(DESTDIR)$(initdir) || :
+ 
+@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ 
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
+ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_UPSTART
+ 
+-install-upstart: install-sysconfig
++install-upstart:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
+ 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
+ 	done
+ 
+-uninstall-upstart: uninstall-sysconfig
++uninstall-upstart:
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+ 	  tgt=`basename $$f` ; \
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 3c9d587032..2449b201d9 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 3d9ae36150..43736191d5 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 7f689e08a8..239beeced9 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 613c9a77f0..224b511074 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
+ 	uninstall-bash-completion
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-
+-uninstall-sysconfig:
+-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
+-
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
+ 
+ install-initscript: libvirt-guests.init
+@@ -362,8 +353,8 @@ uninstall-initscript:
+ 
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ BUILT_SOURCES += libvirt-guests.init
+-install-init: install-sysconfig install-initscript
+-uninstall-init: uninstall-sysconfig uninstall-initscript
++install-init: install-initscript
++uninstall-init: uninstall-initscript
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT
+ install-init:
+ uninstall-init:
+@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 491ca62138..f0f417bffb 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 669b046507..45b0b9ea46 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+ #URIS=default
+-- 
+2.19.2
+

diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch
new file mode 100644
index 0000000..ca9f952
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch
@@ -0,0 +1,110 @@
+From 563706143779166624812b3faf498d869f5dd383 Mon Sep 17 00:00:00 2001
+Message-Id: <563706143779166624812b3faf498d869f5dd383.1547196492.git.mprivozn@××××××.com>
+From: Michal Privoznik <mprivozn@××××××.com>
+Date: Fri, 11 Jan 2019 09:41:06 +0100
+Subject: [PATCH] gentoo: fix paths for apparmor
+
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com>
+---
+ src/security/Makefile.inc.am                           | 10 +++++-----
+ src/security/apparmor/libvirt-qemu                     |  2 ++
+ ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} |  4 ++--
+ src/security/apparmor/usr.sbin.libvirtd                |  6 ++++--
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+ rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (93%)
+
+diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
+index b24cdfd083..ae8e979b84 100644
+--- a/src/security/Makefile.inc.am
++++ b/src/security/Makefile.inc.am
+@@ -36,7 +36,7 @@ EXTRA_DIST += \
+ 	security/apparmor/TEMPLATE.lxc \
+ 	security/apparmor/libvirt-qemu \
+ 	security/apparmor/libvirt-lxc \
+-	security/apparmor/usr.lib.libvirt.virt-aa-helper \
++	security/apparmor/usr.libexec.virt-aa-helper \
+ 	security/apparmor/usr.sbin.libvirtd \
+ 	$(NULL)
+ 
+@@ -90,7 +90,7 @@ endif WITH_SECDRIVER_APPARMOR
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
+-	security/apparmor/usr.lib.libvirt.virt-aa-helper \
++	security/apparmor/usr.libexec.virt-aa-helper \
+ 	security/apparmor/usr.sbin.libvirtd \
+ 	$(NULL)
+ 
+@@ -110,11 +110,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local"
+ install-apparmor-local:
+ 	$(MKDIR_P) "$(APPARMOR_LOCAL_DIR)"
+ 	echo "# Site-specific additions and overrides for \
+-		'usr.lib.libvirt.virt-aa-helper'" \
+-		>"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
++		'usr.libexec.virt-aa-helper'" \
++		>"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
+ 
+ uninstall-apparmor-local:
+-	rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
++	rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
+ 	rmdir "$(APPARMOR_LOCAL_DIR)" || :
+ 
+ INSTALL_DATA_LOCAL += install-apparmor-local
+diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
+index eaa5167525..9be50bbbe0 100644
+--- a/src/security/apparmor/libvirt-qemu
++++ b/src/security/apparmor/libvirt-qemu
+@@ -87,6 +87,8 @@
+   /usr/share/AAVMF/** r,
+   /usr/share/qemu-efi/** r,
+   /usr/share/slof/** r,
++  /usr/share/seavgabios/** r,
++  /usr/share/edk2-ovmf/** r,
+ 
+   # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
+   /etc/pki/CA/ r,
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.libexec.virt-aa-helper
+similarity index 93%
+rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+rename to src/security/apparmor/usr.libexec.virt-aa-helper
+index de9436872c..99ab4ea527 100644
+--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/src/security/apparmor/usr.libexec.virt-aa-helper
+@@ -1,7 +1,7 @@
+ # Last Modified: Mon Apr  5 15:10:27 2010
+ #include <tunables/global>
+ 
+-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
++profile virt-aa-helper /usr/libexec/virt-aa-helper {
+   #include <abstractions/base>
+ 
+   # needed for searching directories
+@@ -33,7 +33,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+   deny /dev/mapper/ r,
+   deny /dev/mapper/* r,
+ 
+-  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
++  /usr/libexec/virt-aa-helper mr,
+   /{usr/,}sbin/apparmor_parser Ux,
+ 
+   /etc/apparmor.d/libvirt/* r,
+diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd
+index f0ffc53008..8a402bd6ec 100644
+--- a/src/security/apparmor/usr.sbin.libvirtd
++++ b/src/security/apparmor/usr.sbin.libvirtd
+@@ -98,8 +98,10 @@
+   audit deny /sys/kernel/security/apparmor/.* rwxl,
+   /sys/kernel/security/apparmor/profiles r,
+   /usr/{lib,lib64}/libvirt/* PUxr,
+-  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
+-  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
++  /usr/libexec/libvirt_parthelper ix,
++  /usr/libexec/libvirt_iohelper ix,
+   /etc/libvirt/hooks/** rmix,
+   /etc/xen/scripts/** rmix,
+ 
+-- 
+2.19.2
+

diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch
new file mode 100644
index 0000000..3c32ab8
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch
@@ -0,0 +1,216 @@
+From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001
+Message-Id: <cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27.1548428073.git.mprivozn@××××××.com>
+From: Michal Privoznik <mprivozn@××××××.com>
+Date: Tue, 26 Jun 2018 06:51:06 +0200
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com>
+---
+ src/Makefile.am                  | 29 ++++++-----------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 17 ++++-------------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 21 insertions(+), 43 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8c8dfe3dcf..25ced3abf3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
+-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-
+-uninstall-sysconfig:
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+-
+ SYSVINIT_FILES_IN += \
+ 	locking/virtlockd.init.in \
+ 	$(NULL)
+@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ initdir = $(sysconfdir)/rc.d/init.d
+ 
+-install-init: $(SYSVINIT_FILES) install-sysconfig
++install-init: $(SYSVINIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(initdir)
+ 	for f in $(SYSVINIT_FILES:%.init=%) ; \
+ 	do \
+ 	  $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
+ 	done
+ 
+-uninstall-init: uninstall-sysconfig
++uninstall-init:
+ 	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
+ 	rmdir $(DESTDIR)$(initdir) || :
+ 
+@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ 
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
+ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_UPSTART
+ 
+-install-upstart: install-sysconfig
++install-upstart:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
+ 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
+ 	done
+ 
+-uninstall-upstart: uninstall-sysconfig
++uninstall-upstart:
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+ 	  tgt=`basename $$f` ; \
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 3c9d587032..2449b201d9 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 3d9ae36150..43736191d5 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 7f689e08a8..239beeced9 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 613c9a77f0..224b511074 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
+ 	uninstall-bash-completion
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-
+-uninstall-sysconfig:
+-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
+-
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
+ 
+ install-initscript: libvirt-guests.init
+@@ -362,8 +353,8 @@ uninstall-initscript:
+ 
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ BUILT_SOURCES += libvirt-guests.init
+-install-init: install-sysconfig install-initscript
+-uninstall-init: uninstall-sysconfig uninstall-initscript
++install-init: install-initscript
++uninstall-init: uninstall-initscript
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT
+ install-init:
+ uninstall-init:
+@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 491ca62138..f0f417bffb 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 669b046507..45b0b9ea46 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+ #URIS=default
+-- 
+2.19.2
+

diff --git a/app-emulation/libvirt/files/libvirt-guests.confd b/app-emulation/libvirt/files/libvirt-guests.confd
new file mode 100644
index 0000000..ed2ce58
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-guests.confd
@@ -0,0 +1,68 @@
+# /etc/conf.d/libvirtd
+
+# LIBVIRT_URIS
+# space separated list of libvirt URIs to communicate with to start/stop guests
+# Valid values are anything that can be passed to 'virsh connect'
+
+#LIBVIRT_URIS="qemu:///system"
+
+
+# LIBVIRT_SHUTDOWN
+# Valid options:
+# * managedsave - Performs a state save external to the VM (for hypervisors
+#                 supporting this operation). qemu-kvm will stop the CPU
+#                 and save off all state to a separate file. When the
+#                 machine is started again, it will resume like nothing
+#                 ever happened. This is guarenteed to always successfully
+#                 stop your machine and restart it.
+#
+# * shutdown -    Sends an ACPI shutdown (think of this as a request to
+#                 your guest to shutdown). There is no way to distinguish
+#                 between guests that are ignoring the shutdown request or
+#                 are stuck or are taking a long time to shutdown. We will
+#                 wait LIBVIRT_MAXWAIT seconds before yanking the power
+#                 out.
+#
+# * destroy  -    Immediately stop all running guests. Use with caution as
+#                 this can leave the guest in a corrupted state and might
+#                 lead to data loss.
+#
+
+#LIBVIRT_SHUTDOWN="managedsave"
+
+
+# LIBVIRT_MAXWAIT
+# Timeout in seconds until stopping a guest and "pulling the plug" on the
+# guest
+# Valid values are any integer over 0
+
+#LIBVIRT_MAXWAIT="500"
+
+
+# LIBVIRT_START
+# If this value is set to 'no', then guests and networks that were shutdown
+# by this script when it was stopped will not be started when it is started
+# back up.
+# Valid values are yes or no
+
+#LIBVIRT_START="yes"
+
+
+# LIBVIRT_IGNORE_AUTOSTART
+# If the VM is marked for autostart in its XML configuration then we won't
+# save its start when the init script is stopped. The result is that when
+# the init script starts back up, no attempt will be made to start the VM or
+# confirm it is started.
+# Valid values are yes or no
+
+#LIBVIRT_IGNORE_AUTOSTART="no"
+
+
+# LIBVIRT_NET_SHUTDOWN
+# If libvirtd created networks for you (e.g. NATed networks) then this init
+# script will shut them down for you if this is set to 'yes'. Otherwise,
+# the networks will be left running. For this option to be useful you must
+# have enabled the 'virt-network' USE flag and have had libvirt create a
+# NATed network for you. Valid values: 'yes' or 'no'
+
+#LIBVIRT_NET_SHUTDOWN="yes"

diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r2 b/app-emulation/libvirt/files/libvirt-guests.init-r2
new file mode 100644
index 0000000..8455918
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-guests.init-r2
@@ -0,0 +1,235 @@
+#!/sbin/openrc-run
+
+description="Virtual Machine Management (libvirt) Guests"
+
+depend() {
+	use libvirtd
+}
+
+# set the default to QEMU
+[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
+
+# default to suspending the VM via managedsave
+case "${LIBVIRT_SHUTDOWN}" in
+	managedsave|shutdown|destroy) ;;
+	*) LIBVIRT_SHUTDOWN="managedsave" ;;
+esac
+
+# default to 500 seconds
+[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
+
+gueststatefile="/var/lib/libvirt/libvirt-guests.state"
+netstatefile="/var/lib/libvirt/libvirt-net.state"
+
+do_virsh() {
+	local hvuri=$1
+	shift
+
+	# if unset, default to qemu
+	[ -z ${hvuri} ] && hvuri="qemu:///system"
+	# if only qemu was supplied then correct the value
+	[ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
+
+	# Silence errors because virsh always throws an error about
+	# not finding the hypervisor version when connecting to libvirtd
+	# lastly strip the blank line at the end
+	LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
+}
+
+libvirtd_dom_list() {
+	# Only work with domains by their UUIDs
+	local hvuri=$1
+	shift
+
+	do_virsh "${hvuri}" list --uuid $@
+}
+
+libvirtd_dom_count() {
+	local hvuri=$1
+	shift
+
+	libvirtd_dom_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_net_list() {
+	# Only work with networks by their UUIDs
+	local hvuri=$1
+	shift
+
+	do_virsh "${hvuri}" net-list --uuid $@
+}
+
+libvirtd_net_count() {
+	local hvuri=$1
+	shift
+
+	libvirtd_net_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_dom_stop() {
+	# stops all persistent or transient domains for a given URI
+	# $1 - uri
+	# $2 - persisent/transient
+
+	local uri=$1
+	local persist=$2
+	local shutdown_type=${LIBVIRT_SHUTDOWN}
+	local counter=${LIBVIRT_MAXWAIT}
+	local dom_name=
+	local dom_as=
+	local dom_ids=
+	local uuid=
+	local dom_count=
+
+	[ "${persist}" = "--transient" ] && shutdown_type="shutdown"
+	[ -n "${counter}" ] || counter=500
+
+	einfo " Shutting down domain(s) ..."
+
+	# grab all persistent or transient domains running
+	dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+
+	for uuid in ${dom_ids}; do
+		# Get the name
+		dom_name=$(do_virsh ${uri} domname ${uuid})
+		einfo "  ${dom_name}"
+		# Get autostart state
+		dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
+			awk '$1 == "Autostart:" { print $2 }')
+
+		if [ "${persist}" = "--persistent" ]; then
+			# Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
+			if  [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
+				[ ${dom_as} = "enabled" ]; then
+				:
+			else
+				echo "${uri} ${uuid}" >> ${gueststatefile}
+			fi
+
+		fi
+
+		# Now let's stop it
+		do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
+
+	done
+
+	dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+	while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
+		dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+		sleep 1
+		if [ "${shutdown_type}" = "shutdown" ]; then
+			counter=$((${counter} - 1))
+		fi
+		printf "."
+	done
+
+	if [ "${shutdown_type}" = "shutdown" ]; then
+		# grab all domains still running
+		dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+		for uuid in ${dom_ids}; do
+			dom_name=$(do_virsh ${uri} domname ${uuid})
+			eerror "  ${dom_name} forcibly stopped"
+			do_virsh "${uri}" destroy ${uuid} > /dev/null
+		done
+	fi
+}
+
+libvirtd_net_stop() {
+	# stops all persistent or transient domains for a given URI
+	# $1 - uri
+	# $2 - persisent/transient
+
+	local uri=$1
+	local persist=$2
+	local uuid=
+	local net_name=
+
+	if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
+
+		einfo " Shutting down network(s):"
+		for uuid in $(libvirtd_net_list ${uri} ${persist}); do
+			net_name=$(do_virsh ${uri} net-name ${uuid})
+			einfo "   ${net_name}"
+
+			if [ "${persist}" = "--persistent" ]; then
+				# Save our running state
+				echo "${uri} ${uuid}" >> ${netstatefile}
+
+			fi
+
+			# Actually stop the network
+			do_virsh qemu net-destroy ${uuid} > /dev/null
+		done
+
+	fi
+}
+
+start() {
+	local uri=
+	local uuid=
+	local name=
+
+	for uri in ${LIBVIRT_URIS}; do
+		do_virsh "${uri}" connect
+		if [ $? -ne 0 ]; then
+			eerror "Failed to connect to '${uri}'. Domains may not start."
+		fi
+	done
+
+	[ ! -e "${netstatefile}" ] && touch "${netstatefile}"
+	[ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
+
+	# if the user didn't want to start any guests up then respect their wish
+	[ "x${LIBVIRT_START}" = "xno" ] && return 0
+
+	# start networks
+	ebegin "Starting libvirt networks"
+	while read -r uri uuid
+	do
+		# ignore trash
+		[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+		name=$(do_virsh "${uri}" net-name ${uuid})
+		einfo "  ${name}"
+		do_virsh "${uri}" net-start ${uuid} > /dev/null
+	done <"${netstatefile}"
+	eend 0
+
+	# start domains
+	ebegin "Starting libvirt domains"
+	while read -r uri uuid
+	do
+		# ignore trash
+		[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+		name=$(do_virsh "${uri}" domname ${uuid})
+		einfo "  ${name}"
+		do_virsh "${uri}" start ${uuid} > /dev/null
+	done <"${gueststatefile}"
+	eend 0
+}
+
+stop() {
+	local counter=
+	local dom_name=
+	local net_name=
+	local dom_ids=
+	local uuid=
+	local dom_count=
+
+	rm -f "${gueststatefile}"
+	[ $? -ne 0 ] && eerror "Unable to save domain state"
+	rm -f "${netstatefile}"
+	[ $? -ne 0 ] && eerror "Unable to save net state"
+
+	for uri in ${LIBVIRT_URIS}; do
+		einfo "Stopping libvirt domains and networks for ${uri}"
+
+		libvirtd_dom_stop "${uri}" "--persistent"
+		libvirtd_dom_stop "${uri}" "--transient"
+		libvirtd_net_stop "${uri}" "--persistent"
+		libvirtd_net_stop "${uri}" "--transient"
+
+		einfo "Done stopping domains and networks for ${uri}"
+	done
+}

diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r3 b/app-emulation/libvirt/files/libvirt-guests.init-r3
new file mode 100644
index 0000000..10797e1
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-guests.init-r3
@@ -0,0 +1,236 @@
+#!/sbin/openrc-run
+
+description="Virtual Machine Management (libvirt) Guests"
+
+depend() {
+	use libvirtd
+}
+
+# set the default to QEMU
+[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
+
+# default to suspending the VM via managedsave
+case "${LIBVIRT_SHUTDOWN}" in
+	managedsave|shutdown|destroy) ;;
+	*) LIBVIRT_SHUTDOWN="managedsave" ;;
+esac
+
+# default to 500 seconds
+[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
+
+gueststatefile="/var/lib/libvirt/libvirt-guests.state"
+netstatefile="/var/lib/libvirt/libvirt-net.state"
+
+do_virsh() {
+	local hvuri=$1
+	shift
+
+	# if unset, default to qemu
+	[ -z ${hvuri} ] && hvuri="qemu:///system"
+	# if only qemu was supplied then correct the value
+	[ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
+
+	# Silence errors because virsh always throws an error about
+	# not finding the hypervisor version when connecting to libvirtd
+	# lastly strip the blank line at the end
+	LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
+}
+
+libvirtd_dom_list() {
+	# Only work with domains by their UUIDs
+	local hvuri=$1
+	shift
+
+	# The grep is to remove dom0 for xen domains. Otherwise we never hit 0
+	do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000
+}
+
+libvirtd_dom_count() {
+	local hvuri=$1
+	shift
+
+	libvirtd_dom_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_net_list() {
+	# Only work with networks by their UUIDs
+	local hvuri=$1
+	shift
+
+	do_virsh "${hvuri}" net-list --uuid $@
+}
+
+libvirtd_net_count() {
+	local hvuri=$1
+	shift
+
+	libvirtd_net_list "${hvuri}" $@ | wc -l
+}
+
+libvirtd_dom_stop() {
+	# stops all persistent or transient domains for a given URI
+	# $1 - uri
+	# $2 - persisent/transient
+
+	local uri=$1
+	local persist=$2
+	local shutdown_type=${LIBVIRT_SHUTDOWN}
+	local counter=${LIBVIRT_MAXWAIT}
+	local dom_name=
+	local dom_as=
+	local dom_ids=
+	local uuid=
+	local dom_count=
+
+	[ "${persist}" = "--transient" ] && shutdown_type="shutdown"
+	[ -n "${counter}" ] || counter=500
+
+	einfo " Shutting down domain(s) ..."
+
+	# grab all persistent or transient domains running
+	dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+
+	for uuid in ${dom_ids}; do
+		# Get the name
+		dom_name=$(do_virsh ${uri} domname ${uuid})
+		einfo "  ${dom_name}"
+		# Get autostart state
+		dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
+			awk '$1 == "Autostart:" { print $2 }')
+
+		if [ "${persist}" = "--persistent" ]; then
+			# Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
+			if  [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
+				[ ${dom_as} = "enabled" ]; then
+				:
+			else
+				echo "${uri} ${uuid}" >> ${gueststatefile}
+			fi
+
+		fi
+
+		# Now let's stop it
+		do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
+
+	done
+
+	dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+	while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
+		dom_count="$(libvirtd_dom_count ${uri} ${persist})"
+		sleep 1
+		if [ "${shutdown_type}" = "shutdown" ]; then
+			counter=$((${counter} - 1))
+		fi
+		printf "."
+	done
+
+	if [ "${shutdown_type}" = "shutdown" ]; then
+		# grab all domains still running
+		dom_ids=$(libvirtd_dom_list ${uri} ${persist})
+		for uuid in ${dom_ids}; do
+			dom_name=$(do_virsh ${uri} domname ${uuid})
+			eerror "  ${dom_name} forcibly stopped"
+			do_virsh "${uri}" destroy ${uuid} > /dev/null
+		done
+	fi
+}
+
+libvirtd_net_stop() {
+	# stops all persistent or transient domains for a given URI
+	# $1 - uri
+	# $2 - persisent/transient
+
+	local uri=$1
+	local persist=$2
+	local uuid=
+	local net_name=
+
+	if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
+
+		einfo " Shutting down network(s):"
+		for uuid in $(libvirtd_net_list ${uri} ${persist}); do
+			net_name=$(do_virsh ${uri} net-name ${uuid})
+			einfo "   ${net_name}"
+
+			if [ "${persist}" = "--persistent" ]; then
+				# Save our running state
+				echo "${uri} ${uuid}" >> ${netstatefile}
+
+			fi
+
+			# Actually stop the network
+			do_virsh qemu net-destroy ${uuid} > /dev/null
+		done
+
+	fi
+}
+
+start() {
+	local uri=
+	local uuid=
+	local name=
+
+	for uri in ${LIBVIRT_URIS}; do
+		do_virsh "${uri}" connect
+		if [ $? -ne 0 ]; then
+			eerror "Failed to connect to '${uri}'. Domains may not start."
+		fi
+	done
+
+	[ ! -e "${netstatefile}" ] && touch "${netstatefile}"
+	[ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
+
+	# if the user didn't want to start any guests up then respect their wish
+	[ "x${LIBVIRT_START}" = "xno" ] && return 0
+
+	# start networks
+	ebegin "Starting libvirt networks"
+	while read -r uri uuid
+	do
+		# ignore trash
+		[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+		name=$(do_virsh "${uri}" net-name ${uuid})
+		einfo "  ${name}"
+		do_virsh "${uri}" net-start ${uuid} > /dev/null
+	done <"${netstatefile}"
+	eend 0
+
+	# start domains
+	ebegin "Starting libvirt domains"
+	while read -r uri uuid
+	do
+		# ignore trash
+		[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
+
+		name=$(do_virsh "${uri}" domname ${uuid})
+		einfo "  ${name}"
+		do_virsh "${uri}" start ${uuid} > /dev/null
+	done <"${gueststatefile}"
+	eend 0
+}
+
+stop() {
+	local counter=
+	local dom_name=
+	local net_name=
+	local dom_ids=
+	local uuid=
+	local dom_count=
+
+	rm -f "${gueststatefile}"
+	[ $? -ne 0 ] && eerror "Unable to save domain state"
+	rm -f "${netstatefile}"
+	[ $? -ne 0 ] && eerror "Unable to save net state"
+
+	for uri in ${LIBVIRT_URIS}; do
+		einfo "Stopping libvirt domains and networks for ${uri}"
+
+		libvirtd_dom_stop "${uri}" "--persistent"
+		libvirtd_dom_stop "${uri}" "--transient"
+		libvirtd_net_stop "${uri}" "--persistent"
+		libvirtd_net_stop "${uri}" "--transient"
+
+		einfo "Done stopping domains and networks for ${uri}"
+	done
+}

diff --git a/app-emulation/libvirt/files/libvirtd.confd-r5 b/app-emulation/libvirt/files/libvirtd.confd-r5
new file mode 100644
index 0000000..c326531
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.confd-r5
@@ -0,0 +1,18 @@
+# /etc/conf.d/libvirtd
+
+# Startup dependency
+# libvirtd typically requires all networks to be up and settled which
+# is what rc_need="net" provides. However if you only use specific networks
+# for libvirtd, you may override this. Or if you only use libvirtd locally.
+rc_need="net"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#LIBVIRTD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# LIBVIRTD_OPTS
+# You may want to add '--listen' to have libvirtd listen for tcp/ip connections
+# if you want to use libvirt for remote control
+# Please consult 'libvirtd --help' for more options
+#LIBVIRTD_OPTS="--listen"

diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16
new file mode 100644
index 0000000..be660e3
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init-r16
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Virtual Machine Management daemon (libvirt)"
+
+LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
+LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+
+command="/usr/sbin/libvirtd"
+command_args="-d ${LIBVIRTD_OPTS}"
+start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
+pidfile="/var/run/libvirtd.pid"
+retry="${LIBVIRTD_TERMTIMEOUT}"
+
+depend() {
+	need virtlogd
+	use dbus virtlockd
+	after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
+	USE_FLAG_FIREWALLD
+	USE_FLAG_AVAHI
+	USE_FLAG_ISCSI
+	USE_FLAG_RBD
+}
+
+start_pre() {
+	# Test configuration directories in /etc/libvirt/ to be either not
+	# present or a directory, i.e. not a regular file, bug #532892
+
+	checkpath --directory /etc/libvirt/lxc || return 1
+	checkpath --directory /etc/libvirt/nwfilter || return 1
+	checkpath --directory /etc/libvirt/qemu || return 1
+	checkpath --directory /etc/libvirt/storage || return 1
+}

diff --git a/app-emulation/libvirt/files/libvirtd.service.conf b/app-emulation/libvirt/files/libvirtd.service.conf
new file mode 100644
index 0000000..f087922
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.service.conf
@@ -0,0 +1,10 @@
+# Uncomment the following three lines to start libvirtd with the '--listen'
+# directive such that it listens for TCP/IP connections (honoring the
+# listen_tls and listen_tcp settings in /etc/libvirt/libvirtd.conf). If
+# libvirtd is started without the '--listen' parameter, network connection
+# (for the daemon) is globally disabled:
+
+# [Service]
+# ExecStart=
+# ExecStart=/usr/sbin/libvirtd --listen
+

diff --git a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf b/app-emulation/libvirt/files/libvirtd.tmpfiles.conf
new file mode 100644
index 0000000..c22c23d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/libvirt/lxc 0755 root root -

diff --git a/app-emulation/libvirt/files/virtlockd.init-r1 b/app-emulation/libvirt/files/virtlockd.init-r1
new file mode 100644
index 0000000..e7c3db2
--- /dev/null
+++ b/app-emulation/libvirt/files/virtlockd.init-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="libvirt virtual machine lock manager"
+command="/usr/sbin/virtlockd"
+command_args="-d"
+pidfile="/var/run/virtlockd.pid"
+
+extra_started_commands="reload"
+description_reload="re-exec the daemon, while maintaining locks and clients"
+
+
+depend() {
+    after ntp-client ntpd nfs nfsmount corosync
+}
+
+reload() {
+    ebegin "re-exec() virtlockd"
+
+    start-stop-daemon --signal SIGUSR1 \
+      --exec "${command}" --pidfile "${pidfile}"
+}

diff --git a/app-emulation/libvirt/files/virtlogd.init-r1 b/app-emulation/libvirt/files/virtlogd.init-r1
new file mode 100644
index 0000000..438070e
--- /dev/null
+++ b/app-emulation/libvirt/files/virtlogd.init-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="libvirt virtual machine logging manager"
+command="/usr/sbin/virtlogd"
+command_args="-d"
+pidfile="/var/run/virtlogd.pid"
+
+extra_started_commands="reload"
+description_reload="re-exec the daemon, while maintaining open connections"
+
+
+depend() {
+    after ntp-client ntpd nfs nfsmount corosync
+}
+
+reload() {
+    ebegin "re-exec() virtlogd"
+
+    start-stop-daemon --signal SIGUSR1 \
+      --exec "${command}" --pidfile "${pidfile}"
+}

diff --git a/app-emulation/libvirt/libvirt-4.10.0.ebuild b/app-emulation/libvirt/libvirt-4.10.0.ebuild
new file mode 100644
index 0000000..ca093b5
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-4.10.0.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/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="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	fi
+	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 +libvirtd lvm
+	libssh 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
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	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/gnu-netcat-0.7.1-r3
+		>=net-analyzer/netcat-110-r9
+		>=net-analyzer/netcat6-1.0-r2
+		>=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 )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	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}-4.5.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-4.10.0-fix_apparmor_rules.patch
+	"${FILESDIR}"/${PN}-4.10.0-musl.patch
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# 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
+		~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
+		# 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
+
+	# 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"
+
+	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 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 uml)
+		$(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 || die "tests failed"
+}
+
+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
+
+	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-r3" 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
+
+	newbashcomp "${S}/tools/bash-completion/vsh" vsh
+	bashcomp_alias vsh virsh virt-admin
+
+	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
new file mode 100644
index 0000000..06697bc
--- /dev/null
+++ b/app-emulation/libvirt/metadata.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tamiko@g.o</email>
+	<name>Matthias Maier</name>
+</maintainer>
+<maintainer type="project">
+	<email>virtualization@g.o</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
+<use>
+	<!-- Pool backend flags -->
+	<flag name="iscsi">
+		Allow using an iSCSI remote storage server as pool for disk image storage
+	</flag>
+	<flag name="lvm">
+		Allow using the Logical Volume Manager (<pkg>sys-fs/lvm2</pkg>) as pool for disk image
+		storage
+	</flag>
+	<flag name="nfs">
+		Allow using Network File System mounts as pool for disk image storage
+	</flag>
+	<flag name="parted">
+		Allow using real disk partitions as pool for disk image storage, using
+	<pkg>sys-block/parted</pkg> to create, resize and delete them.
+	</flag>
+	<flag name="rbd">
+		Enable rados block device support via <pkg>sys-cluster/ceph</pkg>
+	</flag>
+	<!-- Virtualisation backends -->
+	<flag name="lxc">
+		Support management of Linux Containers virtualisation (<pkg>app-emulation/lxc</pkg>)
+	</flag>
+	<flag name="openvz">
+		Support management of OpenVZ virtualisation (openvz-sources)
+	</flag>
+	<flag name="uml">
+		Support management of User Mode Linux virtualisation
+	</flag>
+	<flag name="qemu">
+		Support management of QEMU virtualisation (<pkg>app-emulation/qemu</pkg>)
+	</flag>
+	<flag name="xen">
+		Support management of Xen virtualisation (<pkg>app-emulation/xen</pkg>)
+	</flag>
+	<flag name="virtualbox">
+		Support management of VirtualBox virtualisation (one of <pkg>app-emulation/virtualbox</pkg> or
+		<pkg>app-emulation/virtualbox-bin</pkg>)
+	</flag>
+	<flag name="phyp">
+		Support IBM HMC / IVM hypervisor via PHYP protocol
+	</flag>
+	<!-- Miscellaneous flags -->
+	<flag name="apparmor">Enable AppArmor support</flag>
+	<flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for mount
+		points</flag>
+	<flag name="numa">
+		Use NUMA for memory segmenting via <pkg>sys-process/numactl</pkg> and
+		<pkg>sys-process/numad</pkg>
+	</flag>
+	<flag name="libvirtd">
+		Builds the libvirtd daemon as well as the client utilities instead of just the client
+		utilities
+	</flag>
+	<flag name="libssh">
+		Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts,
+		for example: qemu+libssh://server/system
+	</flag>
+	<flag name="pcap">
+		Support auto learning IP addreses for routing
+	</flag>
+	<flag name="macvtap">
+		Support for MAC-based TAP (macvlan/macvtap). For networking instead
+		of the normal TUN/TAP. It has its advantages and disadvantages.
+		macvtap support requires very new kernels and is
+		currently evolving. Support for this is experimental at best.
+	</flag>
+	<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
+		support. Relies on macvtap support.</flag>
+	<flag name="virt-network">
+		Enable virtual networking (NAT) support for guests. Includes all
+		the dependencies for NATed network mode. Effectively any network
+		setup that relies on libvirt to setup and configure network
+		interfaces on your host. This can include bridged and routed
+		networks ONLY if you are allowing libvirt to create and manage
+		the underlying devices for you. In some cases this requires
+		enabling the 'netcf' USE flag (currently unavailable).
+	</flag>
+	<flag name="firewalld">DBus interface to iptables/ebtables allowing
+		for better runtime management of your firewall.</flag>
+	<flag name="wireshark-plugins">
+		Build the <pkg>net-analyzer/wireshark</pkg> plugin for the Libvirt RPC protocol
+	</flag>
+	<flag name="glusterfs">
+		Enable GlusterFS support via <pkg>sys-cluster/glusterfs</pkg>
+	</flag>
+	<flag name="zfs">
+		Enable ZFS backend storage <pkg>sys-fs/zfs</pkg>
+	</flag>
+</use>
+</pkgmetadata>