commit:     346a88cb7ebe4b837f199fa3acbee976b0fb8349
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 11:24:54 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 08:22:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346a88cb

x11-drivers/nvidia-drivers: Depend on acct-group/video

Package-Manager: Portage-2.3.91, Repoman-2.3.20
Bug: https://bugs.gentoo.org/show_bug.cgi?id=701210
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild    | 9 ++++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild | 5 +++--
 x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild  | 5 +++--
 x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild  | 5 +++--
 x11-drivers/nvidia-drivers/nvidia-drivers-440.59.ebuild     | 5 +++--
 x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild     | 5 +++--
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index 103ebfe12f1..dd49f94e3b9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 NV_URI="https://us.download.nvidia.com/XFree86/";
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
@@ -31,7 +31,10 @@ SLOT="0/${PV%.*}"
 
 COMMON="
        app-eselect/eselect-opencl
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+       kernel_linux? (
+               >=sys-libs/glibc-2.6.1
+               acct-group/video
+       )
        tools? (
                >=x11-libs/gtk+-2.4:2
                dev-libs/atk
@@ -435,7 +438,7 @@ pkg_preinst() {
        if use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
index 4105f905174..cf876da824e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://www.nvidia.com/";
@@ -39,6 +39,7 @@ REQUIRED_USE="
 
 COMMON="
        app-eselect/eselect-opencl
+       driver? ( kernel_linux? ( acct-group/video ) )
        kernel_linux? ( >=sys-libs/glibc-2.6.1 )
        tools? (
                dev-libs/atk
@@ -499,7 +500,7 @@ pkg_preinst() {
        if use driver && use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild
index 3703f7a20d3..bf97c920078 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://www.nvidia.com/";
@@ -34,6 +34,7 @@ REQUIRED_USE="
 
 COMMON="
        app-eselect/eselect-opencl
+       driver? ( kernel_linux? ( acct-group/video ) )
        kernel_linux? ( >=sys-libs/glibc-2.6.1 )
        tools? (
                dev-libs/atk
@@ -493,7 +494,7 @@ pkg_preinst() {
        if use driver && use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild
index 1d8a6ae60a0..efc890c088a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://www.nvidia.com/";
@@ -34,6 +34,7 @@ REQUIRED_USE="
 
 COMMON="
        app-eselect/eselect-opencl
+       driver? ( kernel_linux? ( acct-group/video ) )
        kernel_linux? ( >=sys-libs/glibc-2.6.1 )
        tools? (
                dev-libs/atk
@@ -505,7 +506,7 @@ pkg_preinst() {
        if use driver && use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.59.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.59.ebuild
index e416cc204ee..c239b98ea01 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.59.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.59.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://www.nvidia.com/";
@@ -34,6 +34,7 @@ REQUIRED_USE="
 
 COMMON="
        app-eselect/eselect-opencl
+       driver? ( kernel_linux? ( acct-group/video ) )
        kernel_linux? ( >=sys-libs/glibc-2.6.1 )
        tools? (
                dev-libs/atk
@@ -511,7 +512,7 @@ pkg_preinst() {
        if use driver && use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild
index 7170a8ba16d..2cf1e05e957 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.64.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability toolchain-funcs unpacker user udev
+       nvidia-driver portability toolchain-funcs unpacker udev
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="https://www.nvidia.com/";
@@ -34,6 +34,7 @@ REQUIRED_USE="
 
 COMMON="
        app-eselect/eselect-opencl
+       driver? ( kernel_linux? ( acct-group/video ) )
        kernel_linux? ( >=sys-libs/glibc-2.6.1 )
        tools? (
                dev-libs/atk
@@ -511,7 +512,7 @@ pkg_preinst() {
        if use driver && use kernel_linux; then
                linux-mod_pkg_preinst
 
-               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               local videogroup="$(getent group video | cut -d ':' -f 3)"
                if [ -z "${videogroup}" ]; then
                        eerror "Failed to determine the video group gid"
                        die "Failed to determine the video group gid"

Reply via email to