From 907909fc6f741b6a340c80898168745e42d1a107 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 5 Sep 2005 20:30:38 +0000 Subject: Version bump to fix symlinking to tls libs and --impl-headers. Plus much cleanup of the module thanks to kugs. Package-Manager: portage-2.0.51.22-r2 --- app-admin/eselect-opengl/ChangeLog | 9 ++- app-admin/eselect-opengl/Manifest | 10 ++- .../eselect-opengl/eselect-opengl-1.0.2.ebuild | 92 ++++++++++++++++++++++ .../files/digest-eselect-opengl-1.0.2 | 3 + 4 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 app-admin/eselect-opengl/eselect-opengl-1.0.2.ebuild create mode 100644 app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2 (limited to 'app-admin/eselect-opengl') diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog index bd42b37cd9da..f233d823683a 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.2 2005/08/23 23:13:23 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.3 2005/09/05 20:30:38 eradicator Exp $ + +*eselect-opengl-1.0.2 (05 Sep 2005) + + 05 Sep 2005; Jeremy Huddleston + +eselect-opengl-1.0.2.ebuild: + Version bump to fix symlinking to tls libs and --impl-headers. Plus much + cleanup of the module thanks to kugs. *eselect-opengl-1.0.1 (23 Aug 2005) diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest index 88b39b5ddd63..3c8383f3b393 100644 --- a/app-admin/eselect-opengl/Manifest +++ b/app-admin/eselect-opengl/Manifest @@ -2,13 +2,15 @@ Hash: SHA1 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366 +MD5 a5089a7365bdea4fe370ce47d368375c ChangeLog 889 +MD5 b88dc535e486af3367af1e337d369f38 eselect-opengl-1.0.2.ebuild 2692 MD5 3035cd280e9553e83e75ead616119849 eselect-opengl-1.0.1.ebuild 2688 -MD5 de80973d76ca1492c2adb707a2a008df ChangeLog 647 +MD5 3a40d87eb84b0f56ac411645aec50f87 files/digest-eselect-opengl-1.0.2 183 MD5 512a3c7402fe3eb842d443befb947fbc files/digest-eselect-opengl-1.0.1 183 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDDP8TgIKl8Uu19MoRAgAcAJ4xmlhErRTyPosyxKR7krJYkIvNMgCfUSAz -nEC+o6CR6fJShl1ltzH+/UM= -=NAI4 +iD8DBQFDHKt3ArHZZzCEUG0RAvzRAJ4/zWZc8unVJY9eigA8/EOwiDDOtwCeMX05 +K+qRhhxNEyjun5pBGhFvPbM= +=zZ5z -----END PGP SIGNATURE----- diff --git a/app-admin/eselect-opengl/eselect-opengl-1.0.2.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.0.2.ebuild new file mode 100644 index 000000000000..159bd55f224b --- /dev/null +++ b/app-admin/eselect-opengl/eselect-opengl-1.0.2.ebuild @@ -0,0 +1,92 @@ +# 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.ebuild,v 1.1 2005/09/05 20:30:38 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" + +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}" ]] ; 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.2 b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2 new file mode 100644 index 000000000000..383cdab8ce63 --- /dev/null +++ b/app-admin/eselect-opengl/files/digest-eselect-opengl-1.0.2 @@ -0,0 +1,3 @@ +MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215 +MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900 +MD5 a0466ddcd29d715fd8b3159ed70b3fc3 opengl.eselect-1.0.2.bz2 3216 -- cgit v1.2.3-65-gdbad