--- nvidia-drivers-190.42-r3.ebuild	2009-11-12 22:36:50.000000000 +0300
+++ nvidia-drivers-190.53.ebuild	2009-12-20 17:12:10.000000000 +0300
@@ -42,7 +42,7 @@
 	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
+	usr/lib/vdpau/libvdpau_nvidia.so.${PV}
 	usr/lib/libXvMCNVIDIA.so.${PV}"
 
 QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
@@ -56,7 +56,7 @@
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
+	usr/lib32/vdpau/libvdpau_nvidia.so.${PV}"
 
 QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
@@ -93,7 +93,7 @@
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
+	usr/lib32/vdpau/libvdpau_nvidia.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
 	usr/lib64/libcuda.so.${PV}
 	usr/lib64/libnvidia-cfg.so.${PV}
@@ -102,7 +102,7 @@
 	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
+	usr/lib64/vdpau/libvdpau_nvidia.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
@@ -114,7 +114,7 @@
 	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
+	usr/lib/vdpau/libvdpau_nvidia.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
@@ -424,9 +424,13 @@
 	fi
 
 	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
+	echo "${libdir}/vdpau/libvdpau_nvidia.so.${sover}"
+	if [[ -f ${libdir}/vdpau/libvdpau_nvidia.so.${sover} ]]; then
+		insinto /usr/${inslibdir}/vdpau
+		insopts -m0755
+		doins ${libdir}/vdpau/libvdpau_nvidia.so.${sover}
+		dosym vdpau/libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
+		dosym vdpau/libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so.1
 	fi
 
 	# OpenCL