Fix bug #173571 causing wrong eselect opengl set call. On all versions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 18 insertions, 13 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index d9110961f06a..c28c35efe6e6 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.43 2009/03/18 14:31:23 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.44 2009/06/23 11:40:06 scarabeus Exp $
+
+  23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  eselect-opengl-1.0.5.ebuild, eselect-opengl-1.0.6.ebuild,
+  eselect-opengl-1.0.6-r1.ebuild:
+  Fix bug #173571 causing wrong eselect opengl set call. On all versions.
 
   18 Mar 2009; <ricmm@gentoo.org> eselect-opengl-1.0.5.ebuild:
   Drop down to ~mips due to unstable deps
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 8fd10572ff2b..50026c01df51 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -4,8 +4,8 @@ DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA1 5
 DIST glxext.h-19.bz2 6234 RMD160 fdeac6930b4fd70d88fe44f56a029cc466673aaf SHA1 d1dfd98dc5c565f83a798adffb82d4c8f751ce5a SHA256 00a15ec18e586335c3d045b42efe419c5c5383855b2ce4036a1cac3acef21fab
 DIST opengl.eselect-1.0.5.bz2 3365 RMD160 1bd3a537e2703c9d240c8c94d3e609ba2d009866 SHA1 c0aad648804ab1079a4377bc7bf44784136e1818 SHA256 b54ffa9831f86bd7effeea8931ab72e5ac417a2948d634969630039144166cc0
 DIST opengl.eselect-1.0.6.bz2 3295 RMD160 79ab635aeae9001cb4427db6532b17284b36d95e SHA1 c54dc98e4c223038f6b6250acb970e665a8d488e SHA256 50dfb50b9a4479524f34bcf0d421ec216dbab2c50def31fe208c186efe3d1b31
-EBUILD eselect-opengl-1.0.5.ebuild 2213 RMD160 5c944cb2c92216d84df70832302e010aa4834bf4 SHA1 f7b0b1bf818d4661f8049b60c19dc52e78485b72 SHA256 b3636d78041f522ed4b02f4a694e447aff61bbab2fa92640ac5cc664d4aabd35
-EBUILD eselect-opengl-1.0.6-r1.ebuild 2264 RMD160 915969a90cb3943c54dbb5024235ee1eaf6832a7 SHA1 389bc7835f1f886e2bd4670ed24dab361b25f392 SHA256 b5740d672cb880be45fb1092e259fc991570540bda4ba04ff22a8700bf174a35
-EBUILD eselect-opengl-1.0.6.ebuild 2229 RMD160 268332deeb381c48f0ce5ea14a9d3b764f129f54 SHA1 fc91a0245f3434cb2fd0385b2fba1f817a244d19 SHA256 1210d54efe9171e44d1d91042a29b500e63f4cdedefe052b0a95882211f078ad
-MISC ChangeLog 6527 RMD160 df833a120e7bde46e4f3eb51c7fd2f9ee5512fcd SHA1 a7b1f31e8ec85bd126e6ecd85cebe5c6eff06b03 SHA256 6e57bb293f1b987e5443ce64eabb7545019a40f7cc9978f26d652fc5c9244f21
+EBUILD eselect-opengl-1.0.5.ebuild 2242 RMD160 6d0187213568373707c21f9336a7eb3ae153c21c SHA1 70c024f32fe3de0a5c4183bec4a00126fb0b1311 SHA256 4655391cf9fa2ac4a8284e057745a5514a32f258b082dfaba471fef2b7a64fbc
+EBUILD eselect-opengl-1.0.6-r1.ebuild 2293 RMD160 31867bd28b68082a70688c93a58edbaf1a111067 SHA1 4c2b4aa2b6da5aa547cdbd19406b82706f22c1e5 SHA256 2a7a19a6e530e384cd05f77d99d593a4a6fc1513c2cf47e3f08c5b195c8603e0
+EBUILD eselect-opengl-1.0.6.ebuild 2254 RMD160 734a54dde80a055304fdbfbe9b28ab2ae0960c6c SHA1 4a946c19614a5460e871cff80c513ba39274ab13 SHA256 fbfc06fb5c1cc814633efea0fe51b459d85772872cc43909fed1935885644039
+MISC ChangeLog 6755 RMD160 a3e7f3505a0e585aa7c535d45ff9c2c284f021e7 SHA1 e3c2fe0a65e4bc791e72ba65b4c3c50c289c1c75 SHA256 b183555e29a4d6ec2db55af938af7b7003f995ac3aecf1e65dd1362d3876c8f6
 MISC metadata.xml 267 RMD160 134d8d149c085f4a86cbab5e5803acdf7e638958 SHA1 5fe588fe5035811f3e5d1953f20ff44bdd983f7d SHA256 4bdfc9f7a79a41e9524633f6d8c966cd62a2902cf2aae61a30c5ac45805ee7cb
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild
index e4df9d258a64..6a35089c4648 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.5.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/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild,v 1.16 2009/03/18 14:31:23 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.5.ebuild,v 1.17 2009/06/23 11:40:06 scarabeus Exp $
 
 inherit multilib
 
@@ -64,7 +64,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}" ]] ; then
+	if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
 		eselect opengl set "${impl}"
 	fi
 }
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild
index 94616cadda59..f82a297f49dd 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild,v 1.11 2008/10/25 22:25:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.6-r1.ebuild,v 1.12 2009/06/23 11:40:06 scarabeus Exp $
 
 inherit multilib
 
@@ -66,7 +66,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}" ]] ; then
+	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
 		eselect opengl set "${impl}"
 	fi
 }
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild
index 2d9963ecbbe3..d0b10096a3ae 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild,v 1.3 2007/12/27 23:41:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.6.ebuild,v 1.4 2009/06/23 11:40:06 scarabeus Exp $
 
 inherit multilib
 
@@ -64,7 +64,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}" ]] ; then
+	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
 		eselect opengl set "${impl}"
 	fi
 }