Correct issues from bug 885013

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

37 files changed, 8 insertions, 2333 deletions

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
deleted file mode 100644
index d339c39..0000000
--- a/app-emulation/libvirt/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX README.gentoo-r2 2094 SHA256 e4360cd1a0ab23180fcc4dc97958f043aedb0b7564f2b7172dbe5e8240c3c247 SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196 WHIRLPOOL 820501bc603a28041eab27221024957a428a59c3edc8eebe4209d984b7f81f1c67da1186f7d402c237dc0a8b4c633266edb2d46255e1305fa4708da8a7be2f96
-AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 SHA256 a8417304d8dfd4d042956d33bfb373d61c7c2c0e8ead8c384300bf32f8acee8e SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 WHIRLPOOL 892bc9d14257929718e29671bea2eb44ed25a8ed5f7f4d8ee72c9d82a4e6a96b5da67f43279de29c06d6abe41ab2792b48515c2dea46aa4a452d76e85ebda973
-AUX libvirt-1.3.0-do_not_use_sysconf.patch 4072 SHA256 896d482d3aa9281977e6900e6103848e34a7e4c0479395016fd1d2ff254eb476 SHA512 44428e16cf1998db0bcae1b54d3ba32363a71db3f45f493bd675f6ad7d6bf131667749f33226ab5f40be52e833ec0899bb9202a8f0e150d007c3f7c71a9cf314 WHIRLPOOL 4978b13925c4836d1601217aec9473a62797821275a1c2bab4a7acb80fa3a34a54ed01b3daf91cd78c20622f3be6f6f9214399fc7da63172a5f9e138727b4fcf
-AUX libvirt-1.3.4-glibc-2.23.patch 2049 SHA256 8fa125da2a8e6dabf17fc47863597b2b3929d4d4b1e01ace1433a75ac4bc0ba2 SHA512 022b610c2e343c9cb595babcc8b2e5e0e0db1a19d6bfc9babdc817bc1e093ff12ee1c26304c188151fecc32481ffd225d7a3d36324613dd5b4ea7139280629c4 WHIRLPOOL 3cc039820865eafd1ea23eec81c3b4f842fe359e49a85d09925dddd5f8b0228adf62fa908cb345b9df0526ed9eb388f965d70ef99d73edcfaf20c5539fcb4559
-AUX libvirt-3.1.0-musl-fix-includes.patch 221 SHA256 40b1814d2a1d05a987242af46592a74feb612ccb3f064e93984bdad29d9c1fc7 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7 WHIRLPOOL d9d7f57cee28f1f6149f6de6f853f08679cbb9b3e82b019ff6046da525c1768ea3f7ef34cf3afa6033e87f80e8f5c74e5f2d129122d8df6edb371e743a3a3af5
-AUX libvirt-3.10.0-fix_paths_for_apparmor.patch 3504 SHA256 b09888e448ec3253ca63a7daae8b19ae1ad85eaa99cb28b1989bae3c7c999a08 SHA512 4fc444f73f69c03c46e21ba51a8ecb9d089fa944ddf22985ca1d595a40535bf2e93f8d76ae64e5abc3b51f5f9007f84dea5e29533629297623abd116b700f6e3 WHIRLPOOL 50664d86f0c6f3d282fc3b7d4c0706fa8e8afb02413b22d3265fb951802b1829f599099502db2487583968f348258c80ca249c9c8f68bcd7965240f5eb4c32d3
-AUX libvirt-guests.confd 2430 SHA256 d5f85bb8c1d2010347f23badc422e98046b97a0066254739b5829fce07837d63 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc WHIRLPOOL 4f06b9319f52b872f14f86da9aeeafecf176c46755955c7773badd0df239fdd76efaff50921565154fa24896d0e4b07df788e785ed6ff5f2308c0ba0e79a9418
-AUX libvirt-guests.init-r2 5412 SHA256 f78ced5ebe644522c6ce102b3f6bcf932686243a50629559f988548c570cad3a SHA512 0f46ec5776c61d1776248779fa894b1a6d7b98d0eb8e8374b320c785c25d92468f087e350233b9152eb2cd0680f6b334c3a61684dabc7c5b559d3b55fdcb712d WHIRLPOOL 77ce5c6e615c94b437f13f8bfb2689cea7b8231a4aa227e83944fd66793a3daf0ada8c041c358f38c2f676dfc7fb071880df682dcc759f63e8e20f033e141d39
-AUX libvirtd.confd-r5 740 SHA256 4f7fba7e64533868119c0f3355aa22932e163b208397323dc2cd96daadcc4079 SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 WHIRLPOOL cc40f10c1ab440efff318f4cac95c0923dfb3309e727d3de4a5dd5cd95181da76a6f1de4ad6740b99d0b65b6bbf5a5128ce24288f77a91268e74d2e8d8e95e49
-AUX libvirtd.init-r16 1093 SHA256 1f875e12cc6ecb1b434bfea774893b84f6602072da0218b654d2ecf79cf2d36d SHA512 5ea4c2f9e48faf2aa8fe7077d075841d610da17e28bcc85c79c55565f286e345339f042090b453e25accf5c405e322e76b6cf846fdfb3e90db3e2d0c2fff4c48 WHIRLPOOL 1de3b7c8fab0ec92d1138f6de9f7ba38087de7094908fc9205d91bfa0bc667d11dff2e113cf393f5508b23badf3a2e524c6f81d5a3b817a7b9d198f0b504332a
-AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545
-AUX libvirtd.tmpfiles.conf 36 SHA256 0102a9bbbb6fc9764c2d49933a89d1661b3999aec53c6a66302cb0f21ce9c9fc SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed WHIRLPOOL c51b2059f4eef0ceaf69e11018a6e51299be5aa21a56741366db4fe43a7998388fa6e5bf15d79c52ab66dd69d64c679003a0904c54033c8bdfc04c16bb5b8e4f
-AUX virtlockd.init-r1 570 SHA256 23ddea66fb2d85c17c382daa07abfabe7fa57d62406d2ca5df0c755f5dcc3834 SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5 WHIRLPOOL 7959e426986747165ef074ca52b8049aa4120b0206b7532330346552fe5811a46fa71b58e02fcd37e55b872e099ccc8688fcc3f30b2e2316e01a4220806d49b4
-AUX virtlogd.init-r1 569 SHA256 1647c11779fd874bdc115234bae0f0f65278084541473d2825aa9864ad49f939 SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 WHIRLPOOL e0fa334c60dac4aa1ff721c3c4e957a688e0a58297cb06249de50dd838c55eee3c1c00fcb4b1c06b74c1fb61c52354889a09bd2793c8623faa120489cac95c3a
-DIST libvirt-3.10.0.tar.xz 14952220 SHA256 dff109cae2cc915b3ed5ba7e460502b85eb9a5058cda4f356d7bb7b1e3196b0e SHA512 c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260 WHIRLPOOL b2eeee1a75fbd8d3878fb646ebc432abdb53568741cf0efbdd9a7b78035e5d8a50720890861c7e8b11e1ec92a9e00b3142f52d7799118255dffedba90245a0c6
-EBUILD libvirt-3.10.0-r1.ebuild 9635 SHA256 785314548039f033b8c1d76c25059e8e5c449e623415618eacd021b616b30b99 SHA512 ac6dd002208619d19d058249df5c4d0f1197c4d4f925b19bd0fcdf4fcde9111f46d51ca71999b55b1249cd3f6307a73f1af119aadfa0243823519eb114dc19f5 WHIRLPOOL e8c1e60a0f205b1f2ec21a99fb8c2df60809b92a80ea741126ba57f37c7c2b1303b44be26d97c5e6c0fb084c8073a496eb8474fa06f0a0b9ddfff3ba30f78261
-EBUILD libvirt-9999.ebuild 9506 SHA256 d5af8cfea0f8f40cb4c1e474a64709440cd5fc31672af9be7bc607fcec880f04 SHA512 669472ae963372efc043f20dcf3a38d06fcdf45eb80ca13c7b76e6fed35590255206731ebd4a42b95017399bba309d49e734c14c07c9b5dc22cc7ae7819dbac2 WHIRLPOOL 1158f1338973b99a1dc518aae73e50015fff4cc2a7d8afee086784525571b2668b76dd5f6eaf5391d8a80d6817f4d8c5caf363d93e758b89202ee73e4c047f43
-MISC metadata.xml 3779 SHA256 4e9be58ed2f7a2426e897aa3530aaeadff88477cabf988545e90d947cccfb859 SHA512 071cc7193ce6b2d6e1a1557f0977697bf7edc07b947fe51cc126975b2bbe7e64079db154112b99bbe88c0c237f2252f4608a7d31c9140b7afd27b00f5dce5a02 WHIRLPOOL 72523ef832a3edb2bcc69154680ea085c5c6f77a12b33be42d558490c499cbbb6edf8161b8b399d3f72b700a165e78669034ad2fd04e237ffae845f7a29396ba
diff --git a/app-emulation/libvirt/files/README.gentoo-r2 b/app-emulation/libvirt/files/README.gentoo-r2
deleted file mode 100644
index 1c086c1..0000000
--- a/app-emulation/libvirt/files/README.gentoo-r2
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index ddedb1f..0000000
--- a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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-1.3.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
deleted file mode 100644
index 47010c4..0000000
--- a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index be1b5a9..5ce0e1e 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -385,9 +385,7 @@ uninstall-logrotate:
- 	rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
- 
- install-sysconfig:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--	$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-+
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 608221c..63708f4 100644
---- a/daemon/libvirtd.service.in
-+++ b/daemon/libvirtd.service.in
-@@ -12,8 +12,7 @@ Documentation=http://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/src/Makefile.am b/src/Makefile.am
-index 7219f7c..c474a23 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2473,11 +2473,6 @@ EXTRA_DIST += \
- 	logging/virtlogd.sysconf
- 
- install-sysconfig:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--	$(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
--	$(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
- 
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 57089b0..ace0c83 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
- Documentation=http://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 a264d3a..b467884 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlogd(8)
- Documentation=http://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/tools/Makefile.am b/tools/Makefile.am
-index 9180564..e72d5f4 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd
- install-sysconfig:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
- 	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-+	  $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
- 
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index c31f663..71cb79d 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
- Documentation=http://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 2770056..accd4f5 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:/// vbox+tcp://host/system lxc:///'
- #URIS=default
diff --git a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
deleted file mode 100644
index adeff5c..0000000
--- a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-get major/minor macros by using AC_HEADER_MAJOR
-
-https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR
-
-https://bugs.gentoo.org/579960
-diff --git a/configure.ac b/configure.ac
-index 93d347c..1e7ee51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long])
- 
-+dnl detect system-specific headers for major()/minor()
-+AC_HEADER_MAJOR
-+
- dnl Availability of various common functions (non-fatal if missing),
-diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
-index bd2eeb6..74b2487 100644
---- a/src/conf/domain_audit.c
-+++ b/src/conf/domain_audit.c
-@@ -28,2 +28,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "domain_audit.h"
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 76bef82..49c0648 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -48,2 +48,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 3c6c839..983cd21 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -38,2 +38,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 38398fd..4b45458 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -31,2 +31,10 @@
- #endif
-+
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include <fcntl.h>
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index bb9604a..9840a9e 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -68,2 +68,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "c-ctype.h"
diff --git a/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch b/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch
deleted file mode 100644
index 70fb168..0000000
--- a/app-emulation/libvirt/files/libvirt-3.1.0-musl-fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/storage/storage_backend_fs.c
-+++ b/src/storage/storage_backend_fs.c
-@@ -30,6 +30,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <unistd.h>
- #include <string.h>
- 
diff --git a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch
deleted file mode 100644
index 0e386c1..0000000
--- a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index ef2f79d..d8cdb9b 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 d4fad85..0b22009 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.lib.libvirt.virt-aa-helper
-deleted file mode 100644
-index bd6181d..0000000
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ /dev/null
-@@ -1,60 +0,0 @@
--# Last Modified: Mon Apr  5 15:10:27 2010
--#include <tunables/global>
--
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
--  #include <abstractions/base>
--
--  # needed for searching directories
--  capability dac_override,
--  capability dac_read_search,
--
--  # needed for when disk is on a network filesystem
--  network inet,
--  network inet6,
--
--  deny @{PROC}/[0-9]*/mounts r,
--  @{PROC}/[0-9]*/net/psched r,
--  owner @{PROC}/[0-9]*/status r,
--  @{PROC}/filesystems r,
--
--  /etc/libnl-3/classid r,
--
--  # for hostdev
--  /sys/devices/ r,
--  /sys/devices/** r,
--  deny /dev/sd* r,
--  deny /dev/vd* r,
--  deny /dev/dm-* r,
--  deny /dev/drbd[0-9]* r,
--  deny /dev/dasd* r,
--  deny /dev/nvme* r,
--  deny /dev/zd[0-9]* r,
--  deny /dev/mapper/ r,
--  deny /dev/mapper/* r,
--
--  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
--  /{usr/,}sbin/apparmor_parser Ux,
--
--  /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,
--
--  # for backingstore -- allow access to non-hidden files in @{HOME} as well
--  # as storage pools
--  audit deny @{HOME}/.* mrwkl,
--  audit deny @{HOME}/.*/ rw,
--  audit deny @{HOME}/.*/** mrwkl,
--  audit deny @{HOME}/bin/ rw,
--  audit deny @{HOME}/bin/** mrwkl,
--  @{HOME}/ r,
--  @{HOME}/** r,
--  /var/lib/libvirt/images/ r,
--  /var/lib/libvirt/images/** r,
--  /{media,mnt,opt,srv}/** r,
--
--  /**.img r,
--  /**.qcow{,2} r,
--  /**.qed r,
--  /**.vmdk r,
--  /**.[iI][sS][oO] r,
--  /**/disk{,.*} r,
--}
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 8d61d15..656a559 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-guests.confd b/app-emulation/libvirt/files/libvirt-guests.confd
deleted file mode 100644
index ed2ce58..0000000
--- a/app-emulation/libvirt/files/libvirt-guests.confd
+++ /dev/null
@@ -1,68 +0,0 @@
-# /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
deleted file mode 100644
index 9db6d95..0000000
--- a/app-emulation/libvirt/files/libvirt-guests.init-r2
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/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
-		echo -n "."
-	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
deleted file mode 100644
index c326531..0000000
--- a/app-emulation/libvirt/files/libvirtd.confd-r5
+++ /dev/null
@@ -1,18 +0,0 @@
-# /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
deleted file mode 100644
index be660e3..0000000
--- a/app-emulation/libvirt/files/libvirtd.init-r16
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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
deleted file mode 100644
index f087922..0000000
--- a/app-emulation/libvirt/files/libvirtd.service.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644
index c22c23d..0000000
--- a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index e7c3db2..0000000
--- a/app-emulation/libvirt/files/virtlockd.init-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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
deleted file mode 100644
index 438070e..0000000
--- a/app-emulation/libvirt/files/virtlogd.init-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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-3.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild
deleted file mode 100644
index aa6bd57..0000000
--- a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1 versionator
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
-	fi
-	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/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-0.13.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.10.0-fix_paths_for_apparmor.patch
-	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-)
-
-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
-		~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)
-		$(use_with xen xen-inotify)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	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/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-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-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
deleted file mode 100644
index 3716e89..0000000
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
-	fi
-	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/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	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-0.13.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
-	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.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
-		~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)
-		$(use_with xen xen-inotify)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	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/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-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
deleted file mode 100644
index 5750757..0000000
--- a/app-emulation/libvirt/metadata.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>samuelbernardo.mail@gmail.com</email>
-	<name>Samuel Bernardo</name>
-</maintainer>
-<maintainer type="project">
-	<email>virtualization@gentoo.org</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>
diff --git a/app-emulation/supermin/Manifest b/app-emulation/supermin/Manifest
deleted file mode 100644
index 0deebdf..0000000
--- a/app-emulation/supermin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD supermin-5.1.18.ebuild 1259 SHA256 df439c46910b2e067cfc893e8dda5c3137da9a11a24e351da7f18bbab4feaf47 SHA512 b500a71d213ae9fd7e2ae0d541284c99b09c9ea2ec4c13d1110042863180049aa3529f3d7cbf34ed9f2805f1ea37e600eddfec4c192bd18323a03cd621e3583e WHIRLPOOL 0b0d35d05fd078ba00040c6a4df72b8001614963e5b02c9b94365fb4bf892d18dd46a136c81786534b8a73ff24f27f83e897c4f8439b3fdd22477dcbdddc777f
-EBUILD supermin-9999.ebuild 1259 SHA256 df439c46910b2e067cfc893e8dda5c3137da9a11a24e351da7f18bbab4feaf47 SHA512 b500a71d213ae9fd7e2ae0d541284c99b09c9ea2ec4c13d1110042863180049aa3529f3d7cbf34ed9f2805f1ea37e600eddfec4c192bd18323a03cd621e3583e WHIRLPOOL 0b0d35d05fd078ba00040c6a4df72b8001614963e5b02c9b94365fb4bf892d18dd46a136c81786534b8a73ff24f27f83e897c4f8439b3fdd22477dcbdddc777f
-MISC metadata.xml 671 SHA256 729595d9a11903236c4aedfc9397663fdab2fb5a623f4178be73f24f24999c42 SHA512 9686312623976518279db082f686ccdf1155a76d18d873d23255c0f8ccbf4df4ffd4b36f250d73ccaea067802e985077638ff678494c73aa02a81a0020f2ee21 WHIRLPOOL 3a0933ca91a47614a47ed593818ebe8732bf6ffd62c437e6ca7ae4072aa411da9250c32593c0276fe1e0e7a41bb3d611e71900747e21ccc280b383a9be7ad864
diff --git a/app-emulation/supermin/metadata.xml b/app-emulation/supermin/metadata.xml
deleted file mode 100644
index 81fd502..0000000
--- a/app-emulation/supermin/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>supermin</herd>
-	<longdescription>
-		Supermin is a tool for building supermin appliances.
-		These are tiny appliances [similar to virtual machines],
-		usually around 100KB in size, which get fully instantiated
-		on-the-fly in a fraction of a second when you need to boot
-		one of them.
-
-		Official documentation at
-		http://people.redhat.com/~rjones/supermin/
-	</longdescription>
-	<use>
-		<flag name='test'>Enable tests with network connection.
-			If you don't have a network connection let it
-			disabled.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-emulation/supermin/supermin-5.1.18.ebuild b/app-emulation/supermin/supermin-5.1.18.ebuild
deleted file mode 100644
index a886f0b..0000000
--- a/app-emulation/supermin/supermin-5.1.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils git-r3 autotools user 
-
-AM_OPTS="-i" #define eautoreconf options
-#AT_NOELIBTOOLIZE="yes" #disable elibtoolize because eautoreconf is crashing at this phase
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://github.com/libguestfs/supermin.git
-		git@github.com:libguestfs/supermin.git"
-	EGIT_SUBMODULES=( '*' )
-	SRC_URI=""
-	KEYWORDS=""
-else
-	EGIT_REPO_URI="
-		https://github.com/libguestfs/supermin.git
-		git@github.com:libguestfs/supermin.git"
-	EGIT_SUBMODULES=( '*' )
-	EGIT_COMMIT="v$PV"
-	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating supermin appliances"
-HOMEPAGE="http://libguestfs.org"
-
-LICENSE="GPL"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
-	dev-lang/ocaml
-	dev-ml/findlib[-tk]
-	dev-lang/perl
-	app-shells/bash
-	sys-devel/gcc
-	sys-apps/gawk
-	>=sys-devel/prelink-20151030
-	app-arch/cpio
-	"
-RDEPEND="
-	sys-fs/e2fsprogs
-	!<=dev-util/febootstrap-3.21
-	"
-
-src_prepare() {
-	"${S}/.gnulib/gnulib-tool" --update >/dev/null 2>&1 || die "gnulib-tool --update failed!"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_enable !test disable-network-tests)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
diff --git a/app-emulation/supermin/supermin-9999.ebuild b/app-emulation/supermin/supermin-9999.ebuild
deleted file mode 120000
index 2852cc8..0000000
--- a/app-emulation/supermin/supermin-9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-supermin-5.1.18.ebuild
\ No newline at end of file
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
deleted file mode 100644
index 0d923f1..0000000
--- a/media-video/handbrake/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX handbrake-0.10.3-nolibav.patch 2821 BLAKE2B 78294506e6b3efe71d7d14537c2e605d10067fd9e637f06ff3b01a9d8e6bea34dfb2c871bb2558e35310bebdb4922ae99f63d9f7911f7236a28ea1a4dc3d6832 SHA512 88a0b5df6cc198a8383a2d1dcf6d4c71f24445ea71e29dac570a2b3987cdaa0a563b56c7cccd291b58099dbdb15130bdcc0cd4527bdaeb442aefe4fa06455ec7
-AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 BLAKE2B 623f902bb31586513a51db95a63841e6234d4841d6332d2be9a6a0d7fd07f3e9cc694eb8945bebf718e10538fa390bbaa9dcbea81ba5324cbf20bd64bc582fdb SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5
-AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
-AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
-DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7 SHA512 bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a
-EBUILD handbrake-1.0.7.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99
-MISC metadata.xml 842 BLAKE2B c494d233f5eb83c6ad5f1eb02e332a8335cf908019942bd0526b45fd9186f300676474a7d814dcf221c8379e6d196f3eb9f14aba04ec10065c12b334176dba1c SHA512 d503d78aefd9a994d3197093f97dd3f958fb8347e6eff7598d9d5ef11a5eb17e0088bac4bb676dfa617dd0377ee185e2d0e80fe91feecd53e5257cbf9adc5f0e
diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
deleted file mode 100644
index 8539186..0000000
--- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 3 Nov 2015 10:16:01 -0800
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
-
----
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index 0d70597..373c2ab 100644
---- a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
-     hb_mux_data_t * track;
-     int meta_mux;
-     int max_tracks;
--    int ii, ret;
-+    int ii, jj, ret;
- 
-     int clock_min, clock_max, clock;
-     hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
-         }
-     }
- 
-+    // Check for audio track associations
-+    for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
-+    {
-+        audio = hb_list_item(job->list_audio, ii);
-+        switch (audio->config.out.codec & HB_ACODEC_MASK)
-+        {
-+            case HB_ACODEC_FFAAC:
-+            case HB_ACODEC_CA_AAC:
-+            case HB_ACODEC_CA_HAAC:
-+            case HB_ACODEC_FDK_AAC:
-+            case HB_ACODEC_FDK_HAAC:
-+                break;
-+
-+            default:
-+            {
-+                // Mark associated fallback audio tracks for any non-aac track
-+                for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
-+                {
-+                    hb_audio_t    * fallback;
-+                    int             codec;
-+
-+                    if (ii == jj) continue;
-+
-+                    fallback = hb_list_item( job->list_audio, jj );
-+                    codec = fallback->config.out.codec & HB_ACODEC_MASK;
-+                    if (fallback->config.in.track == audio->config.in.track &&
-+                        (codec == HB_ACODEC_FFAAC ||
-+                         codec == HB_ACODEC_CA_AAC ||
-+                         codec == HB_ACODEC_CA_HAAC ||
-+                         codec == HB_ACODEC_FDK_AAC ||
-+                         codec == HB_ACODEC_FDK_HAAC))
-+                    {
-+                        hb_mux_data_t * fallback_track;
-+                        int           * sd;
-+
-+                        track = audio->priv.mux_data;
-+                        fallback_track = fallback->priv.mux_data;
-+                        sd = (int*)av_stream_new_side_data(track->st,
-+                                                     AV_PKT_DATA_FALLBACK_TRACK,
-+                                                     sizeof(int));
-+                        if (sd != NULL)
-+                        {
-+                            *sd = fallback_track->st->index;
-+                        }
-+                    }
-+                }
-+            } break;
-+        }
-+    }
-+
-     char * subidx_fmt =
-         "size: %dx%d\n"
-         "org: %d, %d\n"
diff --git a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
deleted file mode 100644
index a963fe0..0000000
--- a/media-video/handbrake/files/handbrake-9999-fix-missing-x265-link-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Written by: Peter Foley <pefoley2@pefoley.com>
-Gentoo Bug: #552792
-
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -25,6 +25,7 @@
- 
- ifeq (1,$(FEATURE.x265))
-     TEST.GCC.D += USE_X265
-+    TEST.GCC.l += x265
- endif
- 
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
deleted file mode 100644
index 7dc1f69..0000000
--- a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libhb/dvdnav.c
-+++ b/libhb/dvdnav.c
-@@ -1225,16 +1225,7 @@
-                 {
-                     for (kk = 0; kk < buttons; kk++)
-                     {
--                        dvdnav_t *dvdnav_copy;
--
--                        result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
--                        if (result != DVDNAV_STATUS_OK)
--                        {
--                            hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
--                            goto done;
--                        }
--                        title = try_button( dvdnav_copy, kk, list_title );
--                        dvdnav_free_dup( dvdnav_copy );
-+                        title = try_button( d->dvdnav, kk, list_title );
- 
-                         if ( title >= 0 )
-                         {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab99..0000000
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
-     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
-     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
--    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
-     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
---- a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild b/media-video/handbrake/handbrake-1.0.7.ebuild
deleted file mode 100644
index 0ce6364..0000000
--- a/media-video/handbrake/handbrake-1.0.7.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-10.1:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-		virtual/libgudev:=
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
deleted file mode 100644
index 1c5819c..0000000
--- a/media-video/handbrake/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-	<name>Ian Whyman</name>
-  </maintainer>
-  <longdescription>
-    Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
-  </longdescription>
-  <use>
-    <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
-    <flag name="gtk">Install the GTK UI, ghb.</flag>
-    <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
-    <flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
-	<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
-  </use>
-</pkgmetadata>
diff --git a/sys-fs/btrfsmaintenance/ChangeLog b/sys-fs/btrfsmaintenance/ChangeLog
deleted file mode 100644
index 58d54e7..0000000
--- a/sys-fs/btrfsmaintenance/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-# ChangeLog for net-misc/axel
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# (auto-generated from git log)
-
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
deleted file mode 100644
index 8cbc6d2..0000000
--- a/sys-fs/btrfsmaintenance/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-EBUILD btrfsmaintenance-0.3.1.ebuild 1677 SHA256 d8d420dea519c290f5da36fe9087bb5945333729afa908828acaea3f32430a96 SHA512 393fbaae5f81e231a2ab6d4c45a98850a2b84d4ddae703a8c986fab7d5b63d426c09f9c461dfabe5039329284d8baedad3f2305282934f5a1f7fa4af08397c89 WHIRLPOOL 4a770eed20e1ca9bfe01a2d4bb28364b05b8fa1133ef82bca6515a7b0af5ea182d4bdb588968f26df0535a86afd99b7243d2f474a87182878f413724879dac44
-EBUILD btrfsmaintenance-9999.ebuild 1677 SHA256 d8d420dea519c290f5da36fe9087bb5945333729afa908828acaea3f32430a96 SHA512 393fbaae5f81e231a2ab6d4c45a98850a2b84d4ddae703a8c986fab7d5b63d426c09f9c461dfabe5039329284d8baedad3f2305282934f5a1f7fa4af08397c89 WHIRLPOOL 4a770eed20e1ca9bfe01a2d4bb28364b05b8fa1133ef82bca6515a7b0af5ea182d4bdb588968f26df0535a86afd99b7243d2f474a87182878f413724879dac44
-MISC ChangeLog 133 SHA256 b43e8276967303e6b4861bc8bd72e25af3b18508e968a04da060d9baac51f197 SHA512 ec2d17be6bdff644ed4b2d4560fa4df52ae95662ac1bf3870d395bef10c426e939607856bd26d58d3cec34ee90547d8eb09bd11e394e9a2028f43400bc24d2f2 WHIRLPOOL cad0c613c8ed3dec798100c471c9bfcc2df31901ad1c23d20f04bca7215efe18fc5fe3d73f4ef53dada0be3d0e70c0985e591b41073b1bc9cd6fe7a0dcca66a5
-MISC metadata.xml 229 SHA256 07a0b6bbb40a353798239f40efd4e2260b64bcfd78c19802da7e8676b0a91599 SHA512 b836c807530b0453ea5ab90e2805759b1d3c4cc0b3a25848b8f0b682c0e99c6422b2a687db1c45e4ebd180f37cf8dc011231e62124d7568bfd7ae10ce46f8a30 WHIRLPOOL 288c65b78dd23fb26e6832f84209395ba6f146c56d3d12352d08d438ff3b34907bebe9753db878fb62e2fac89b4e19b6c8be7f099347a182f00296dfe98afa23
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
deleted file mode 100644
index 1f91d3c..0000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-#PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		https://github.com/kdave/btrfsmaintenance.git
-		git@github.com:kdave/btrfsmaintenance.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		https://github.com/kdave/btrfsmaintenance.git
-		git@github.com:kdave/btrfsmaintenance.git"
-	EGIT_COMMIT="v$PV"
-	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils systemd user ${scm_eclass}
-
-DESCRIPTION="Scripts for btrfs periodic maintenance task"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-
-LICENSE="GPL2"
-SLOT="0"
-#IUSE=""
-
-#CDEPEND="
-#	"
-#DEPEND="${CDEPEND}
-#	"
-RDEPEND="app-shells/bash
-	 sys-fs/btrfs-progs"
-
-src_install() {
-	#dodir "/usr/share/${PN}"
-	# copy files to expected directory
-	#cp -R "${S}/${P}/" "${D}/usr/share/${PN}" || die "Install failed!"
-
-	exeinto "/usr/share/${PN}"
-	doexe btrfs-balance.sh
-	doexe btrfs-defrag.sh
-	doexe btrfs-scrub.sh
-	doexe btrfs-trim.sh
-	doexe ${PN}-refresh-cron.sh
-	doexe prepare-release.sh
-	doexe dist-install.sh
-
-	insinto "/usr/share/${PN}"
-	doins btrfs-defrag-plugin.py
-	doins ${PN}.changes
-	doins ${PN}-functions
-	doins sysconfig.${PN}
-	doins README.md
-	doins COPYING
-
-	insinto "/etc/default"
-	newins sysconfig.${PN} ${PN}
-
-	systemd_dounit ${PN}-refresh.service
-
-	dosym "/usr/share/${PN}/${PN}-refresh-cron.sh" "/etc/cron.hourly/"
-}
-
-pkg_postinst() {
-	elog "You will need to review your /etc/default/${PN} file before starting the service."
-	elog "The source file is at /usr/share/${PN}/sysconfig.${PN}. Setup as necessary."
-}
-
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild
deleted file mode 100644
index 1f91d3c..0000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-#PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		https://github.com/kdave/btrfsmaintenance.git
-		git@github.com:kdave/btrfsmaintenance.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		https://github.com/kdave/btrfsmaintenance.git
-		git@github.com:kdave/btrfsmaintenance.git"
-	EGIT_COMMIT="v$PV"
-	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils systemd user ${scm_eclass}
-
-DESCRIPTION="Scripts for btrfs periodic maintenance task"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-
-LICENSE="GPL2"
-SLOT="0"
-#IUSE=""
-
-#CDEPEND="
-#	"
-#DEPEND="${CDEPEND}
-#	"
-RDEPEND="app-shells/bash
-	 sys-fs/btrfs-progs"
-
-src_install() {
-	#dodir "/usr/share/${PN}"
-	# copy files to expected directory
-	#cp -R "${S}/${P}/" "${D}/usr/share/${PN}" || die "Install failed!"
-
-	exeinto "/usr/share/${PN}"
-	doexe btrfs-balance.sh
-	doexe btrfs-defrag.sh
-	doexe btrfs-scrub.sh
-	doexe btrfs-trim.sh
-	doexe ${PN}-refresh-cron.sh
-	doexe prepare-release.sh
-	doexe dist-install.sh
-
-	insinto "/usr/share/${PN}"
-	doins btrfs-defrag-plugin.py
-	doins ${PN}.changes
-	doins ${PN}-functions
-	doins sysconfig.${PN}
-	doins README.md
-	doins COPYING
-
-	insinto "/etc/default"
-	newins sysconfig.${PN} ${PN}
-
-	systemd_dounit ${PN}-refresh.service
-
-	dosym "/usr/share/${PN}/${PN}-refresh-cron.sh" "/etc/cron.hourly/"
-}
-
-pkg_postinst() {
-	elog "You will need to review your /etc/default/${PN} file before starting the service."
-	elog "The source file is at /usr/share/${PN}/sysconfig.${PN}. Setup as necessary."
-}
-
diff --git a/sys-fs/btrfsmaintenance/metadata.xml b/sys-fs/btrfsmaintenance/metadata.xml
deleted file mode 100644
index 96932c3..0000000
--- a/sys-fs/btrfsmaintenance/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>samuelbernardo.mail@gmail.com</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/zrep/Manifest b/sys-fs/zrep/Manifest
index 88192ef..3495a0f 100644
--- a/sys-fs/zrep/Manifest
+++ b/sys-fs/zrep/Manifest
@@ -1,4 +1,4 @@
-EBUILD zrep-1.8.0.ebuild 957 BLAKE2B 8d5357fd1839ea4e39e24d804651f4736d002494780e9c5db2dfd81d8f345f384aab1f374a51b124c4409a6fc2d3557da86e61a15ce0e38d74e1237b7f589c6d SHA512 9c6a0b88281e33b3a5cfc3edb624890b234a668563c914bc26b9a28def539faa6e30d9d1ecb6f80eba4106b70e39564cfaeebc525c83519ad73304ad663ebcea
-EBUILD zrep-9999.ebuild 926 BLAKE2B 8659480c5dfbcf9f59e6c81cb1eb0b94cf8cd28d68fc05f685788221a9b32b2cfc7d520c295ffebb0211d8bc74b2b85e8d9263992b39c6a7e185c31ad84a3160 SHA512 ed5e6267adf27b94650f99b127bae7b326de52040f543713c40d87db94ab3c5487f005807786e1e3112a47bf68763d2f3be74bee697e592d5d5692d062626d72
+EBUILD zrep-2.0.2.ebuild 945 BLAKE2B bde5206b09fc4883d493e44bdaf58194602c903388f9a4a5df4c891fcec481c8b8a19640fc40865ebcfe6b05443ad940efa1f9779464d392c7de626c14b9c2fd SHA512 61fe6f8b20a2d70c7280e07adfe7ad02e28989db6f49b5655345acfa2cf66237aca53df077055ceda85ee2fff63d784f20e95e03840dfee11a597d1b6fde5e76
+EBUILD zrep-9999.ebuild 914 BLAKE2B 7dd983303f9ee072c4462022b678c92dd6bd5cd7626bc464ff1bd6ac63b341b4ef1d07ec6b3f40ab362f45c2ca8e0c59c45384312763c93c2ed8767296201703 SHA512 bfdfb8086b437095e44266c86e0039d9fb496eb4e803a9ee6075ecc35e2325368a72a604279bd0804ee287b055afcef71ae488d46179ce6121b307459f1502f6
 MISC ChangeLog 133 BLAKE2B e3d7db1c4126e57bb9653a3df59b1ecfb118c0e6eac26d345c719163d2444616f7ea2510312936baadf88eaa2a72a001e389697bec74b47f31dc7b234c08f516 SHA512 ec2d17be6bdff644ed4b2d4560fa4df52ae95662ac1bf3870d395bef10c426e939607856bd26d58d3cec34ee90547d8eb09bd11e394e9a2028f43400bc24d2f2
 MISC metadata.xml 229 BLAKE2B 9f28cf7b6b1e283d6e0f0ab7f7a611ba23584a2adcfdc52987dec50cc570e19044413260a61d13409b2e0e626b8b59460193c82e8e0fefcd5c5c8a4f75b79f4e SHA512 b836c807530b0453ea5ab90e2805759b1d3c4cc0b3a25848b8f0b682c0e99c6422b2a687db1c45e4ebd180f37cf8dc011231e62124d7568bfd7ae10ce46f8a30
diff --git a/sys-fs/zrep/zrep-1.8.0.ebuild b/sys-fs/zrep/zrep-2.0.2.ebuild
index 3423419..dd95738 100644
--- a/sys-fs/zrep/zrep-1.8.0.ebuild
+++ b/sys-fs/zrep/zrep-2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
 #PYTHON_COMPAT=( python2_7 )
 
 if [[ $PV = *9999* ]]; then
@@ -25,7 +25,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils user ${scm_eclass}
+inherit autotools ${scm_eclass}
 
 DESCRIPTION="ZFS based replication and failover solution"
 HOMEPAGE="http://www.bolthole.com/solaris/zrep/"
diff --git a/sys-fs/zrep/zrep-9999.ebuild b/sys-fs/zrep/zrep-9999.ebuild
index 30bb7e4..34bf46d 100644
--- a/sys-fs/zrep/zrep-9999.ebuild
+++ b/sys-fs/zrep/zrep-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
 #PYTHON_COMPAT=( python2_7 )
 
 if [[ $PV = *9999* ]]; then
@@ -24,7 +24,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils user ${scm_eclass}
+inherit autotools ${scm_eclass}
 
 DESCRIPTION="ZFS based replication and failover solution"
 HOMEPAGE="http://www.bolthole.com/solaris/zrep/"