Force on xorg-x11 opengl implem for compile, to ensure we have recent enough glxtokens.h. Reported by johey on freenode.

Package-Manager: portage-2.1_pre10-r5

3 files changed, 22 insertions, 11 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 34a32c3c93c3..98107edde9af 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.119 2006/05/14 22:16:51 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.120 2006/05/14 22:52:32 spyderous Exp $
+
+  14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-1.0.2-r4.ebuild:
+  Force on xorg-x11 opengl implem for compile, to ensure we have recent enough
+  glxtokens.h. Reported by johey on freenode.
 
   14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-1.0.99.903.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 29114f75b55b..d559d833de57 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -55,18 +55,18 @@ DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f406034465
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd size 3062363
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba size 6006486
 DIST xorg-server-1.0.99.903.tar.bz2 6321704 RMD160 09b2b10b979349283e989a7326f0c16e6302e122 SHA256 d64f44e9aa0807c5e30c5c0df65dfdb73139bb82e82958bdaf37aeeb11ed7087 size 6321704
-EBUILD xorg-server-1.0.2-r4.ebuild 5822 RMD160 55ea6d5ccfc3232192d568cb4203a9b5a7a547a4 SHA1 bd0bac102ba35433bbe8ed5144b6dc9418001d92 SHA256 ddab1937bfa5e69d99db039a15417f3c0ec2c45a1e75ab5b076b23e5dd6e69e3 size 5822
-MD5 28d9a20a439505b72d64e52de533a5fa xorg-server-1.0.2-r4.ebuild 5822
-RMD160 55ea6d5ccfc3232192d568cb4203a9b5a7a547a4 xorg-server-1.0.2-r4.ebuild 5822
-SHA256 ddab1937bfa5e69d99db039a15417f3c0ec2c45a1e75ab5b076b23e5dd6e69e3 xorg-server-1.0.2-r4.ebuild 5822
+EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa SHA1 6c17c4717364f28407e8163d232e1fe61c6d5b7b SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be size 6052
+MD5 27e2b115cca585af5c363bcbfed14e61 xorg-server-1.0.2-r4.ebuild 6052
+RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa xorg-server-1.0.2-r4.ebuild 6052
+SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be xorg-server-1.0.2-r4.ebuild 6052
 EBUILD xorg-server-1.0.99.903.ebuild 22538 RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b SHA1 dcb1d3422c88ad49e87e6de371b69ee84e6f8d6f SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab size 22538
 MD5 265ce9a3299a70ae20dd71f7e94c2a2e xorg-server-1.0.99.903.ebuild 22538
 RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b xorg-server-1.0.99.903.ebuild 22538
 SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab xorg-server-1.0.99.903.ebuild 22538
-MISC ChangeLog 25654 RMD160 0ca4d9328a9c5ca636e92329be86bab8a66a2003 SHA1 2ddf98cf3312d4746e747a7d5198eb43112fdaeb SHA256 e8fca32bbdbbef97d5e9f112c81685ad37d5b153fa52ee28569d0cd5e585910f size 25654
-MD5 86f0484131fc47adcff5981876cab048 ChangeLog 25654
-RMD160 0ca4d9328a9c5ca636e92329be86bab8a66a2003 ChangeLog 25654
-SHA256 e8fca32bbdbbef97d5e9f112c81685ad37d5b153fa52ee28569d0cd5e585910f ChangeLog 25654
+MISC ChangeLog 25866 RMD160 0cd7e2889966bce842bab163c8529a32f95ae9df SHA1 6d44261f5aa2cf7b650555ccb926949a50bff320 SHA256 ee2e6b49e95de422b435d39d70dd72eb9537f4fbf1d2a0ebd70360a42b2b6edc size 25866
+MD5 24cc01a7dae5e52a828c3f509e681842 ChangeLog 25866
+RMD160 0cd7e2889966bce842bab163c8529a32f95ae9df ChangeLog 25866
+SHA256 ee2e6b49e95de422b435d39d70dd72eb9537f4fbf1d2a0ebd70360a42b2b6edc ChangeLog 25866
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
index 4295386f3dcd..c350c0e712e4 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r4.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/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild,v 1.3 2006/05/14 19:11:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild,v 1.4 2006/05/14 22:52:32 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -129,6 +129,11 @@ pkg_setup() {
 
 	# (#121394) Causes window corruption
 	filter-flags -fweb
+
+	# Nothing else provides new enough glxtokens.h
+	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
 }
 
 src_install() {
@@ -170,7 +175,8 @@ switch_opengl_implem() {
 		# Use new opengl-update that will not reset user selected
 		# OpenGL interface ...
 		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
 }
 
 xprint_src_install() {