commit: d46e220e3eda61b10a696173ea314ac6c52b00c6 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Fri Mar 11 07:43:52 2016 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri Mar 11 07:45:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46e220e
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 .../libvirt-1.2.21-avoid_deprecated_pc_file.patch | 24 ++++++++++++++++++++++ app-emulation/libvirt/libvirt-1.2.21-r2.ebuild | 4 +++- app-emulation/libvirt/libvirt-1.3.0-r1.ebuild | 3 ++- app-emulation/libvirt/libvirt-1.3.1.ebuild | 3 ++- 4 files changed, 31 insertions(+), 3 deletions(-) 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 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 <bi...@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 80333ee..bb1c5de 100644 --- 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 f4d64e7..89f5c47 100644 --- 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 0efd3cc..eccbc8e 100644 --- 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" \
