commit: 875198b0bffbe4060ddb3c3bedb52632c80a6ba7
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 15:55:05 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 16:28:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875198b0
app-emulation/libvirt: Do not create qemu user if USE=-qemu, bug #601678
Package-Manager: Portage-2.3.0, Repoman-2.3.1
app-emulation/libvirt/libvirt-1.3.5-r2.ebuild | 14 ++++----------
app-emulation/libvirt/libvirt-2.1.0-r2.ebuild | 14 ++++----------
app-emulation/libvirt/libvirt-2.3.0.ebuild | 14 ++++----------
app-emulation/libvirt/libvirt-2.5.0-r2.ebuild | 12 +++---------
app-emulation/libvirt/libvirt-9999.ebuild | 12 +++---------
5 files changed, 18 insertions(+), 48 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
index 7803227..5f11f0c 100644
--- a/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -125,15 +125,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
+ if use qemu; then
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 "qemu,kvm"
fi
# Check kernel configuration:
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index 24c8f32..f9d91d7 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -124,15 +124,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
+ if use qemu; then
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 "qemu,kvm"
fi
# Check kernel configuration:
diff --git a/app-emulation/libvirt/libvirt-2.3.0.ebuild
b/app-emulation/libvirt/libvirt-2.3.0.ebuild
index 7d3cd01..96b318e 100644
--- a/app-emulation/libvirt/libvirt-2.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -124,15 +124,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
+ if use qemu; then
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 "qemu,kvm"
fi
# Check kernel configuration:
diff --git a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
index edc6c59..9f91346 100644
--- a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
@@ -130,15 +130,9 @@ PATCHES=(
)
pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
+ if use qemu; then
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 "qemu,kvm"
fi
# Check kernel configuration:
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild
b/app-emulation/libvirt/libvirt-9999.ebuild
index 609bf97..81795e4 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -130,15 +130,9 @@ PATCHES=(
)
pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
+ if use qemu; then
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 "qemu,kvm"
fi
# Check kernel configuration:
