app-emulation/libvirt: avoid deprecated pc file (bug #577034)

The current live version of systemd has removed the libsystemd-deamon.pc
compatibility file. This file is long deprecated, use libsystemd.pc instead
(supported since systemd-209).

Thanks to Elias Probst for the detailed bug report and finding a patch used
by Debian to resolve this issue.

Gentoo-Bug: 577034

Package-Manager: portage-2.2.26

diff --git a/app-emulation/libvirt/files/libvirt-1.2.21-avoid_deprecated_pc_file.patch b/app-emulation/libvirt/files/libvirt-1.2.21-avoid_deprecated_pc_file.patch
new file mode 100644 (file)
index 0000000..fa13f82
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.2.21-avoid_deprecated_pc_file.patch
@@ -0,0 +1,24 @@
+From Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779775
+
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 11 Aug 2015 07:25:01 +0200
+Subject: libsystemd
+
+Use libsystemd instead of deprecated libsystemd-daemon
+---
+ m4/virt-systemd-daemon.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4
+index 8516e41..c9708ec 100644
+--- a/m4/virt-systemd-daemon.m4
++++ b/m4/virt-systemd-daemon.m4
+@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
+ dnl
+ 
+ AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[
+-  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1])
++  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd], [209])
+ 
+     old_CFLAGS="$CFLAGS"
+     old_LIBS="$LIBS"

diff --git a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
index 80333eeb4bd42e2738a15c04978c41724702388b..bb1c5de8a9c6031419f2f1512dbbe36c51ddc9ca 100644 (file)
--- a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
@@ -220,7 +220,9 @@ src_prepare() {
        epatch \
                "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-               "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+               "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch \
+               "${FILESDIR}"/${P}-avoid_deprecated_pc_file.patch
+
 
        [[ -n ${BACKPORTS} ]] &&
                EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \

diff --git a/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
index f4d64e7119714592c03bb7425f6b7ee5e55308de..89f5c4767f84766e79f918dccd56a54e7d8669d3 100644 (file)
--- a/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
@@ -220,7 +220,8 @@ src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-do_not_use_sysconf.patch \
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-               "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+               "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch \
+               "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch
 
        [[ -n ${BACKPORTS} ]] &&
                EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \

diff --git a/app-emulation/libvirt/libvirt-1.3.1.ebuild b/app-emulation/libvirt/libvirt-1.3.1.ebuild
index 0efd3ccce76c38935279e2a262bf630bde713206..eccbc8e21eb5002c1f80fe7c91105ac180e634e2 100644 (file)
--- a/app-emulation/libvirt/libvirt-1.3.1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.1.ebuild
@@ -220,7 +220,8 @@ src_prepare() {
        epatch \
                "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-               "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch
+               "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch \
+               "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch
 
        [[ -n ${BACKPORTS} ]] &&
                EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \