Fixed xorg-x11 OpenGL switch over during upgrade. Bug #127489.

Package-Manager: portage-2.0.54

4 files changed, 11 insertions, 73 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 995e718f494d..807354582ee7 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.114 2006/03/24 21:39:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.115 2006/03/25 05:17:50 augustus Exp $
+
+  25 Mar 2006; Kristopher Kersey <augustus@gentoo.org>
+  nvidia-glx-1.0.8178-r1.ebuild:
+  Fixed xorg-x11 OpenGL switch over during upgrade. Bug #127489.
 
 *nvidia-glx-1.0.8178-r1 (24 Mar 2006)
 *nvidia-glx-1.0.8174-r2 (24 Mar 2006)
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 8f5bb341a946..1cd0cddcca04 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,88 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 feb173009b5944f837048e39b74cd78f ChangeLog 24569
-RMD160 76a19c36a3a95bd953bb7302f21fbe7a2afca53f ChangeLog 24569
-SHA256 e491b62ace1999756979ba8a58547ef07df0117f0ee8645a9086dc29f8ee61dc ChangeLog 24569
+MD5 e34e9e30e19a8630afccd7beb11b08e5 ChangeLog 24721
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
-RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61
-SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 files/09nvidia 61
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
-RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
-SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
-RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
-SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
-RMD160 30596e674a5e7df6f190ee654b39ec41652f1287 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
-SHA256 57ba7359ffb9b95237f737fbb3acb74af0831e9730b226243e78e445a263be13 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
-RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
-SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
-RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
-SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
 MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
-RMD160 6c92e177c7a551ee43dc9bb0a58790d18497fef4 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
-SHA256 074d041899563641d65bf257b3835fe5aea9e7220af24830d96d1183cd18392e files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r3 163
-RMD160 785bfd7eb1649c59db261b0be8cf47ebaa230ffd files/digest-nvidia-glx-1.0.6111-r3 163
-SHA256 5dbe8d160f39f7ec900df43a9c6420ba8390a4f240b3f7c3a3fedafa295d2105 files/digest-nvidia-glx-1.0.6111-r3 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r7 163
-RMD160 83d25cdd7fc33ebb90b3a8fe32c13f67023280e9 files/digest-nvidia-glx-1.0.6629-r7 163
-SHA256 cdde2aa5b1668bae15563a0bea4b4ba5d7c70eca78af2e69e8f8b6146485e6e2 files/digest-nvidia-glx-1.0.6629-r7 163
 MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r3 163
-RMD160 81f900cf43c00dfdc0065d41a56096844744649f files/digest-nvidia-glx-1.0.7167-r3 163
-SHA256 de6adcb2361ffa54d915f15f130c95b4a422855d8606a6731c3265b300f51579 files/digest-nvidia-glx-1.0.7167-r3 163
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r5 163
-RMD160 19c363a4446a5560b1f2954e284a880b94a3ec23 files/digest-nvidia-glx-1.0.7174-r5 163
-SHA256 ac79d4eaa41badaf82e4e69992d43f4fc4f5eb0732b0a0e6ee2debef268a4390 files/digest-nvidia-glx-1.0.7174-r5 163
 MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667-r1 163
-RMD160 e457d68cee6a21f60fcc284f9c4b4cb66690db3b files/digest-nvidia-glx-1.0.7667-r1 163
-SHA256 2520add3990135d6070fb5554ee38a6681d3085ebf44975aa023e47ad133bb51 files/digest-nvidia-glx-1.0.7667-r1 163
 MD5 607f9700f7ddac6b9108db6457ecc06f files/digest-nvidia-glx-1.0.7676-r3 867
-RMD160 34d2353468d32d8cbc8f0ce5f3c9b52f6dd237c5 files/digest-nvidia-glx-1.0.7676-r3 867
-SHA256 fde132cf9e09af78d1b68dcce71a58401fefa7abeec34fdecea601641138fd31 files/digest-nvidia-glx-1.0.7676-r3 867
 MD5 1a1465bd0435ddf0f8379a41416141e0 files/digest-nvidia-glx-1.0.8174-r2 584
-RMD160 75fa4c8c78683af7a2a0d0c59855cc115afa656c files/digest-nvidia-glx-1.0.8174-r2 584
-SHA256 1c2099ddc5b6106a6b8d0902f4c04d3b225f067b524c05b33e92677b4d57ca2f files/digest-nvidia-glx-1.0.8174-r2 584
-MD5 29d2b457cfca3e777d8a5d08df28d999 files/digest-nvidia-glx-1.0.8178-r1 584
-RMD160 ae48ce45e2827ec23edebdde27dc10268c6716cf files/digest-nvidia-glx-1.0.8178-r1 584
-SHA256 08338dfb321934b6c23320587b85e43be3809347b20bdb485a768c7b051b8d5d files/digest-nvidia-glx-1.0.8178-r1 584
+MD5 2052e159a0f171feb2af48a8cafecc99 files/digest-nvidia-glx-1.0.8178-r1 164
 MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
-RMD160 55658c04bed5ab85b36a1849d0619820306e273d files/libGL.la-r2 751
-SHA256 e5147149f3f35f0f34fd9ac077b132f0fa6a201d56cac9bcc2e65b5e0dd39680 files/libGL.la-r2 751
 MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
-RMD160 416561faac567878c46fabc4777704ce99ffe3d6 metadata.xml 302
-SHA256 becf8c60b41ea2f1422062c605941b88f70dad1f0362f8023d042cec690d0fe2 metadata.xml 302
 MD5 e2d67c038b937b1c344969e46833c5cb nvidia-glx-1.0.6111-r3.ebuild 8279
-RMD160 0f7a8b5aa873ba3bbb6d8f0fb657da718b5a622a nvidia-glx-1.0.6111-r3.ebuild 8279
-SHA256 61c534c5b16c9a3348942621690bd875fc50a28379c35dfc87cbb662af0d883b nvidia-glx-1.0.6111-r3.ebuild 8279
 MD5 aa85be1cf861ecfc59c0e3a6d3280678 nvidia-glx-1.0.6629-r7.ebuild 8279
-RMD160 88894f4c1890cb69bd565ba2384a82161d30d555 nvidia-glx-1.0.6629-r7.ebuild 8279
-SHA256 304d4065a6dd22ce1478985d59abe2234020f908be6fcc7bc2c981fdaf8a142b nvidia-glx-1.0.6629-r7.ebuild 8279
 MD5 91ca6f373c27aef0428949dce311cb1e nvidia-glx-1.0.7167-r3.ebuild 8277
-RMD160 908b31e9a08b3ca7edd5680af565abee2f0c9cb7 nvidia-glx-1.0.7167-r3.ebuild 8277
-SHA256 3da27bd500ea867978dfda2f0eb003df73195d6a43e746927d5011dc882b46ea nvidia-glx-1.0.7167-r3.ebuild 8277
 MD5 ddeabbd3121b81754497854925907e15 nvidia-glx-1.0.7174-r5.ebuild 8439
-RMD160 6634a5e25b7dbfe4ead515f3531d0f65e6fe3c92 nvidia-glx-1.0.7174-r5.ebuild 8439
-SHA256 4549469ac586b031d3e88ab71f37403412fc86fb5f994f2653463e9745e6c05e nvidia-glx-1.0.7174-r5.ebuild 8439
 MD5 a1755dd26fa5a4385585393fdd289085 nvidia-glx-1.0.7667-r1.ebuild 8439
-RMD160 2c04e61565929454c5fc886a3aab24b743c0a625 nvidia-glx-1.0.7667-r1.ebuild 8439
-SHA256 bf041bd1e6d01cc1c8172120c230f856441f72ad9afa8cc20b007ca5fcb80378 nvidia-glx-1.0.7667-r1.ebuild 8439
 MD5 067191a8f5c7e105953f8522b354d31d nvidia-glx-1.0.7676-r3.ebuild 9294
-RMD160 5597429d1d784d8b52029754ffb7d332f27c0f7a nvidia-glx-1.0.7676-r3.ebuild 9294
-SHA256 b59d689ecf9ec2cb950941d5a829b1f169237b0e3860980d627d62b8a493666f nvidia-glx-1.0.7676-r3.ebuild 9294
 MD5 b6ddb17fdc29b823272485f371376028 nvidia-glx-1.0.8174-r2.ebuild 9412
-RMD160 5a194b06b785bc841104a9df2036ca3995993d3c nvidia-glx-1.0.8174-r2.ebuild 9412
-SHA256 5edbaa570833b8619be4e468379092bb9a53ad50409a789e7db6676b1613ad1b nvidia-glx-1.0.8174-r2.ebuild 9412
-MD5 95b9c6102f2f1d4dda4181a85b410ff0 nvidia-glx-1.0.8178-r1.ebuild 8538
-RMD160 6587831ded34470afd5f353d9a115195a62ec22e nvidia-glx-1.0.8178-r1.ebuild 8538
-SHA256 73f19c2a851367a71e07b4ceacf8b7b91240ab48d909daba81f49e7639809a79 nvidia-glx-1.0.8178-r1.ebuild 8538
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJGcmOpjtAl+gMRURAq4TAJ95TG4+Pg2TM0vdB1WEDd+Lm7zguACffRSL
-HmiQ8iVQ7GQXbErK2T599jE=
-=QTsS
------END PGP SIGNATURE-----
+MD5 0d47a7e41733212fe7e9253a5a395f03 nvidia-glx-1.0.8178-r1.ebuild 8556
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8178-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8178-r1
index 16d343bf7a06..8ab8ad6fa543 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8178-r1
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8178-r1
@@ -1,6 +1,2 @@
 MD5 bc9d459bfeee93735e3959de041635df NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-RMD160 4075969c4229dd75467113b8eb22ab9645893385 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
 MD5 524acaed325910bed26e880ce65e7405 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild
index 9d9f05d76c5f..068f012bdee5 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild,v 1.1 2006/03/24 21:39:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8178-r1.ebuild,v 1.2 2006/03/25 05:17:50 augustus Exp $
 
 inherit eutils multilib versionator
 
@@ -259,7 +259,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -304,5 +304,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	eselect opengl set xorg-x11
+	eselect opengl set --use-old xorg-x11
 }