gentoo resync : 31.03.2018

4 files changed, 0 insertions, 245 deletions

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 7bb81946e8dc..e0d400e36636 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,10 +1,7 @@
 AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560b23c777c5f2f20407493b4288fc67516c7b45cf2c1868340673c7ba92ea1774a22d59524c6a626b59a SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
-AUX libvirt-1.3.0-do_not_use_sysconf.patch 4072 BLAKE2B 2281954430dbc38262221bb4d2bc3296a067ef79ce70b7d93fee7da92753d808d208fc1e190e4779c2daf44df5e18ae2d0a0aaea04170f9ffa2d851918533fee SHA512 44428e16cf1998db0bcae1b54d3ba32363a71db3f45f493bd675f6ad7d6bf131667749f33226ab5f40be52e833ec0899bb9202a8f0e150d007c3f7c71a9cf314
-AUX libvirt-1.3.4-glibc-2.23.patch 2049 BLAKE2B 8e283846a2442ef4bf3fd5ca88033387d150818972e1b8f4732584423652179d2d6f8df964a8b8a4e51219a946eec30450838207446e20e9bd77ff97c31996de SHA512 022b610c2e343c9cb595babcc8b2e5e0e0db1a19d6bfc9babdc817bc1e093ff12ee1c26304c188151fecc32481ffd225d7a3d36324613dd5b4ea7139280629c4
 AUX libvirt-3.1.0-musl-fix-includes.patch 221 BLAKE2B 65f486f4055c0ccae59601970d770f23f570f127ba26ce1d932855e784b83fce99389f22f12630005be61e5de2e64e0125d0bf5270024f736fe597fa5b81ff78 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7
 AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb929862bd58d1cd208e3f8a3aab10dae98ec8e51d6c3ab579295e3f59ff091970499c6c57b625edec77b98421502df625b1d10c1c3d0be3dfbe489 SHA512 751b971fd0f109f3a4147feea8481adb9c868313ea57d293a89ee548661514f124318324823d9380839a7a5c8ae7c1e3ae8c4c6e62027587f163c8856e353a6a
-AUX libvirt-4.0.0-bash_completion_bugfixes.patch 1863 BLAKE2B ed54b4e308297907001bb2fbcba76197c341c292fc29139f50b9c03cb9ea61696dbd177a4d0055cdca3184a9ecbd283f576c491d2d3c581e31415465bd8e92e1 SHA512 f718408ce57c0abd68023356d5980c5e85dfb5c90759a6758309408dea7115b0ae18a18be2e625401d985fab7b1a374ab1e10caa27527ed002a852bb3f08ca73
 AUX libvirt-4.1.0-do_not_use_sysconf.patch 6867 BLAKE2B 3105dd0ff7c0275f1edb279acd2674f76029bdcb3649f4564d0b57e202b4353d9fca7bd1e98e2fb5ad9e2acafd5616f693058150f6696d00fe4a22d7374bf35a SHA512 a38061d6f9d100f40f429c1b4f5c0a1fe480c412ff9a59aa6c53c22809c88892928aae265e91b5561c02ef29aa075aa68f6e4f2f33bb24045ca82b2ec85087d7
 AUX libvirt-4.1.0-unbreak_my_bridge.patch 2881 BLAKE2B 19110dc2a78fded57d952a5044022d1788aab77ddf3b35d0bea3c064b5000afa7d801d0252c9b44b7632bf3ce6fbd8a8d1c86ac121c5da0095d16a63ba35f78b SHA512 c27614fd652196da2261438aa28e4cf7369d1e54f589815644501e93a6a02d997e1b845ac0fa461c6fb2f6c915441602b22361bfa2109e67280767370517673c
 AUX libvirt-4.2.0-do_not_use_sysconf.patch 6651 BLAKE2B 1863ad6d83e0e3749f506792d8d1fc3a530e4b203c60b1530b6c00727e96441200b25261f2774bea35ac3975498a3ecdad95aff9e026e6aa0da117411c3c2e34 SHA512 8db31a568a41bf76339bb33076aec40b6d485f5b71a94030fc322013d1e7fac717f6d7abdd17729aaede132baf6a3b0a99e7ef315c9bf78cc5e9522ff551813a
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 47010c4f7478..000000000000
--- 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 adeff5c3f305..000000000000
--- 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-4.0.0-bash_completion_bugfixes.patch b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
deleted file mode 100644
index 65894ed4e1d8..000000000000
--- a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html
-https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html
-
-diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
-index e216d9076..e3b8234b4 100644
---- a/tools/virsh-completer.c
-+++ b/tools/virsh-completer.c
-@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl,
- 
-     virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
-                   VIR_CONNECT_LIST_DOMAINS_INACTIVE |
-+                  VIR_CONNECT_LIST_DOMAINS_OTHER |
-+                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
-                   VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
--                  VIR_CONNECT_LIST_DOMAINS_TRANSIENT |
-                   VIR_CONNECT_LIST_DOMAINS_RUNNING |
--                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
--                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
--                  VIR_CONNECT_LIST_DOMAINS_OTHER |
--                  VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
--                  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT,
-+                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF,
-                   NULL);
- 
-     if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 0f329d6d7..5a0e0c1b2 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = {
- };
- 
- static const vshCmdOptDef opts_autostart[] = {
--    VIRSH_COMMON_OPT_DOMAIN_FULL(0),
-+    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT),
-     {.name = "disable",
-      .type = VSH_OT_BOOL,
-      .help = N_("disable autostarting")