tamiko 14/11/03 18:04:30
Modified: libvirt-1.2.9-r1.ebuild libvirt-9999.ebuild
ChangeLog
Log:
prevent systemd autodetection, bug 508374
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key
BD3A97A3)
Revision Changes Path
1.4 app-emulation/libvirt/libvirt-1.2.9-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild?r1=1.3&r2=1.4
Index: libvirt-1.2.9-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libvirt-1.2.9-r1.ebuild 3 Nov 2014 05:26:47 -0000 1.3
+++ libvirt-1.2.9-r1.ebuild 3 Nov 2014 18:04:30 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild,v 1.3
2014/11/03 05:26:47 patrick Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild,v 1.4
2014/11/03 18:04:30 tamiko Exp $
EAPI=5
@@ -333,6 +333,7 @@
myconf="${myconf} --without-sanlock"
# systemd unit files
+ myconf="${myconf} $(use_with systemd systemd-daemon)"
use systemd && myconf="${myconf} --with-init-script=systemd"
# this is a nasty trick to work around the problem in bug
@@ -390,7 +391,8 @@
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
- systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+ use systemd && \
+ systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf
libvirtd
newinitd "${S}/libvirtd.init" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
1.63 app-emulation/libvirt/libvirt-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.63&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.63&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?r1=1.62&r2=1.63
Index: libvirt-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libvirt-9999.ebuild 3 Nov 2014 05:26:47 -0000 1.62
+++ libvirt-9999.ebuild 3 Nov 2014 18:04:30 -0000 1.63
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v
1.62 2014/11/03 05:26:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v
1.63 2014/11/03 18:04:30 tamiko Exp $
EAPI=5
@@ -333,6 +333,7 @@
myconf="${myconf} --without-sanlock"
# systemd unit files
+ myconf="${myconf} $(use_with systemd systemd-daemon)"
use systemd && myconf="${myconf} --with-init-script=systemd"
# this is a nasty trick to work around the problem in bug
@@ -390,7 +391,8 @@
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
- systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+ use systemd && \
+ systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf
libvirtd
newinitd "${S}/libvirtd.init" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
1.382 app-emulation/libvirt/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.382&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.382&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.381&r2=1.382
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- ChangeLog 3 Nov 2014 05:26:47 -0000 1.381
+++ ChangeLog 3 Nov 2014 18:04:30 -0000 1.382
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.381
2014/11/03 05:26:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.382
2014/11/03 18:04:30 tamiko Exp $
+
+ 03 Nov 2014; Matthias Maier <[email protected]> libvirt-1.2.9-r1.ebuild,
+ libvirt-9999.ebuild:
+ prevent systemd autodetection, bug 508374
03 Nov 2014; Patrick Lauer <[email protected]> libvirt-1.2.9-r1.ebuild,
libvirt-9999.ebuild:
