Added a block on eselect-1.0.3 for eselect-opengl-1.0.3. Bumped to eselect-opengl-1.0.4 to be compatible with eselect-1.0.3.

(Portage version: 2.1.1_pre1-r5)

4 files changed, 115 insertions, 3 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 544912f6bb0f..74963cbf827b 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2006/06/30 22:25:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.16 2006/07/06 09:29:41 kugelfang Exp $
+
+*eselect-opengl-1.0.4 (06 Jul 2006)
+
+  06 Jul 2006; Danny van Dyk <kugelfang@gentoo.org>
+  eselect-opengl-1.0.3.ebuild, +eselect-opengl-1.0.4.ebuild:
+  Added a block on eselect-1.0.3 for eselect-opengl-1.0.3. Bumped to
+  eselect-opengl-1.0.4 to be compatible with eselect-1.0.3.
 
   30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
   eselect-opengl-1.0.3.ebuild:
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 110dd7b29950..5b55c2f6c86c 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.10 2006/06/30 22:25:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.0.3.ebuild,v 1.11 2006/07/06 09:29:41 kugelfang Exp $
 
 inherit multilib
 
@@ -25,7 +25,8 @@ IUSE=""
 RESTRICT="multilib-pkg-force"
 
 DEPEND="app-arch/bzip2"
-RDEPEND=">=app-admin/eselect-1.0_rc1"
+RDEPEND=">=app-admin/eselect-1.0_rc1
+	!>=app-admin/eselect-1.0.3"
 
 S=${WORKDIR}
 
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild
new file mode 100644
index 000000000000..ad040cfea2b2
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.4.ebuild
@@ -0,0 +1,95 @@
+# 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.4.ebuild,v 1.1 2006/07/06 09:29:41 kugelfang 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="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 ~x86-fbsd"
+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.4 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.4
new file mode 100644
index 000000000000..40181e43f76f
--- /dev/null
+++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.4
@@ -0,0 +1,9 @@
+MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
+RMD160 b21868b31524c2309658d65682b4528823126ae5 glext.h-29.bz2 33215
+SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0 glext.h-29.bz2 33215
+MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
+RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe glxext.h-11.bz2 5900
+SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0 glxext.h-11.bz2 5900
+MD5 99ad3bfa2e5049b71a3b029a671ded35 opengl.eselect-1.0.4.bz2 3309
+RMD160 340581edf9ba6f9cdb5d8bbfa62c838c384630bd opengl.eselect-1.0.4.bz2 3309
+SHA256 7c7535b4ca3630e9ad76cd25c332b8798e80a072f5b3d67dc535e4dac6b385ae opengl.eselect-1.0.4.bz2 3309