don't install the vdpau headers since libvdpau provides those now

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

4 files changed, 10 insertions, 14 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index e7978f2ad3b5..fdb1390b7590 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.181 2009/10/22 14:32:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.182 2009/10/22 15:31:06 cardoe Exp $
+
+  22 Oct 2009; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild:
+  don't install the vdpau headers since libvdpau provides those now
 
 *nvidia-drivers-190.42-r1 (22 Oct 2009)
 *nvidia-drivers-185.18.36-r1 (22 Oct 2009)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 461f84e219de..9195ca8eafb7 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -74,19 +74,19 @@ EBUILD nvidia-drivers-180.60.ebuild 16484 RMD160 ddf5daf063caf410dea44d781273866
 EBUILD nvidia-drivers-185.18.14.ebuild 16259 RMD160 5afb71205d7cd3ca529f99acc7b743c54cdee317 SHA1 e0808cfc3d5e0e9ff791731cf81e7ac493d759ce SHA256 9ebe9d2c14bef5c532adc08e8bbafc7071874ff09ff71e3ceed16f27e175596e
 EBUILD nvidia-drivers-185.18.29.ebuild 16782 RMD160 74b098cae5e0ab93bb35299363c2d158ee06fe2d SHA1 f683e5eb6ca52f5af92294047ee64077ceb738b7 SHA256 6162cef9ea17fe031bcd49c65dbd2cfce1dcdbe664f9290ae39d608fbadf3ad6
 EBUILD nvidia-drivers-185.18.31.ebuild 17075 RMD160 361c95e91e7769ad4338d1f7aeaae97415b949f1 SHA1 eaa516f516b930c9716d3f3fc3bf46ce922fa748 SHA256 bcbda6935589b0747f300f7854cb912a670eacc1292df0a75da8b2cebaa9a951
-EBUILD nvidia-drivers-185.18.36-r1.ebuild 16851 RMD160 d54eac9193394f4daf86fff6f67bcbec627f8d4f SHA1 a8b38dbe24a946cd778360a2cc4f943b4a519f4e SHA256 fe569d53c1a01ae0f4959c069b725fc5acab58fccd88be1f8989b58c1768a499
+EBUILD nvidia-drivers-185.18.36-r1.ebuild 16764 RMD160 a4b9761445e1ca040b0196602e3b35532659940c SHA1 6b1794daa058fc24d12dfa01ad617003c3300a77 SHA256 218b80f688d1fdcbe817e08780c30c3af50770d5ae542af7a2745c37f651a34d
 EBUILD nvidia-drivers-185.18.36.ebuild 17075 RMD160 3b833a3d6c46eadb1e9b9d033362dd423c926aab SHA1 19f26aa8a5921997ccfd20a917ebcee6686ff911 SHA256 ad801049e4b38ee8db654b997c97c8fb8bf8446e9b3f775d0f413b9d6392cb1a
 EBUILD nvidia-drivers-190.18.ebuild 16256 RMD160 e45d4f48317efd98fd39550df9609203f690bd7c SHA1 b3debdbc83efc814952cf59b4fa1c2db5f4b925d SHA256 eb375167665d2bc55954dc71102fb6768e406abbef69f9d3ed6c0dc1ede978a4
 EBUILD nvidia-drivers-190.25.ebuild 16256 RMD160 5a426a81de215f634e4eac5043466147948a382a SHA1 c819e476157d2bad033f01547598d76324a9081c SHA256 e1db51a723b665e2579b5e092acdc2d08020a2ccf29125e5cfcb383f4aa88921
 EBUILD nvidia-drivers-190.32.ebuild 17833 RMD160 51d520efdd43d9bdb582782303ee996521db73df SHA1 381c0dd7288008d228bfebb4cf1d6ad271f2e25b SHA256 55ab3a0c4bea0832f915702a008a9e481d901f57dcff73f6896b5976f2349380
 EBUILD nvidia-drivers-190.36.ebuild 17833 RMD160 d5af727e7be7a843c4a27873f67a8f762caf3c25 SHA1 53db5482055d86d20f43f28b42ac0406bea8cddb SHA256 a5a4f663db363d41df53673a96cb3dbc20e71f890d0df4c100f5e815fb2d6434
 EBUILD nvidia-drivers-190.40.ebuild 17833 RMD160 b121da08045d172d6f3545512a3af776e04ae767 SHA1 ffdee6c1b807aadcf1e050a5eac01661f5106885 SHA256 f3bc8ef991ab42364aa0a46e8e1932d81e300bd43f71f00afb85a477666551dd
-EBUILD nvidia-drivers-190.42-r1.ebuild 17609 RMD160 509faa9d672cb42f2aa0270974cc2fb86910a698 SHA1 aa2fdcd5ebb6cf5350f83c137a1615a44f2dcb4d SHA256 2da0e4bba2bfa9726291cb2de85b13873fccbb6a0d86e857ddd6e0eec150b6e7
+EBUILD nvidia-drivers-190.42-r1.ebuild 17522 RMD160 d35d61f5b4386954e3f03547e3260f937cff1d27 SHA1 92e042517fc3456d88dbcff9bc6a4fc602d4608a SHA256 478e007a142ea63d9395d635cb7d7b08d0e3ec2378b949b207b518da5b2d1fde
 EBUILD nvidia-drivers-190.42.ebuild 17832 RMD160 2cf31eca3e591446d9f68aa28d4e2e04c354342f SHA1 c896016a53ce1e9143d2e647a0cd3b722aa030a5 SHA256 f41bee0068706c8eb28050d0caa676ead3beab5a06be620499c492db2bb0713d
 EBUILD nvidia-drivers-71.86.09.ebuild 14131 RMD160 46bffecc5be879ccdfe9eb36240592229c1b74a7 SHA1 2349e50eaec717c08b1713b180c383eb9600b148 SHA256 18d3c0f8c6e99eadc69cca55e66e84b4a973dc3cb25b8bcbef8116632bf01769
 EBUILD nvidia-drivers-71.86.11.ebuild 14133 RMD160 4ad12a53903f4771d5cc273a39afee39ce28396c SHA1 98bfb1d62179c274f744574108743d7cc033176e SHA256 0171d5209a497ebb6d248ec3e7752c785bb4e8ca887bf21dc66fed08967c9e06
 EBUILD nvidia-drivers-96.43.09.ebuild 14459 RMD160 0e24556bce249618701bdd74400ef6abbcb08393 SHA1 1191969250b364d1e86605a7d38d4ef35bedc6d7 SHA256 19b00837cf4deef75e3bd017e5d41ae2a406b9ed66fc62e2c2d8caea2036a9d2
 EBUILD nvidia-drivers-96.43.11.ebuild 14458 RMD160 07dd1b097a43d5bb921e5f3b84b2fff9e156f665 SHA1 923bbc5d066785b1a801cf660e23236f9ef41fb9 SHA256 847a28df901ae84b78a568296f14e77d516b631cae7c6a16c7e6c2c5b1fde95f
 EBUILD nvidia-drivers-96.43.13.ebuild 14459 RMD160 c720f2828a9e74637f2f6fbdda87b3ae40c00028 SHA1 83e8fdce0341873dd0442de65deb13dfb67d6cfa SHA256 445646f541cadb8cbfba203545895cada039ed5ef6d3ec1c080cf955a6938d7f
-MISC ChangeLog 41494 RMD160 65b0339745378b152bfde9b9eb24506c2174844c SHA1 ec809e0a1c21f30e5a7d438880578d28b641abed SHA256 1207962d23bbc2d1438cd402e148cfa3fc0c1a5592fd11cf48d810a294fd1bc6
+MISC ChangeLog 41684 RMD160 92eceaa3d18a248e2a6769af096e19f8f3b385bb SHA1 6c173d836650d40647ce74e2b2a73062ae22d108 SHA256 777cf3b549ec89f3378932e6dadadfe800b59f80562ce7ae85aa3fdd1791135f
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
index a71673b345fe..d12076506075 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild,v 1.1 2009/10/22 14:32:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36-r1.ebuild,v 1.2 2009/10/22 15:31:06 cardoe Exp $
 
 EAPI="2"
 
@@ -479,10 +479,6 @@ src_install-libs() {
 
 	#vdpau
 	if [[ -f usr/include/vdpau/vdpau.h ]]; then
-		dodir /usr/include/vdpau
-		insinto /usr/include/vdpau
-		doins usr/include/vdpau/*.h
-
 		dolib.so usr/${pkglibdir}/libvdpau_nvidia.so.${PV}
 		dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so.1
 		dosym libvdpau_nvidia.so.1 /usr/${inslibdir}/libvdpau_nvidia.so
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild
index abc871e00cbf..15c675c15fdd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild,v 1.1 2009/10/22 14:32:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r1.ebuild,v 1.2 2009/10/22 15:31:06 cardoe Exp $
 
 EAPI="2"
 
@@ -481,10 +481,6 @@ src_install-libs() {
 
 	#vdpau
 	if [[ -f usr/include/vdpau/vdpau.h ]]; then
-		dodir /usr/include/vdpau
-		insinto /usr/include/vdpau
-		doins usr/include/vdpau/*.h
-
 		dolib.so usr/${pkglibdir}/libvdpau_nvidia.so.${PV}
 		dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so.1
 		dosym libvdpau_nvidia.so.1 /usr/${inslibdir}/libvdpau_nvidia.so