Use udev.eclass to install nvidia udev rules.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 46 insertions, 45 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/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 6fd9d511f597..5a11e09a9098 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 SHA512 14c47fa164bde3422b64224e3e46e0a6097599de6193b6d36eb162271d41130f0498f6aee09f5cb60fe43727bf74051f9127afa1b4af42efc28d40af2e4fa86f WHIRLPOOL 34bc9975d132da84506a61a119a5d8d8b5be35af5c1511b5e3228fa3d9f0f3b7f84821c0ab09252054d1471ac7901522309d440c82342d6dfdd2beb73f680460
 AUX 50nvidia-prelink-blacklist 319 SHA256 61adce61498451898c22fb538151379438729957418eacf4f69195b3e03ec1f4 SHA512 7252b464c45669bb402859ddb2c95f4553a37027870b6aeada3e1dd58fefe7b4713d3486d301177efdcd7559dbc31ceb6078220d5c0187bdc636d817a98e1a41 WHIRLPOOL 93e14ed7c8fb5dba87295c87e1e8906afac290f63dc6ea023fa6c387ed47ff13d488b3b24c400aee42a22737856a7782925d9a3a412ddcd1984dbbd7e51579a5
 AUX 95-nvidia-settings 54 SHA256 c4b293c6c2659bebcbad9cffc1e237c6908a3763599e432aba89d07bc2826ba0 SHA512 0fdaff8701598081eeb78defcd140b78f75309ace998df67569a15d0ff653aca7ad0576912bf9a619f42990e6fb35cdb79e21f8181d3cd04dea719d912da8be9 WHIRLPOOL d71fef01f8c346089ef2556ffe62c5094f89582b73500711a7f18f25424e59baa12f6b0861bd8efd9bf4c5bbf794642927ca322cee218fd2da9fc7baa50fa827
@@ -48,12 +51,23 @@ DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.35.ebuild 16668 SHA256 50d53cbce419e474e7e6611d8d8a96988d4863f0934cca843e50d3ba857b0840 SHA512 ac31942bf15278e4ae90376a55e06925c639592325b34cac7d3df386ef863bbaa8d9b554cfc6431ab72777440c08387af5ffd8bf03a711dd34596e9553c5f073 WHIRLPOOL 145bbd21f812553547065bcaf5f2e264de5b05b72bbd068fc0498f0ecc9188993d293c086680b9a4e19479b62d88cab727e12f02666d13319bcbe85b5f7a5b68
 EBUILD nvidia-drivers-173.14.36.ebuild 16665 SHA256 e50b340ce8563da8d6eac511df59b3034bf51b8c571b944a2bb30d46f6d958ae SHA512 ad2c06bf6c875aee05b612e9a56be627e293a911170c520bfa9bad7fb5205a37fa522b592a132ae2e7afefbc0ec2b8d0bd565c3c915dec2e113a23a4d91d1bc9 WHIRLPOOL 6a964b7b6c72bcf0accd7ac7c40288c05031fe0d1801efb3270b1281d2f801e8bed1052b9ebde82c75820e84904966bed6bb2faaa8f48a1ab3100a07dec84ade
-EBUILD nvidia-drivers-295.71.ebuild 18409 SHA256 57c7941eeaf10cca5805ce2d15ee2c8ea12007a1dedf08ad4e9d3b61fabd9872 SHA512 e7dd6c2138f73c2e12412cc1e36e3c1986c609165f03b40153f5cfd9ca9b85b339facf6f043683cb6f9aa5e65811d67d37a76bfcb0cfbed96e1c2e7e42a91886 WHIRLPOOL 2186a695dfb64621e00d60da84fba7695a26c6e256c95a03ec976b962ce311ec4e059f40ed731e87485c71c9913e10d27a30122de8101141ccd08f30fa6fa1b4
-EBUILD nvidia-drivers-295.75.ebuild 18397 SHA256 b2809cc233ac46a3b756b1ea697ded14f3a9a66c2382f8865a1ffd81a8fcf15d SHA512 4c6d05d74ba3eaaf6d8a0a236116dabbd92b40fd6be4b8109cce3914d9d6849acfb8c10475124bd71b14a20eb9cb19ade7ceab01404165e9ad76fcb0cb5d76d6 WHIRLPOOL af771980df809e4a6315fe51d51f018c8c6d219750f177cf0c5d6f1bcbbe8f7e0f5c247f5439352db4f91ec9f2a708c974f6fad0a48a99caf417e0a670fa407e
-EBUILD nvidia-drivers-304.60.ebuild 12803 SHA256 6f11f1599f834f26eae2a5695784ac28695b3b88657ddd7b7f9f3413b6d08661 SHA512 5f8dd0a438e64d3d83561df32352fc550b0ed221426cec1ddc54c29b8fdae83a5882b9eb0ce2cfd0300c665e294a1abff0a472d3d0628676ad02ac73b6749721 WHIRLPOOL 24284a41d40f4eed8b09ecd9b16fb2bbed111c7066728a601f2d9bcedea9cc9e12a255866a1ae5a783f0fdf65f6376f3b0ca8b60942e3537cf189226bb52686b
-EBUILD nvidia-drivers-304.64.ebuild 12803 SHA256 728b9849afdc3c247bc363c8eed883a0e2df6106c8e2bacdb3c01f0d23c58844 SHA512 c689aaae9d068c76a83316fea3fb4c36478bb0a71d444b48ebc49e2a16ebbf80f45363dc444c5bc387d62bda3e3ec032bf225107ee500e267fb3377df8bf2ee5 WHIRLPOOL bd916c7b631bc5bc6c0a8687ce968cebc121f0a01283caa64a47fc5b2df8eb13176fdf23cfa483f34fe6c0308c3a9bc7068111b328f88c2875735dd722b3ff41
-EBUILD nvidia-drivers-310.19.ebuild 12327 SHA256 e4d66883c1eff0e7c1225f7b86f2233dec2cca1779a59bc30a69fe1d81b91a4a SHA512 ef7814f505ad31a3e03be55022a084b8442e8f9835da59a765b2544ed63098f27b96ed866b88e334c93825912c69ecbefc74db7535bf13fdd775e1223a5d4ca2 WHIRLPOOL 17ee1d7bd1bce9c6cf251390bff52affb5df0c85803833906c2c7e7b4be26cad9698334be59f956a4378c5f03d36c67eb29766a0199bf9db3d6106c94fc5f236
+EBUILD nvidia-drivers-295.71.ebuild 18408 SHA256 1bd4ffb066cd1a988bb69cca9f8abd5116046ed2d627f079343daa489b6f1d38 SHA512 0fcde02cdfcf09579a7251f37901771de6570dab0f060de162247f1567287bdcb32bd384cfbf5b3271991edd9160f9589d9260bb115b96872a1f382400e977ee WHIRLPOOL 3637e7363f7c536f5b631bc45ed272a02b9753538168886511e7753e66f555bdf814b16f6e1cd0a23702f1ed6113ee56c8bdea03e4ed7b2ff0d85c12a6da738b
+EBUILD nvidia-drivers-295.75.ebuild 18396 SHA256 28ef1f61e759d0cfe9fe719d456ed7155c5171b87786340fd41a2fd731354d5d SHA512 f9f0cd7aa74f1ded8c48a32c32e670f5f5fdf81665480ba1277d10ca7b1381e6321230f956a868acfa517540c7c4f026e870d816482b750cbdeca6e3742079a8 WHIRLPOOL b94f4f910b2da3ae7a1bb36d314f1eb6146fae8f77834dfbbe492014a8ebad8e4fbedb455086d1c1878bf15be4c1904c3f96d1dcfe4599562fa6a302d0527463
+EBUILD nvidia-drivers-304.60.ebuild 12686 SHA256 50589577d1ab12cf807e5a840cc3dd95109af8b9ad64868b3c3cacd253e043b1 SHA512 ecea6e95df5a32c55f2c0042139c910ec505591a53508920536701df7290763eec64bcba53eaf6a2e8cfce41628272c1379b45fc5d1fa4b1a1bc8aa415dc23f3 WHIRLPOOL 10e2981d3d032ccbff8015862f06d38b180ebcc0caa630ff419fa195db803a7dd4f53b32b54cd458b191fe1c792f71926881c7d27b824f54d8bd63093ccc2b7e
+EBUILD nvidia-drivers-304.64.ebuild 12686 SHA256 d5796d1f1466553a39d52170a1eb1c8ecb45d40b0fd10482e67c8f28ef8edbf8 SHA512 55a5dfa39dc1865ffe5c8d2fde31f8ee96e6d714842c176801418f664d24fbd840d7ca4b8a439e06ef4e130b338932d902f36c8ecf87319ed3121b742af52d62 WHIRLPOOL 797b4dc1c0a40b247d560ae36fd2a5d8fdd0359e3ff0863d8d2c3cb05cfb8b402df459c0b65b80503572f5aa74d446d99ef7300329ea7b4bd764c1291a09d8cb
+EBUILD nvidia-drivers-310.19.ebuild 12278 SHA256 a7618ba67713065adba215a63e7a007b069dd351b3ecd1d657dde6bdfa9e6e00 SHA512 f008c5d8683f38d87fe5b5e17c00ff43f18628149a2fe5948279f5aa9832082d52e95c441481b3ce4c1ac2d454126c4930d63a3ecfa3ed7a8cd8ed50c7e7c036 WHIRLPOOL a4947ed41f8d55f0bfef565bede29a8474826a36286640d14dc26806ab344e89f214eb149ca49aa4526a88990df21210460f5c2d645cbaaf267a6f3af4a68a0e
 EBUILD nvidia-drivers-96.43.20.ebuild 15283 SHA256 dc5391522b493ae6fd04526f41ef1d78cc43d4bc063f06a2f9f04fa6f996bf16 SHA512 f5c198dcadc904d8e96f0071dbf1449a418b147b132b697b110fa9b313cb6678e8c3a3b496c8654655b9f3eb03360742a11b5b689062c4b653baa750d670e21f WHIRLPOOL 0224ba1195f9a231036b8f74bc291776d4eda966f82b7eb7a5f81744d989494d26b8e86ac83e866104bf847f3fded537dd386c9b11f897af3d92ee37881eaa0b
 EBUILD nvidia-drivers-96.43.23.ebuild 15282 SHA256 ee3f8a5239d5ec450430ad3893bd727d3b5c0cfafb243cd7b7385e7bf8d729f4 SHA512 7410054bfeaeb7c51057945e9bf5be11a5505737200df7f5dedf385fe9b4c1c80779644ffc463a55d642233a44886e0a9646e4cdb6033b19885b9f5feea0ed0f WHIRLPOOL 09a674e586e770467cc41af828854065554df979c9b77f5edc01e3107a40ce4a632670f08b78458773b5a8bf430118d4993bb2ecbe0e0a147cfe5583349cf8f6
-MISC ChangeLog 86911 SHA256 533a8856f1d37b574b8084a6f4e1d8fbf0e7ade6ee72f4d927d69aeba49dc8cd SHA512 c60f14e1eb3e481b5c527028d46a63d57cb366aa37994633426a7261a1aa11f2941018e26d3395e5f4bf587c56eff53752ed63af0d4a4da039020e770223c38d WHIRLPOOL 899c3f0b079270d18221ef0339ca6da8ff25389a0067bfd9ebb3aa634081afc8b75a5d80fffb89608bc2f07aac3d690846dda507b7d297ed8c854ed0d01dfa1b
+MISC ChangeLog 86931 SHA256 dd8b65f92e370c5a180a5230275410988defc8d2da824191f42699898c3ff4ab SHA512 037444ef5a5a974c561e421ca81d3afaff7be7e4800e9fa0da85d2695ac5b174d8e6c39f3397b264fb8b8b5af9feba713f0616c49579823e2c8d832ddbcf004e WHIRLPOOL 01a48d0dccaacf6ca23adc4af6d9cd15e913fcc3c117676df8ae45b3270f45f5a28eeb7aea62b5bb49784b6453e5aa9d36a9fa7ae244cc91dcdef8b31f3f7819
 MISC metadata.xml 937 SHA256 807dcc6ae2775af89d15e2253a264ea0d24803bd876f93519d9dfa46abcd8c80 SHA512 85a7324e9a065c9bd003e1f9067adf5ad5408cabd5e37480422066fef392da841622aa6049aba0fabe249cc7e5014d4cb8435e4ad8507645802fad48f2021af9 WHIRLPOOL e87f8890be0329cffefc58b491cde96920344b0cfec5b04589dfd49f3805250c6ff7ecff2e8709fc930b7b77a32ff65ca530596ea521aaf9e97b6f82ccbc6e01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQx09aAAoJEEdUh39IaPFN6cAIAJMcIFAXO0swQhDlHqX37TGC
+3mlB9pU3RM5MN5RaXEQwFBFmi1fRdBb0LzWsJy8918qr7QNNEBHJERBPmaZ/kOL+
+IhUGO9fi0VIkv+scVUJQK12wHMPaEeUlJ0YN54wnwXhGHxcjCwOtjr5ptOIZn9k4
+w6j1HoodEHxqzg9v2mM8JMmX+EkGjaHQZOT5MIyJSbH5zgiql7Q9U8jQEZLDAqCB
+6XvMtHDGzzlWGFM7Gc9Gu9eX72S51KpY5nyAjGW3eMBS390wZMkJhLRCNjEJJnvZ
+sG1CZncIefFD1Sm6OBdZpHUN6VcqpHIlgvIYUd1R1cB4xWxjR0wvG/2VBpjW9MM=
+=F6T5
+-----END PGP SIGNATURE-----
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