Use udev.eclass to install nvidia udev rules.

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

6 files changed, 26 insertions, 39 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 416bcdc2ea0c..e7fb2e052476 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.413 2012/11/19 21:21:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.414 2012/12/11 15:20:56 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  nvidia-drivers-295.71.ebuild, nvidia-drivers-295.75.ebuild,
+  nvidia-drivers-304.60.ebuild, nvidia-drivers-304.64.ebuild,
+  nvidia-drivers-310.19.ebuild:
+  Use udev.eclass to install nvidia udev rules.
 
   19 Nov 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-310.19.ebuild:
   Fix bad directory reference
@@ -179,12 +185,6 @@
   10 Aug 2012; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-173.14.35.ebuild:
   Stable for AMD64 (bug #426642).
 
-  10 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-drivers-295.59-r1.ebuild, nvidia-drivers-302.17-r1.ebuild,
-  nvidia-drivers-304.22.ebuild:
-  Read udevdir from udev.pc pkg-config file for compability with sys-fs/udev >=
-  187.
-
 *nvidia-drivers-295.71 (08 Aug 2012)
 
   08 Aug 2012; Doug Goldstein <cardoe@gentoo.org>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
index 9d299b9be9f9..fe493d8cebc8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.6 2012/09/24 00:48:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.7 2012/12/11 15:20:56 ssuominen Exp $
 
 EAPI="2"
 
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator
+	unpacker user versionator udev
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -345,11 +345,10 @@ src_install() {
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
 		# Ensures that our device nodes are created when not using X
-		exeinto /lib/udev
+		exeinto "$(udev_get_udevdir)"
 		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 
-		insinto /lib/udev/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
 			insinto /boot/modules
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild
index 21f6a2260030..c926bb093ef2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild,v 1.3 2012/11/18 05:15:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild,v 1.4 2012/12/11 15:20:56 ssuominen Exp $
 
 EAPI="2"
 
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator
+	unpacker user versionator udev
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -345,11 +345,10 @@ src_install() {
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
 		# Ensures that our device nodes are created when not using X
-		exeinto /lib/udev
+		exeinto "$(udev_get_udevdir)"
 		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 
-		insinto /lib/udev/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
 			insinto /boot/modules
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild
index 8f6e7ebde9cc..bd95c67746bb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild,v 1.3 2012/11/18 11:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild,v 1.4 2012/12/11 15:20:56 ssuominen Exp $
 
 EAPI=4
 
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator
+	portability toolchain-funcs unpacker user versionator udev
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -230,15 +230,11 @@ src_install() {
 		insinto /etc/modprobe.d
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
-		local udevdir=/lib/udev
-		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 		# Ensures that our device nodes are created when not using X
-		exeinto "${udevdir}"
+		exeinto "$(udev_get_udevdir)"
 		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 
-		insinto "${udevdir}"/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
 			insinto /boot/modules
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild
index a83af254454a..003272cc9eec 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild,v 1.2 2012/11/18 11:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild,v 1.3 2012/12/11 15:20:56 ssuominen Exp $
 
 EAPI=4
 
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator
+	portability toolchain-funcs unpacker user versionator udev
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -230,15 +230,11 @@ src_install() {
 		insinto /etc/modprobe.d
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
-		local udevdir=/lib/udev
-		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 		# Ensures that our device nodes are created when not using X
-		exeinto "${udevdir}"
+		exeinto "$(udev_get_udevdir)"
 		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 
-		insinto "${udevdir}"/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
 			insinto /boot/modules
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild
index 3d6067290dbc..19bb70528dad 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild,v 1.2 2012/11/19 21:21:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild,v 1.3 2012/12/11 15:20:56 ssuominen Exp $
 
 EAPI=4
 
@@ -224,14 +224,11 @@ src_install() {
 		insinto /etc/modprobe.d
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
-		local udevdir=$(udev_get_udevdir)
-
 		# Ensures that our device nodes are created when not using X
-		exeinto "${udevdir}"
+		exeinto "$(udev_get_udevdir)"
 		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 
-		insinto "${udevdir}"/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
 			insinto /boot/modules