No more rely on build-time opengl choice. Bug #377295

Package-Manager: portage-2.1.10.26/cvs/Linux i686

3 files changed, 25 insertions, 18 deletions

diff --git a/games-sports/foobillard/ChangeLog b/games-sports/foobillard/ChangeLog
index 3126c1e38b10..e821f365b268 100644
--- a/games-sports/foobillard/ChangeLog
+++ b/games-sports/foobillard/ChangeLog
@@ -1,13 +1,16 @@
 # ChangeLog for games-sports/foobillard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.18 2011/02/21 20:28:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.19 2011/10/13 08:00:07 tupone Exp $
+
+  13 Oct 2011; Tupone Alfredo <tupone@gentoo.org> foobillard-3.0a.ebuild:
+  No more rely on build-time opengl choice. Bug #377295 by Michał Górny
 
   21 Feb 2011; Michael Sterrett <mr_bones_@gentoo.org>
   foobillard-3.0a.ebuild, +files/foobillard-3.0a-gl-clamp.patch:
   work around issues with some drivers related to GL_CLAMP (bug #355821)
   - patch submitted by Alan Swanson
 
-  16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   foobillard-3.0a.ebuild:
   virtual/glut -> media-libs/glut
 
@@ -22,15 +25,15 @@
   24 Feb 2007; Tristan Heaven <nyhm@gentoo.org> foobillard-3.0a.ebuild:
   Fix dependencies, bug #168179
 
-  12 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> foobillard-3.0a.ebuild:
+  12 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> foobillard-3.0a.ebuild:
   Force latest versions of autotools.
 
-  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> foobillard-3.0a.ebuild:
+  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> foobillard-3.0a.ebuild:
   Add ~x86-fbsd keyword.
 
   01 Oct 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/foobillard-3.0a-fbsd.patch, foobillard-3.0a.ebuild:
-  fixup nvidia detection and add fbsd support - patch from Diego Pettenò (bug
+  fixup nvidia detection and add fbsd support - patch from Diego Pettenò (bug
   #149718)
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
@@ -85,7 +88,7 @@
 
 *foobillard-1.5 (21 Jun 2002)
 
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> foobillard-1.5.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> foobillard-1.5.ebuild :
   Added KEYWORDS, SLOT.
 
   21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index 9a0093108944..1b8fc7127f70 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX foobillard-3.0a-as-needed.patch 799 RMD160 cd2c185c89c8f442af6f61a35a09d5454ab4834b SHA1 55854a273a3d7a459691385c9f924b41b5619ef3 SHA256 185041c56dc00ac0ea553fe68833dc6524282a647baceab3db2eb98e2c833b27
 AUX foobillard-3.0a-fbsd.patch 930 RMD160 969f6f25504293892ba9fba212f34e09f77e094f SHA1 a3579166e13f0a085e5e601d6aea54b010cd549a SHA256 c08aa1e217408fee5729e3e4cc407bf183f5232096ffe0092a3949e9ea6bcffa
 AUX foobillard-3.0a-gl-clamp.patch 841 RMD160 7fbe59237790332a87e50ca7ded2802d01b4f693 SHA1 61bfc45e60a28c73080213f2554ddca2a92054e4 SHA256 a34d83cee0dc0896942353fb8b2ded11226b02b4338d4d82d7181d98e990f9a1
 AUX foobillard-3.0a-no_nvidia.patch 770 RMD160 db56ca364d8c18c86bbada17a1d465edd9f9b54d SHA1 0d9904ab49426821febb8bd6457b46c6f462e07e SHA256 d94d36c24b8a7d8629bf028a8fba28ed5cf542c5ec2ccdcbf782373b7b9a928b
 DIST foobillard-3.0a.tar.gz 1138477 RMD160 9d5a2d271ca270563592c5f6cf23533447c51483 SHA1 1caa51a201b55883640b5c5b1e9fde20fc71a095 SHA256 d05807077bdba32c4ca1d369344ac983675dc859cb7b192fca4196f23b89b137
-EBUILD foobillard-3.0a.ebuild 1394 RMD160 264de3f9ed37f6bd21879a588cb702128c51fda5 SHA1 7e4dc5039d1b75a662cb224fa332133b0f1106b0 SHA256 a388af82e7b39f811b4464fb36f74933c0e384a0ddeb821b77176ff00d057b44
-MISC ChangeLog 3528 RMD160 43324ea555c0d61ccf48482b0930ff39d41ff3f0 SHA1 bdb8590cca9fc3c6acd436335ed2d73fdda3ee13 SHA256 2452105e40268aa9b4c0e023d2a695c8b6fc5302436055bebbf91d0517d8d5a9
+EBUILD foobillard-3.0a.ebuild 1284 RMD160 d0547a8589d64d7c4cd38c4c5f4bd51536135419 SHA1 335c1587bc4997d54d4d7049f22089790e0df9a0 SHA256 797ef1dd131e1044f0db45c891d66c0462fcf957394e416d6ed9fc95131c06a6
+MISC ChangeLog 3690 RMD160 6ad62fa7f41742c5ee2b837d49726f01ae13e858 SHA1 f5307097335f99ec12b4b4eb9fe45606cc45b897 SHA256 a52ee52db559e22ff98cc820157c33076d110b42b11568d811e2587f33de2ead
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6WmrQACgkQIY77eQFFFC0qswCgp5qeFI2s63teIa8EqKQVc3gi
+KSgAoJZ+yM83g0Pt0bqerRy4kZ9AFk6S
+=02+4
+-----END PGP SIGNATURE-----
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index 0e32b0d39947..622e0fb02158 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.15 2011/02/21 20:28:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.16 2011/10/13 08:00:07 tupone Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="sdl"
+IUSE="sdl video_cards_nvidia"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXi
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libXaw
 	media-libs/libpng
 	sdl? ( media-libs/libsdl )
 	!sdl? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
-	app-admin/eselect-opengl"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch \
@@ -36,16 +35,11 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-	[[ "$(eselect opengl show)" == 'nvidia' ]] \
-		&& myconf='--enable-nvidia=yes' \
-		|| myconf='--enable-nvidia=no'
-
 	egamesconf \
 		--enable-sound \
 		$(use_enable sdl SDL) \
 		$(use_enable !sdl glut) \
-		${myconf}
+		$(use_enable video_cards_nvidia nvidia)
 }
 
 src_install() {