From 6a69b7ff08f235d3c871d4111a2a421dc403f4f2 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 13 Mar 2007 22:49:59 +0000 Subject: [PATCH] Removing old opengl-update script. All that is left is the wrapper. A couple packages in portage still reference x11-base/opengl-update, so we will keep this around until those are all updated. Package-Manager: portage-2.1.2.2 --- x11-base/opengl-update/ChangeLog | 8 +- x11-base/opengl-update/Manifest | 31 +- .../files/digest-opengl-update-2.2.4 | 6 - .../files/digest-opengl-update-3.0.0 | 0 .../opengl-update/files/opengl-update-2.2.4 | 383 ------------------ .../opengl-update/opengl-update-2.2.4.ebuild | 75 ---- 6 files changed, 11 insertions(+), 492 deletions(-) delete mode 100644 x11-base/opengl-update/files/digest-opengl-update-2.2.4 create mode 100644 x11-base/opengl-update/files/digest-opengl-update-3.0.0 delete mode 100644 x11-base/opengl-update/files/opengl-update-2.2.4 delete mode 100644 x11-base/opengl-update/opengl-update-2.2.4.ebuild diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog index ef1423cd2f64..1c6564537468 100644 --- a/x11-base/opengl-update/ChangeLog +++ b/x11-base/opengl-update/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/opengl-update # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.123 2007/03/10 20:17:17 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.124 2007/03/13 22:49:59 eradicator Exp $ + + 13 Mar 2007; Jeremy Huddleston + -files/opengl-update-2.2.4, -opengl-update-2.2.4.ebuild: + Removing old opengl-update script. All that is left is the wrapper. A couple + packages in portage still reference x11-base/opengl-update, so we will keep + this around until those are all updated. 10 Mar 2007; Danny van Dyk opengl-update-2.2.4.ebuild: diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest index dc137682d46e..35ddfe1e848c 100644 --- a/x11-base/opengl-update/Manifest +++ b/x11-base/opengl-update/Manifest @@ -1,42 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX opengl-update-2.2.4 9865 RMD160 880efc14a9e57ac0b36148cc77c2d4746c0079aa SHA1 803088c10a45cb914a6603ea0b24ec9e380b4b29 SHA256 8dfa8e5a602ab5d43cf8813a66832cfc8b4141e54eb9267f226676006b332b52 -MD5 23b30f7c0b9e658f78d0068999e68a80 files/opengl-update-2.2.4 9865 -RMD160 880efc14a9e57ac0b36148cc77c2d4746c0079aa files/opengl-update-2.2.4 9865 -SHA256 8dfa8e5a602ab5d43cf8813a66832cfc8b4141e54eb9267f226676006b332b52 files/opengl-update-2.2.4 9865 AUX opengl-update-3.0.0 4204 RMD160 5976c32e6f0e06ef067d7ac332f06652d2d6d9f9 SHA1 1c80e39f0904018a58d0a194e60c66f3256a9255 SHA256 5fe66447542e9ee002ea1e24bd1f21c07a4bfc7ee01f5a6d1e59b83f901842c2 MD5 763717ca92a7b90da3ad6726770d2b77 files/opengl-update-3.0.0 4204 RMD160 5976c32e6f0e06ef067d7ac332f06652d2d6d9f9 files/opengl-update-3.0.0 4204 SHA256 5fe66447542e9ee002ea1e24bd1f21c07a4bfc7ee01f5a6d1e59b83f901842c2 files/opengl-update-3.0.0 4204 -DIST glext.h-29.bz2 33215 RMD160 b21868b31524c2309658d65682b4528823126ae5 SHA1 4635a7a73169e6516fbf4d214b36352568fad24e SHA256 d28e3bdb2f9ffb9f62e0f04d8eab99aa01b846bb206c984a0f0e9f20d53f78f0 -DIST glxext.h-11.bz2 5900 RMD160 ba3fb091982d272d6aafbddd6f4991d7b8290efe SHA1 51dc76e10814a7b990086bc013c2ac0e5e06631d SHA256 b9ac4265313fda0bbd051b1bec803733f307c040ac9bd02a4c536302375415e0 -EBUILD opengl-update-2.2.4.ebuild 2087 RMD160 c89456b92260b1a1dc4d4528d536483a177edab5 SHA1 ed12cf29b74cdddd897a91eac934b2518380a11e SHA256 58a10450fdc9e765584b78262ae0e385145dd4af593f718671ab7ffcddb035de -MD5 59c6b1e4582b84f8b2baaa951732f4cc opengl-update-2.2.4.ebuild 2087 -RMD160 c89456b92260b1a1dc4d4528d536483a177edab5 opengl-update-2.2.4.ebuild 2087 -SHA256 58a10450fdc9e765584b78262ae0e385145dd4af593f718671ab7ffcddb035de opengl-update-2.2.4.ebuild 2087 EBUILD opengl-update-3.0.0.ebuild 756 RMD160 15d5e74f3160956ef95190578cf2fd544552f25a SHA1 889d44f38f5cfd4ca3f1040c5e186be751ba91c3 SHA256 d25ea0773046d8ea5fd8231a1da3d5b6eb60a549596d8a4ef4e77f3f766e9401 MD5 9774892d0a9a6e2b8b3acfe1a30bd733 opengl-update-3.0.0.ebuild 756 RMD160 15d5e74f3160956ef95190578cf2fd544552f25a opengl-update-3.0.0.ebuild 756 SHA256 d25ea0773046d8ea5fd8231a1da3d5b6eb60a549596d8a4ef4e77f3f766e9401 opengl-update-3.0.0.ebuild 756 -MISC ChangeLog 22060 RMD160 9febff9bdce77c1a61de63206f7ca441a0749217 SHA1 f93fc2881662aa53ebef22d9ccc5c86716dfa85f SHA256 5e84e1e4837f43a533143f8dd929ec82c96aa3f8df90b4dfecf7b218339548e9 -MD5 4460651c11896ce920f02826db6c04b5 ChangeLog 22060 -RMD160 9febff9bdce77c1a61de63206f7ca441a0749217 ChangeLog 22060 -SHA256 5e84e1e4837f43a533143f8dd929ec82c96aa3f8df90b4dfecf7b218339548e9 ChangeLog 22060 +MISC ChangeLog 22378 RMD160 003b03e257fd63dfe8f47184901ebc3cdda7a490 SHA1 3420e47bdfb01974c4b166b77b67e43cafa9de3b SHA256 3b719dc4e8f9d63f716245beae2ae53996b8fce4ce3d0bd39927610712b1c551 +MD5 dc04769230b70a856284721b8ebcbb7d ChangeLog 22378 +RMD160 003b03e257fd63dfe8f47184901ebc3cdda7a490 ChangeLog 22378 +SHA256 3b719dc4e8f9d63f716245beae2ae53996b8fce4ce3d0bd39927610712b1c551 ChangeLog 22378 MISC metadata.xml 366 RMD160 1e4b0bac744189f46350b440bf36112272a69baa SHA1 52b8b9b7d1cbcd2bcf4d988aaaf7bf744244fd77 SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366 RMD160 1e4b0bac744189f46350b440bf36112272a69baa metadata.xml 366 SHA256 19c4ff0460724296bd0a9bc7e6c385de2b46b0cbd7b1384dab7f656811861445 metadata.xml 366 -MD5 6102846843472eae8f6f1666f3799dd7 files/digest-opengl-update-2.2.4 440 -RMD160 e78dd0a7b59452602ddd4f4228e0cc76d94c42d5 files/digest-opengl-update-2.2.4 440 -SHA256 78e8af4c482a5b8299ddb64ce34cdb5a1a1e1d20bb3603d09348855dcd90d507 files/digest-opengl-update-2.2.4 440 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-3.0.0 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-opengl-update-3.0.0 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-opengl-update-3.0.0 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFF8xJq5mJXAu5GbtIRAuTHAJ4k0d/DWpMHgX/yYlmcUpjn1fGmkQCfaEEU -ttb2VR+i8c09RI6gID+baYE= -=Xnjz ------END PGP SIGNATURE----- diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.2.4 b/x11-base/opengl-update/files/digest-opengl-update-2.2.4 deleted file mode 100644 index 77a00a039341..000000000000 --- a/x11-base/opengl-update/files/digest-opengl-update-2.2.4 +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/x11-base/opengl-update/files/digest-opengl-update-3.0.0 b/x11-base/opengl-update/files/digest-opengl-update-3.0.0 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/x11-base/opengl-update/files/opengl-update-2.2.4 b/x11-base/opengl-update/files/opengl-update-2.2.4 deleted file mode 100644 index cf4d149d922b..000000000000 --- a/x11-base/opengl-update/files/opengl-update-2.2.4 +++ /dev/null @@ -1,383 +0,0 @@ -#!/bin/bash -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.4,v 1.1 2005/09/05 19:43:04 eradicator Exp $ -# Author: Martin Schlemmer -# Further modifications by Donnie Berkholz -# Further modifications based off submissions to bug #54984 -# Further modifications by Jeremy Huddleston - -. /etc/init.d/functions.sh - -hasq() { - local x - - local me=${1} - shift - - for x in "${@}"; do - if [[ "${x}" == "${me}" ]]; then - return 0 - fi - done - return 1 -} - -check_user() { - if [[ $(id -u) -ne 0 ]]; then - eerror "${0}: Must be run as root." - exit 1 - fi -} - -check_version() { - if portageq has_version / 'x11-base/xorg-x11'; then - if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then - eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" - exit 1 - fi - fi -} - -get_current_implem() { - local implem - if [[ -f ${ENV_D} ]]; then - source ${ENV_D} - if [[ -n "${OPENGL_PROFILE}" ]]; then - implem="${OPENGL_PROFILE}" - elif [[ -n "${LDPATH}" ]]; then - implem="${LDPATH%%:*}" - implem="${implem##*opengl/}" - implem="${implem%/lib*}" - fi - unset LDPATH - unset OPENGL_PROFILE - fi - - echo ${implem} -} - -get_implementations() { - local implems - for dir in ${PREFIX}/lib{,32,64}/opengl/*; do - if [[ -d "${dir}" && ${dir##*/} != "global" ]] && ! hasq ${dir##*/} ${implems}; then - implems=${implems:+${implems} }${dir##*/} - fi - done - echo ${implems} -} - -print_version() { - echo "opengl-update ${VERSION}" -} - -print_usage() { - # Get grammar right in message - local IS_ARE IMPLEM_PLURAL - if [[ $(echo ${AVAIL_IMPLEMS} | wc -w) -eq 1 ]]; then - IS_ARE="is" - IMPLEM_PLURAL="" - else - IS_ARE="are" - IMPLEM_PLURAL="s" - fi - - print_version - - cat << FOO -Usage: ${0##*/} [] - Set the opengl implementation. - Valid options: - --use-old: If an implementation is already set, use that one. - --prefix=: Set the source prefix (default: /usr) - --dst-prefix=: Set the destination prefix (default: /usr) - --impl-headers: Use headers provided by this implementation to - override golbal ones provided by opengl-update. - -Usage: ${0##*/} --get-implementation - Print the current implementaion - -Notes: - --impl-headers was default in /dev/null - - LIBDIRS="lib32 lib lib64" - for LIBDIR in ${LIBDIRS}; do - # Special case handling of lib32 because it can be a symlink to - # emul libs - if [[ "${LIBDIR}" = "lib32" ]]; then - [[ -d "${PREFIX}/${LIBDIR}/opengl" ]] || continue - else - [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue - fi - - # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR. - if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then - GL_LOCAL="xorg-x11" - else - GL_LOCAL="${GL_IMPLEM}" - fi - - mkdir -p ${DST_PREFIX}/${LIBDIR} - pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null - # First remove old symlinks - for file in libGL{,core}.{a,so,la} ; do - [[ -h ${file} ]] && rm -f ${file} - done - - # Note that we don't do .so*, just .so on purpose. The - # loader knows to look in the profile dir, and the - # linked just needs the .so - for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL{,core}.{so,a,la}; do - [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} - - # Fix libtool archives (#48297) - if [[ "${file%.la}" != "${file}" ]]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} - else - ln -s ${file} - fi - done - popd &> /dev/null - - if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then - mkdir -p ${DST_PREFIX}/${LIBDIR}/tls - pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null - # First remove old symlinks - for file in libGL{,core}.{a,so,la} ; do - [[ -h ${file} ]] && rm -f ${file} - done - - for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libGL{,core}.{so,a,la}; do - [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} - - # Fix libtool archives (#48297) - if [ "${file%.la}" != "${file}" ]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} - else - ln -s ${file} - fi - done - popd &> /dev/null - fi - - local MODULEDIR - if [[ -e "${DST_PREFIX}/${LIBDIR}/xorg/modules" ]]; then - MODULEDIR="xorg/modules" - else - MODULEDIR="modules" - fi - - if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]]; then - mkdir -p ${DST_PREFIX}/${LIBDIR}/${MODULEDIR}/extensions - pushd ${DST_PREFIX}/${LIBDIR}/${MODULEDIR}/extensions &> /dev/null - # First remove old symlinks - for file in libglx.so libglx.a; do - [[ -h ${file} ]] && rm -f ${file} - done - - for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do - [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} - - # Fix libtool archives (#48297) - if [[ "${file%.la}" != "${file}" ]]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} - else - ln -s ${file} - fi - done - popd &> /dev/null - fi - - # Setup the includes - mkdir -p ${DST_PREFIX}/include/GL - pushd ${DST_PREFIX}/include/GL &> /dev/null - for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do - # IMPORTANT - # It is preferable currently to use the standard glext.h file - # however if an OpenGL provider must use a self produced glext.h - # then it should be installed to ${GL_IMPLEM}/include and the user - # can add the --impl-headers option to select it. - - if [[ ${USE_PROFILE_HEADERS} == "yes" ]] ; then - # Check the profile first. - if [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then - [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} - ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} - fi - continue - fi - - if [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then - [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} - ln -s ${PREFIX}/${LIBDIR}/opengl/global/include/${file} - elif [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then - [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} - ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} - elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then - [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} - ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} - fi - done - popd &> /dev/null - - # Setup the $LDPATH - ldpath="${ldpath:+${ldpath}:}${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib" - - done - - echo "LDPATH=\"${ldpath}\"" > ${ENV_D} - echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D} - - env-update - - eend 0 -} - -## START PROGRAM ## - -ENV_D="/etc/env.d/03opengl" -NEW_GL_IMPLEM="" -ACTION="" -PREFIX="/usr" -DST_PREFIX="/usr" -AVAIL_IMPLEMS=$(get_implementations) -CURRENT_GL_IMPLEM=$(get_current_implem) -USE_PROFILE_HEADERS="no" -VERSION="2.2.1" - -parse_options ${@} - -case ${ACTION} in - get-implementation) - if [[ -n "${CURRENT_GL_IMPLEM}" ]]; then - echo ${CURRENT_GL_IMPLEM} - exit 0 - else - exit 2 - fi - ;; - old-implementation) - set-new-implementation ${CURRENT_GL_IMPLEM} - exit $? - ;; - set-implementation) - if [[ -n "${NEW_GL_IMPLEM}" ]]; then - set-new-implementation ${NEW_GL_IMPLEM} - exit $? - else - print_usage - exit 1 - fi - ;; - version) - print_version - exit 0 - ;; - usage) - print_usage - exit 0 - ;; - error) - print_usage - exit 1 - ;; - *) - print_usage - exit 1 - ;; -esac diff --git a/x11-base/opengl-update/opengl-update-2.2.4.ebuild b/x11-base/opengl-update/opengl-update-2.2.4.ebuild deleted file mode 100644 index c92e6499cfd5..000000000000 --- a/x11-base/opengl-update/opengl-update-2.2.4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.4.ebuild,v 1.10 2007/03/10 20:17:17 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="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2 - http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="mips" -IUSE="" -RESTRICT="multilib-pkg-force" - -DEPEND="virtual/libc - app-arch/bzip2" - -S="${WORKDIR}" - -src_unpack() { - unpack ${A} - - 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="$(opengl-update --get-implementation)" - if [[ -n "${impl}" ]] ; then - opengl-update "${impl}" - fi -} - -src_install() { - newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die - - # Install default glext.h - insinto /usr/$(get_libdir)/opengl/global/include - doins ${WORKDIR}/glext.h || die - doins ${WORKDIR}/glxext.h || die -} -- 2.26.2