Version bump for eselect-1.0_rc

(Portage version: 2.0.53_rc5)

5 files changed, 111 insertions, 5 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index a7c739538ee1..f6ebb6ee0dda 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.5 2005/10/01 03:10:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.6 2005/10/19 20:22:34 eradicator Exp $
+
+*eselect-opengl-1.0.3 (19 Oct 2005)
+
+  19 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  eselect-opengl-1.0.2-r1.ebuild, +eselect-opengl-1.0.3.ebuild:
+  Version bump for eselect-1.0_rc
 
   01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -eselect-opengl-1.0.1.ebuild, -eselect-opengl-1.0.2.ebuild:
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index cc7c22025069..5433aade41d0 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -1,4 +1,6 @@
-MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
 MD5 3d4d51f1ddb876573310c35049cae441 ChangeLog 1190
-MD5 08e743c19133bdc32646eb0bc6953ff6 eselect-opengl-1.0.2-r1.ebuild 2754
+MD5 c08f2586bab910cdfb458c67da6632ef eselect-opengl-1.0.2-r1.ebuild 2760
+MD5 850565bc0bcfd19456abc93614b12d1c eselect-opengl-1.0.3.ebuild 2764
 MD5 3a40d87eb84b0f56ac411645aec50f87 files/digest-eselect-opengl-1.0.2-r1 183
+MD5 013ad5da746b1b0aa09b89734b753dbc files/digest-eselect-opengl-1.0.3 183
+MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
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
index 3c429dc7c258..78e013e995b9 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.0.2-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/09/14 02:54:33 eradicator Exp $
+# $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
 
@@ -25,7 +25,7 @@ IUSE=""
 RESTRICT="multilib-pkg-force"
 
 DEPEND="app-arch/bzip2"
-RDEPEND="app-admin/eselect"
+RDEPEND="=app-admin/eselect-0.9*"
 
 S=${WORKDIR}
 
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
new file mode 100644
index 000000000000..dcf4519a89a5
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild
@@ -0,0 +1,95 @@
+# 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.3.ebuild,v 1.1 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-1.0_rc1"
+
+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/files/digest-eselect-opengl-1.0.3 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.3
new file mode 100644
index 000000000000..a9dfabf92d1e
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.3
@@ -0,0 +1,3 @@
+MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
+MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
+MD5 d783b07c3a8292f9e6b899eb794ae4b3 opengl.eselect-1.0.3.bz2 3290