Read udevdir from udev.pc pkg-config file for compability with sys-fs/udev >= 187.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 40 insertions, 16 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index f2c02636438a..0ce013e096e6 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.374 2012/08/08 18:23:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.375 2012/08/10 08:23:13 ssuominen Exp $
+
+  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)
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild
index c16f27dce0b3..bd271d01e357 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.59-r1.ebuild,v 1.2 2012/08/06 14:54:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild,v 1.3 2012/08/10 08:23:13 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic nvidia-driver
+inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic nvidia-driver toolchain-funcs
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -31,7 +31,10 @@ COMMON="<x11-base/xorg-server-1.12.99
 	>=app-admin/eselect-opengl-1.0.9
 	app-admin/eselect-opencl"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )
@@ -347,10 +350,13 @@ src_install() {
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
 		# Ensures that our device nodes are created when not using X
-		exeinto /lib/udev
+		local udevdir=/lib/udev
+		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+		exeinto "${udevdir}"
 		doexe "${FILESDIR}"/nvidia-udev.sh
 
-		insinto /lib/udev/rules.d
+		insinto "${udevdir}"/rules.d
 		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
index 024d02bffc33..2e4d7c06e362 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-302.17-r1.ebuild,v 1.2 2012/08/06 14:54:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild,v 1.3 2012/08/10 08:23:13 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic nvidia-driver
+inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic nvidia-driver toolchain-funcs
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -31,7 +31,10 @@ COMMON="<x11-base/xorg-server-1.12.99
 	>=app-admin/eselect-opengl-1.0.9
 	app-admin/eselect-opencl"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )
@@ -347,10 +350,13 @@ src_install() {
 		newins "${WORKDIR}"/nvidia nvidia.conf || die
 
 		# Ensures that our device nodes are created when not using X
-		exeinto /lib/udev
+		local udevdir=/lib/udev
+		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+		exeinto "${udevdir}"
 		doexe "${FILESDIR}"/nvidia-udev.sh
 
-		insinto /lib/udev/rules.d
+		insinto "${udevdir}"/rules.d
 		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild
index d87220ad50d9..eb106b82513d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.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.22.ebuild,v 1.8 2012/07/25 21:59:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild,v 1.9 2012/08/10 08:23:13 ssuominen Exp $
 
 EAPI=4
 
 inherit eutils unpacker multilib portability versionator \
-	linux-mod flag-o-matic nvidia-driver linux-info
+	linux-mod flag-o-matic nvidia-driver linux-info toolchain-funcs
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -34,7 +34,10 @@ COMMON="app-admin/eselect-opencl
 		>=app-admin/eselect-opengl-1.0.9
 	)"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
 RDEPEND="${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? (
@@ -225,11 +228,14 @@ 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 /lib/udev
+		exeinto "${udevdir}"
 		doexe "${FILESDIR}"/nvidia-udev.sh
 
-		insinto /lib/udev/rules.d
+		insinto "${udevdir}"/rules.d
 		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use kernel_FreeBSD; then
 		if use x86-fbsd; then