[gentoo-dev] [PATCH 1/6] acct-group/qemu: new group (77)

[gentoo-dev] [PATCH 1/6] acct-group/qemu: new group (77)

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 acct-group/qemu/metadata.xml  | 7 +++++++
 acct-group/qemu/qemu-0.ebuild | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 acct-group/qemu/metadata.xml
 create mode 100644 acct-group/qemu/qemu-0.ebuild

diff --git a/acct-group/qemu/metadata.xml b/acct-group/qemu/metadata.xml
new file mode 100644
index 000000000000..570db49a08f2
--- /dev/null
+++ b/acct-group/qemu/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/qemu/qemu-0.ebuild b/acct-group/qemu/qemu-0.ebuild
new file mode 100644
index 000000000000..ad28345b6152
--- /dev/null
+++ b/acct-group/qemu/qemu-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
-- 
2.22.0

[gentoo-dev] [PATCH 2/6] acct-user/qemu: new user (77)

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 acct-user/qemu/metadata.xml  |  7 +++++++
 acct-user/qemu/qemu-0.ebuild | 11 +++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 acct-user/qemu/metadata.xml
 create mode 100644 acct-user/qemu/qemu-0.ebuild

diff --git a/acct-user/qemu/metadata.xml b/acct-user/qemu/metadata.xml
new file mode 100644
index 000000000000..570db49a08f2
--- /dev/null
+++ b/acct-user/qemu/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/qemu/qemu-0.ebuild b/acct-user/qemu/qemu-0.ebuild
new file mode 100644
index 000000000000..c02bd08c32dd
--- /dev/null
+++ b/acct-user/qemu/qemu-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=77
+ACCT_USER_GROUPS=( qemu kvm )
+
+acct-user_add_deps
-- 
2.22.0

[gentoo-dev] [PATCH 3/6] acct-group/libvirt: new group (79)

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 acct-group/libvirt/libvirt-0.ebuild | 8 ++++++++
 acct-group/libvirt/metadata.xml     | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 acct-group/libvirt/libvirt-0.ebuild
 create mode 100644 acct-group/libvirt/metadata.xml

diff --git a/acct-group/libvirt/libvirt-0.ebuild b/acct-group/libvirt/libvirt-0.ebuild
new file mode 100644
index 000000000000..cb1225fdc0f0
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/libvirt/metadata.xml b/acct-group/libvirt/metadata.xml
new file mode 100644
index 000000000000..570db49a08f2
--- /dev/null
+++ b/acct-group/libvirt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
-- 
2.22.0

[gentoo-dev] [PATCH 4/6] app-emulation/qemu: depend on acct-group/kvm

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 app-emulation/qemu/qemu-4.0.0-r3.ebuild | 7 ++-----
 app-emulation/qemu/qemu-4.0.0-r4.ebuild | 7 ++-----
 app-emulation/qemu/qemu-9999.ebuild     | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
index 49fcec6ba3fe..120a36c5685e 100644
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
@@ -11,7 +11,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -197,6 +197,7 @@ DEPEND="${CDEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
+	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
@@ -310,10 +311,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup kvm 78
-}
-
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
diff --git a/app-emulation/qemu/qemu-4.0.0-r4.ebuild b/app-emulation/qemu/qemu-4.0.0-r4.ebuild
index 9fdb6efecd73..81c3c2357646 100644
--- a/app-emulation/qemu/qemu-4.0.0-r4.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r4.ebuild
@@ -11,7 +11,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -197,6 +197,7 @@ DEPEND="${CDEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
+	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
@@ -312,10 +313,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup kvm 78
-}
-
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8d1410fd8d2d..a0713a362c0b 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -11,7 +11,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -197,6 +197,7 @@ DEPEND="${CDEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
+	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
@@ -308,10 +309,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup kvm 78
-}
-
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
-- 
2.22.0

[gentoo-dev] [PATCH 5/6] app-emulation/libvirt: depend on acct-user/qemu and acct-group/libvirt

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 11 +++--------
 app-emulation/libvirt/libvirt-5.2.0-r3.ebuild | 11 +++--------
 app-emulation/libvirt/libvirt-5.4.0-r1.ebuild | 11 +++--------
 app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 11 +++--------
 app-emulation/libvirt/libvirt-9999.ebuild     | 11 +++--------
 5 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index ce11748ab116..69d15a2c4477 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
index 6eaa333934d9..8709e69b6fde 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
index 796ca2632a99..ea698db7c73b 100644
--- a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index 5cb42f7609c9..5c4936718f6b 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -126,13 +128,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 5cb42f7609c9..5c4936718f6b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -126,13 +128,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
-- 
2.22.0

[gentoo-dev] [PATCH 6/6] net-misc/vde: depend on acct-group/qemu

[Mike Gilbert]

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 net-misc/vde/vde-2.3.2-r4.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
index 45c90ec179d6..868a1ad7cdb8 100644
--- a/net-misc/vde/vde-2.3.2-r4.ebuild
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-single-r1 user flag-o-matic
+inherit python-single-r1 flag-o-matic
 
 MY_P="${PN}2-${PV}"
 
@@ -27,6 +27,7 @@ COMMON_DEPS="pcap? ( net-libs/libpcap )
 	)"
 DEPEND="${COMMON_DEPS}"
 RDEPEND="${COMMON_DEPS}
+	acct-group/qemu
 	selinux? ( sec-policy/selinux-vde )"
 
 S="${WORKDIR}/${MY_P}"
@@ -34,8 +35,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
 
 pkg_setup() {
-	# default group already used in kqemu
-	enewgroup qemu
 	use python && python-single-r1_pkg_setup
 }
 
-- 
2.22.0

Re: [gentoo-dev] [PATCH 1/6] acct-group/qemu: new group (77)

[Matthias Maier]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

For the whole patchset:

On Mon, Jul 29, 2019, at 13:24 CDT, Mike Gilbert <floppym@gentoo.org> wrote:

> Signed-off-by: Mike Gilbert <floppym@gentoo.org>

Acked-by: Matthias Maier <tamiko@gentoo.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 850 bytes --]