app-emulation/libvirt-9999: Rebase libvirt-5.1.0-do-not-use-sysconf.patch

In the upstream, the Makefile.am file that the patch is fixing
was changed leaving the patch failing to apply.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

2 files changed, 18 insertions, 64 deletions

diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch
index 3c32ab81f1d6..292af16b4915 100644
--- a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch
@@ -1,25 +1,25 @@
-From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001
-Message-Id: <cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27.1548428073.git.mprivozn@redhat.com>
+From 525d89d39f78a4099508f47a58c4ab65d1e59c0a Mon Sep 17 00:00:00 2001
+Message-Id: <525d89d39f78a4099508f47a58c4ab65d1e59c0a.1552736006.git.mprivozn@redhat.com>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 26 Jun 2018 06:51:06 +0200
+Date: Sat, 16 Mar 2019 12:33:00 +0100
 Subject: [PATCH] gentoo: do not use sysconf
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 ---
- src/Makefile.am                  | 29 ++++++-----------------------
+ src/Makefile.am                  | 21 ++-------------------
  src/locking/virtlockd.service.in |  3 +--
  src/logging/virtlogd.service.in  |  3 +--
  src/remote/libvirtd.service.in   |  3 +--
- tools/Makefile.am                | 17 ++++-------------
+ tools/Makefile.am                | 13 ++-----------
  tools/libvirt-guests.service.in  |  2 +-
  tools/libvirt-guests.sysconf     |  7 +++++++
- 7 files changed, 21 insertions(+), 43 deletions(-)
+ 7 files changed, 15 insertions(+), 37 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8c8dfe3dcf..25ced3abf3 100644
+index a73f43c483..47dd55c112 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
+@@ -747,23 +747,6 @@ endif WITH_SETUID_RPC_CLIENT
  
  EXTRA_DIST += $(SYSCONF_FILES)
  
@@ -40,27 +40,10 @@ index 8c8dfe3dcf..25ced3abf3 100644
 -	done
 -	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
 -
- SYSVINIT_FILES_IN += \
- 	locking/virtlockd.init.in \
- 	$(NULL)
-@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
- if LIBVIRT_INIT_SCRIPT_RED_HAT
- initdir = $(sysconfdir)/rc.d/init.d
+ LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
  
--install-init: $(SYSVINIT_FILES) install-sysconfig
-+install-init: $(SYSVINIT_FILES)
- 	$(MKDIR_P) $(DESTDIR)$(initdir)
- 	for f in $(SYSVINIT_FILES:%.init=%) ; \
- 	do \
- 	  $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
- 	done
- 
--uninstall-init: uninstall-sysconfig
-+uninstall-init:
- 	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
- 	rmdir $(DESTDIR)$(initdir) || :
- 
-@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ EXTRA_DIST += $(LOGROTATE_FILES_IN)
+@@ -822,14 +805,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
  BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
  DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
  
@@ -77,24 +60,6 @@ index 8c8dfe3dcf..25ced3abf3 100644
  	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
  	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
  
-@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
- if WITH_LIBVIRTD
- if LIBVIRT_INIT_SCRIPT_UPSTART
- 
--install-upstart: install-sysconfig
-+install-upstart:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
- 	for f in $(UPSTART_FILES:%.upstart=%); \
- 	do \
-@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
- 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
- 	done
- 
--uninstall-upstart: uninstall-sysconfig
-+uninstall-upstart:
- 	for f in $(UPSTART_FILES:%.upstart=%); \
- 	do \
- 	  tgt=`basename $$f` ; \
 diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
 index 3c9d587032..2449b201d9 100644
 --- a/src/locking/virtlockd.service.in
@@ -138,11 +103,11 @@ index 7f689e08a8..239beeced9 100644
  KillMode=process
  Restart=on-failure
 diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 613c9a77f0..224b511074 100644
+index c6064dee08..40f41ddb38 100644
 --- a/tools/Makefile.am
 +++ b/tools/Makefile.am
-@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
- uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
+@@ -333,15 +333,6 @@ install-data-local: install-systemd install-nss \
+ uninstall-local: uninstall-systemd uninstall-nss \
  	uninstall-bash-completion
  
 -install-sysconfig:
@@ -154,21 +119,10 @@ index 613c9a77f0..224b511074 100644
 -	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
 -	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
 -
- EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
- 
- install-initscript: libvirt-guests.init
-@@ -362,8 +353,8 @@ uninstall-initscript:
+ EXTRA_DIST += libvirt-guests.sh.in
  
- if LIBVIRT_INIT_SCRIPT_RED_HAT
- BUILT_SOURCES += libvirt-guests.init
--install-init: install-sysconfig install-initscript
--uninstall-init: uninstall-sysconfig uninstall-initscript
-+install-init: install-initscript
-+uninstall-init: uninstall-initscript
- else ! LIBVIRT_INIT_SCRIPT_RED_HAT
- install-init:
- uninstall-init:
-@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
+@@ -361,12 +352,12 @@ EXTRA_DIST += libvirt-guests.service.in
  SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
  
  if LIBVIRT_INIT_SCRIPT_SYSTEMD
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 18c56b58956b..ad8ef5b0f12d 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -125,7 +125,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch
 )