diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2015-06-24 11:07:37 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2015-06-24 11:07:37 +0000 |
| commit | 93190f642d91eecb517e207688d473d11de52af9 (patch) | |
| tree | 451d291db0788089f871eeaa63573e82e1dcb37e /app-emulation | |
| parent | Remove depend.php (552872), bump, clean up (diff) | |
| download | gentoo-2-93190f642d91eecb517e207688d473d11de52af9.tar.gz gentoo-2-93190f642d91eecb517e207688d473d11de52af9.tar.bz2 gentoo-2-93190f642d91eecb517e207688d473d11de52af9.zip | |
adjust paths in libvirt-guests.sh (fixed in 1.2.16-r2 only)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/libvirt/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch | 19 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.2.16-r2.ebuild (renamed from app-emulation/libvirt/libvirt-1.2.16-r1.ebuild) | 6 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index 363ab3f44470..217d29c6bda5 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.433 2015/06/24 09:48:26 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.434 2015/06/24 11:07:37 tamiko Exp $ + +*libvirt-1.2.16-r2 (24 Jun 2015) + + 24 Jun 2015; Matthias Maier <tamiko@gentoo.org> + +files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch, + +libvirt-1.2.16-r2.ebuild, -libvirt-1.2.16-r1.ebuild, files/libvirtd.init-r14: + adjust paths in libvirt-guests.sh (fixed in 1.2.16-r2 only) *libvirt-1.2.16-r1 (24 Jun 2015) 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 new file mode 100644 index 000000000000..ddedb1f90cd3 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch @@ -0,0 +1,19 @@ +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/libvirt-1.2.16-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild index 41d3d912ee4f..c5e7146be2c5 100644 --- a/app-emulation/libvirt/libvirt-1.2.16-r1.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.16-r1.ebuild,v 1.1 2015/06/24 09:48:26 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild,v 1.1 2015/06/24 11:07:37 tamiko Exp $ EAPI=5 @@ -227,7 +227,9 @@ src_prepare() { ) >.git-module-status fi - epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch + epatch \ + "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \ + "${FILESDIR}"/${P}-fix_paths_in_libvirt-guests_sh.patch [[ -n ${BACKPORTS} ]] && \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ |