Version bump to fix bugs 228547 (broken symlinks) and 261498 (relative path usage). Also fixes issue with file collisions for binary drivers per bug 274959.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 95 insertions, 1 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index c28c35efe6e6..0d76f74ded25 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.44 2009/06/23 11:40:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.45 2009/06/23 14:23:57 scarabeus Exp $
+
+*eselect-opengl-1.0.7 (23 Jun 2009)
+
+  23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +eselect-opengl-1.0.7.ebuild:
+  Version bump to fix bugs 228547 (broken symlinks) and 261498 (relative
+  path usage). Also fixes issue with file collisions for binary drivers per
+  bug 274959.
 
   23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   eselect-opengl-1.0.5.ebuild, eselect-opengl-1.0.6.ebuild,
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild
new file mode 100644
index 000000000000..7155076398e1
--- /dev/null
+++ b/app-admin/eselect-opengl/eselect-opengl-1.0.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/06/23 14:23:57 scarabeus Exp $
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://www.opengl.org/registry/api/glext.h
+# http://www.opengl.org/registry/api/glxext.h
+
+GLEXT="52"
+GLXEXT="21"
+
+# one day is too much for me to wait, unmask this tomorow
+# @ 23.6.09
+#MIRROR="mirror://gentoo/"
+MIRROR="http://dev.gentooexperimental.org/~scarabeus/"
+SRC_URI="${MIRROR}/glext.h-${GLEXT}.bz2
+	${MIRROR}/glxext.h-${GLXEXT}.bz2
+	${MIRROR}/opengl.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# -* to give time for headers to hit mirrors...
+#KEYWORDS="-*"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+EMULTILIB_PKG="true"
+
+DEPEND="app-arch/bzip2"
+RDEPEND=">=app-admin/eselect-1.0.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	mv opengl.eselect-${PV} opengl.eselect
+	mv glext.h-${GLEXT} glext.h
+	mv glxext.h-${GLXEXT} glxext.h
+}
+
+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}"  && "${impl}" != '(none)' ]] ; then
+		eselect opengl set "${impl}"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins opengl.eselect
+
+	# Install default glext.h
+	insinto "/usr/$(get_libdir)/opengl/global/include"
+	doins "${WORKDIR}/glext.h" || die
+	doins "${WORKDIR}/glxext.h" || die
+}