Stable amd64 and sparc.

(Portage version: 2.1_pre6-r3)

4 files changed, 10 insertions, 104 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 5a8da737e7e1..b53df99b6f94 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.7 2006/01/28 20:45:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.8 2006/03/15 21:09:06 eradicator Exp $
+
+  15 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  -eselect-opengl-1.0.2-r1.ebuild, eselect-opengl-1.0.3.ebuild:
+  Stable amd64 and sparc.
 
   28 Jan 2006; Markus Rothe <corsair@gentoo.org>
   eselect-opengl-1.0.3.ebuild:
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.2-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.2-r1.ebuild
deleted file mode 100644
index 78e013e995b9..000000000000
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 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.2-r1.ebuild,v 1.2 2005/10/19 20:22:34 eradicator Exp $
-
-inherit multilib
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
-
-GLEXT="29"
-GLXEXT="11"
-
-SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/opengl.eselect-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-RESTRICT="multilib-pkg-force"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="=app-admin/eselect-0.9*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	mv opengl.eselect-${PV} opengl.eselect
-	mv glext.h-${GLEXT} glext.h
-	mv glxext.h-${GLXEXT} glxext.h
-
-	# Small bugfix
-	sed -i 's/ACTION/action/' opengl.eselect
-}
-
-pkg_preinst() {
-	# It needs to be before 04multilib
-	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
-
-	OABI="${ABI}"
-	for ABI in $(get_install_abis); do
-		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
-		fi
-		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
-		fi
-
-		for f in ${ROOT}/usr/$(get_libdir)/libGL.so.* ${ROOT}/usr/$(get_libdir)/libGLcore.so.* ${ROOT}/usr/$(get_libdir)/libnvidia-tls* ${ROOT}/usr/$(get_libdir)/tls/libnvidia-tls* ; do
-			[[ -e ${f} ]] && rm -f ${f}
-		done
-	done
-	ABI="${OABI}"
-	unset OABI
-}
-
-pkg_postinst() {
-	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}" ]] ; then
-		eselect opengl set "${impl}"
-	fi
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins opengl.eselect
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			# Install default glext.h
-			insinto /usr/$(get_libdir)/opengl/global/include
-			doins ${WORKDIR}/glext.h || die
-			doins ${WORKDIR}/glxext.h || die
-		done
-		ABI="${OABI}"
-		unset OABI
-	else
-		# Install default glext.h
-		insinto /usr/$(get_libdir)/opengl/global/include
-		doins ${WORKDIR}/glext.h || die
-		doins ${WORKDIR}/glxext.h || die
-	fi
-}
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
index 3fd33430a3ed..533da09a44e6 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.3.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/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild,v 1.2 2006/01/28 20:45:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild,v 1.3 2006/03/15 21:09:06 eradicator Exp $
 
 inherit multilib
 
@@ -14,13 +14,13 @@ HOMEPAGE="http://www.gentoo.org/"
 GLEXT="29"
 GLXEXT="11"
 
-SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/opengl.eselect-${PV}.bz2"
+SRC_URI="mirror://gentoo/glext.h-${GLEXT}.bz2
+	 mirror://gentoo/glxext.h-${GLXEXT}.bz2
+	 mirror://gentoo/opengl.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE=""
 RESTRICT="multilib-pkg-force"
 
diff --git a/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2-r1 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2-r1
deleted file mode 100644
index 383cdab8ce63..000000000000
--- a/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
-MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
-MD5 a0466ddcd29d715fd8b3159ed70b3fc3 opengl.eselect-1.0.2.bz2 3216