"Bumping 1.8.1-r1 to stable for nvidia-glx/kernel commits to follow

5 files changed, 19 insertions, 71 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index a68e06e456fb..c027b4677784 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.44 2004/11/03 20:32:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.45 2004/11/07 01:48:26 cyfred Exp $
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  opengl-update-1.8.1-r1.ebuild, -opengl-update-1.8.1.ebuild:
+  Marking 1.8.1-r1 stable for use with the stablising of
+  nvidia-glx/kernel-1.0.6111-r3
 
 *opengl-update-2.0_pre2 (03 Nov 2004)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 65cfd0bee45b..d1de5a560b04 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,22 +1,20 @@
-MD5 06e66398889b0eaf43fd1a634521bdb0 metadata.xml 318
-MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
-MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
-MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
-MD5 92972dbf730ec6fc9e5678e6d1da771f opengl-update-1.8.1-r1.ebuild 1594
-MD5 3b991a97be9fc8d8b42989ca14d467b7 opengl-update-1.8.1.ebuild 1587
+MD5 d8d78be6eed3147f0fb80a96c26b372d opengl-update-1.8.1-r1.ebuild 1593
 MD5 41f5ceec6cb2831b975101d8cbb64d80 opengl-update-2.0_pre1.ebuild 1745
+MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
 MD5 ad8a6c8fb20118e3b1f8ce67b33c4de5 ChangeLog 7899
+MD5 06e66398889b0eaf43fd1a634521bdb0 metadata.xml 318
 MD5 88d1d3194250339cff3f4e4517ea5464 opengl-update-2.0_pre2.ebuild 1745
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
-MD5 6912837b450e1f1e0956ec5940781eda files/digest-opengl-update-1.8.1 64
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.1-r1 64
-MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
+MD5 4a7ace3be813461bd5d0f76e0828314c opengl-update-1.7.1.ebuild 543
+MD5 cc81df3075c6bf5afa45740b87ae047e opengl-update-1.5.ebuild 527
 MD5 030aafb9c2fc8b4510edcf0ddf09a471 files/opengl-update-1.7.1 4922
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
 MD5 e167f464da278c0b5cbc93f2c66cef4d files/opengl-update-1.8.1 8120
+MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
+MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.1-r1 64
 MD5 0629c7cf1172224a3013ecaf6ef5d0ed files/opengl-update-2.0_pre1 8303
+MD5 e2d654ce48ba8b9908547ab004e33e0a files/opengl-update-2.0_pre2 9386
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre1 64
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre2 64
-MD5 e2d654ce48ba8b9908547ab004e33e0a files/opengl-update-2.0_pre2 9386
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8.1 b/x11-base/opengl-update/files/digest-opengl-update-1.8.1
deleted file mode 100644
index d3f1c0eebb52..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 025a7b25bd2f8729c682ba611053c76d glext.h-20040714.bz2 30744
diff --git a/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild b/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild
index 726556632143..f2a1e7d9e35d 100644
--- a/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild
+++ b/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild,v 1.2 2004/09/24 13:02:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.1-r1.ebuild,v 1.3 2004/11/07 01:48:26 cyfred Exp $
 
 DESCRIPTION="Utility to change the OpenGL interface being used"
 HOMEPAGE="http://www.gentoo.org/"
@@ -9,7 +9,7 @@ SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86"
+KEYWORDS="x86 amd64 arm hppa ia64 s390 ~alpha ~mips ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/x11-base/opengl-update/opengl-update-1.8.1.ebuild b/x11-base/opengl-update/opengl-update-1.8.1.ebuild
deleted file mode 100644
index 520789befeb1..000000000000
--- a/x11-base/opengl-update/opengl-update-1.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.1.ebuild,v 1.5 2004/08/26 14:53:57 cyfred Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-20040714.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 amd64 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~ppc64"
-IUSE=""
-GLEXT="20040714"
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	# xfree has glext.h somewhere out of place so lets make the user move it
-	if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
-	then
-		# Just make it simpler on the user by giving verbose instructions
-		if [ -d /usr/lib/opengl/xfree ]
-		then
-			GL_IM="xfree"
-		else
-			GL_IM="xorg-x11"
-		fi
-
-		echo
-		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
-		ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
-		echo
-		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
-		echo
-		ewarn "You may then remerge opengl-update-1.8 successfully"
-		echo
-
-		die "Userspace problem needs fixing"
-	fi
-}
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# Install default glext.h
-	dodir /usr/lib/opengl/global/include
-	insinto /usr/lib/opengl/global/include
-	doins ${WORKDIR}/glext.h || die
-}