From 89cdcc2e797d88e41f861d09acddc45e51c00063 Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Sun, 1 Nov 2009 08:48:17 +0100 Subject: [PATCH] x11-drivers/nvidia-drivers-190.42: some fixes from portage --- x11-drivers/nvidia-drivers/Manifest | 2 +- .../nvidia-drivers/nvidia-drivers-190.42.ebuild | 305 ++++++++------------- 2 files changed, 115 insertions(+), 192 deletions(-) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index b03ded9..6e9e596 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -10,6 +10,6 @@ DIST NVIDIA-Linux-x86-190.42-pkg0.run 14696051 RMD160 9876e63299fd1f87e6f23939d4 DIST NVIDIA-Linux-x86_64-185.18.36-pkg2.run 22245788 RMD160 0ffbc35dd13d2ccff87f20e0d6a8b8622c497ec7 SHA1 0ec535765bf07dc7ff47bbede831a89617105ac1 SHA256 c9b413910a26cc55829e018f71e12981fa4140b5e0f7a81bb5e1a1b3d353ef8b DIST NVIDIA-Linux-x86_64-190.42-pkg2.run 23045797 RMD160 8858aaf1c089a6ad514d68c70db9dac312a3b17c SHA1 cf0a7a8a79cd77ad1363f0568e46866fa528e06f SHA256 3e95f80cbf388a03f0052efdb02cff87e201470c890edead8755fbe7b3368060 EBUILD nvidia-drivers-185.18.36.ebuild 16848 RMD160 3cd0779f2a0905c328d34a9b2997bd1b34bd0a59 SHA1 b4e51979d885d130e09f27c51a5e6eee9a31e9b9 SHA256 76d8128bd6ee4b4f6c949cb6f0722736c4e586f331ca6aa8962c6d0cb2c21b82 -EBUILD nvidia-drivers-190.42.ebuild 17419 RMD160 65b078f25ecb9f5211f3ea5f0d9ed52e858f1ee5 SHA1 fa6c26ff5f29531c91c4c4bcca00a4f2bb4b4093 SHA256 9e58e9bbc1aaab1a3ba082f74b7b003223adab5ddd0053ee5c3505671c8010ec +EBUILD nvidia-drivers-190.42.ebuild 15600 RMD160 0c2ba1785a660ebd625df1e3822ece735bd42e88 SHA1 21babd1eff9be64b9e77846132c068e6fe7413a7 SHA256 c4e8a21ed0e16cd145074756bf2880a9fb56fc5c270634946452e39b9a2e5600 MISC ChangeLog 3883 RMD160 e1178b78582e07454e676355ddcc73f15d47e1be SHA1 c36e7f19755740931667b1dcc08a39ce7eae0af3 SHA256 458f4c7a83440491a84887d65cc0e40527de49d999813b2fe94825ff3ad5d213 MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild index 075491c..67cbe04 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.2 2009/10/31 20:18:19 cardoe Exp $ EAPI="2" @@ -24,10 +24,8 @@ RESTRICT="strip" EMULTILIB_PKG="true" COMMON="=sys-libs/glibc-2.6.1 ) + multilib? ( app-emulation/emul-linux-x86-xlibs )" DEPEND="${COMMON} kernel_linux? ( virtual/linux-sources ) app-admin/eselect-opengl" @@ -39,101 +37,88 @@ PDEPEND="x11-libs/libvdpau gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86="usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV} + usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/libcuda.so.${PV} + usr/lib/libnvidia-cfg.so.${PV} usr/lib/libvdpau_nvidia.so.${PV}" QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko usr/lib/opengl/nvidia/lib/libGL.so.1 usr/lib/opengl/nvidia/lib/libGLcore.so.1 - usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.1 - usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1 - usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/libnvidia-cfg.so.1 + usr/lib/opengl/nvidia/extensions/libglx.so.1 usr/lib/xorg/modules/drivers/nvidia_drv.so" -QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} +QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV} usr/lib32/libcuda.so.${PV} usr/lib32/libvdpau_nvidia.so.${PV}" QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib/libXvMCNVIDIA.a:NVXVMC.o" QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/xorg/modules/drivers/nvidia_drv.so usr/lib64/libnvcompiler.so.${PV} usr/lib64/libXvMCNVIDIA.so.${PV} - usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} + usr/lib64/libXvMCNVIDIA.a:NVXVMC.o + usr/lib64/libnvidia-cfg.so.${PV} + usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so + usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} + usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} usr/bin/nvidia-smi - usr/bin/nvidia-xconfig - usr/lib64/libXvMCNVIDIA.a:NVXVMC.o" + usr/bin/nvidia-xconfig" QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib/libXvMCNVIDIA.a" -QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} +QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV} + usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so" + usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} + usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}" QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}" -# we really should have QA_DT_HASH_x86 and QA_DT_HASH_amd64 but Portage -# does not support it. bug #271416 - -QA_DT_HASH="usr/lib32/libcuda.so.${PV} - usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} +QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV} + usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} + usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib32/libvdpau_nvidia.so.${PV} - usr/bin/nvidia-xconfig + usr/lib64/libXvMCNVIDIA.so.${PV} usr/lib64/libcuda.so.${PV} - usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV} + usr/lib64/libnvidia-cfg.so.${PV} usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/extensions/libwfb.so - usr/lib64/opengl/nvidia/extensions/libglx.so + usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} + usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} usr/lib64/xorg/modules/drivers/nvidia_drv.so - usr/lib64/libXvMCNVIDIA.so.${PV} usr/lib64/libvdpau_nvidia.so.${PV} + usr/bin/nvidia-smi + usr/bin/nvidia-xconfig" - usr/lib/libcuda.so.${PV} - usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} +QA_DT_HASH_x86="usr/lib/libcuda.so.${PV} usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV} + usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib/opengl/nvidia/extensions/libwfb.so usr/lib/opengl/nvidia/extensions/libglx.so usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/libvdpau_nvidia.so.${PV}" - -# Bug #290081 -# QA_LDFLAGS="usr/bin/nvidia-smi" + usr/lib/libvdpau_nvidia.so.${PV} + usr/bin/nvidia-smi + usr/bin/nvidia-xconfig" if use x86; then PKG_V="-pkg0" @@ -213,13 +198,19 @@ pkg_setup() { if use kernel_FreeBSD; then NV_DOC="${S}/doc" NV_EXEC="${S}/obj" + NV_LIB="${S}/obj" NV_SRC="${S}/src" NV_MAN="${S}/x11/man" + NV_X11="${S}/obj" + NV_SOVER=1 elif use kernel_linux; then NV_DOC="${S}/usr/share/doc" NV_EXEC="${S}/usr/bin" + NV_LIB="${S}/usr/lib" NV_SRC="${S}/usr/src/nv" NV_MAN="${S}/usr/share/man/man1" + NV_X11="${S}/usr/X11R6/lib" + NV_SOVER=${PV} else die "Could not determine proper NVIDIA package" fi @@ -247,7 +238,6 @@ src_unpack() { src_prepare() { # Please add a brief description for every added patch - cd "${S}" use x86-fbsd && cd doc # Use the correct defines to make gtkglext build work @@ -285,10 +275,6 @@ src_compile() { } src_install() { - local MLTEST=$(type dyn_unpack) - - cd "${S}" - if use kernel_linux; then linux-mod_src_install @@ -299,7 +285,7 @@ src_install() { fi # Add the aliases - [ -f "${FILESDIR}/nvidia" ] || die "nvidia missing in FILESDIR" + [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" sed -e 's:PACKAGE:'${PF}':g' \ -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ "${WORKDIR}"/nvidia @@ -313,34 +299,57 @@ src_install() { doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die fi - if has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs + # NVIDIA kernel <-> userspace driver config lib + dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ + die "failed to install libnvidia-cfg" + + # Xorg DDX driver + insinto /usr/$(get_libdir)/xorg/modules/drivers + doins ${NV_X11}/modules/drivers/nvidia_drv.so || die "failed to install nvidia_drv.so" + + # Xorg GLX driver + insinto /usr/$(get_libdir)/opengl/nvidia/extensions + doins ${NV_X11}/modules/extensions/libglx.so.${NV_SOVER} || \ + die "failed to install libglx.so" + dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ + /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ + die "failed to create libglx.so symlink" + + # XvMC driver + dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ + die "failed to install libXvMCNVIDIA.so" + dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ + die "failed to install libXvMCNVIDIA.so" + dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ + die "failed to create libXvMCNVIDIA.so symlink" + + # CUDA headers (driver to come) + if use kernel_linux; then + dodir /usr/include/cuda + insinto /usr/include/cuda + doins usr/include/cuda/*.h || die "failed to install cuda headers" fi - is_final_abi || return 0 + # OpenCL headers (driver to come) + if [[ -d ${S}/usr/include/CL ]]; then + dodir /usr/include/CL + insinto /usr/include/CL + doins usr/include/CL/*.h || die "failed to install OpenCL headers" + fi # Documentation - dodoc "${NV_DOC}"/XF86Config.sample - dohtml "${NV_DOC}"/html/* + dodoc ${NV_DOC}/XF86Config.sample + dohtml ${NV_DOC}/html/* if use x86-fbsd; then dodoc "${NV_DOC}/README" + doman "${NV_MAN}/nvidia-xconfig.1" else # Docs newdoc "${NV_DOC}/README.txt" README dodoc "${NV_DOC}/NVIDIA_Changelog" - fi - - if use kernel_linux; then doman "${NV_MAN}/nvidia-smi.1.gz" + doman "${NV_MAN}/nvidia-xconfig.1.gz" fi - doman "${NV_MAN}/nvidia-xconfig.1.gz" # Helper Apps dobin ${NV_EXEC}/nvidia-xconfig || die @@ -348,6 +357,19 @@ src_install() { if use kernel_linux; then dobin ${NV_EXEC}/nvidia-smi || die fi + + if has_multilib_profile ; then + local OABI=${ABI} + for ABI in $(get_install_abis) ; do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + is_final_abi || die "failed to iterate through all ABIs" } # Install nvidia library: @@ -360,73 +382,36 @@ donvidia() { libname=$(basename $2) - # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully - if [ -e $2.$3 ] ; then - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 - fi + doexe $2.$3 || die "failed to install $2" + dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 } src_install-libs() { local pkglibdir=lib local inslibdir=$(get_libdir) - if [[ ${#} -eq 2 ]] ; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then pkglibdir=lib32 fi - local usrpkglibdir=usr/${pkglibdir} - local libdir=usr/X11R6/${pkglibdir} - local drvdir=${libdir}/modules/drivers - local extdir=${libdir}/modules/extensions - local incdir=usr/include/GL - local sover=${PV} local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local NO_TLS_ROOT="${NV_ROOT}/no-tls" - local TLS_ROOT="${NV_ROOT}/tls" - local X11_LIB_DIR="/usr/${inslibdir}/xorg" - - if use x86-fbsd; then - # on FreeBSD everything is on obj/ - pkglibdir=obj - usrpkglibdir=obj - x11pkglibdir=obj - drvdir=obj - extdir=obj - # don't ask me why the headers are there.. glxext.h is missing - incdir=doc + local libdir= sover= + if use kernel_linux; then + libdir=usr/${pkglibdir} + sover=${PV} + else + pkglibdir=obj # on FreeBSD it has just .1 suffix sover=1 fi # The GLX libraries - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} - - dodir ${NO_TLS_ROOT} - donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} - - if ! use x86-fbsd; then - donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} - fi - - if want_tls ; then - dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - else - dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - fi + donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} + donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover} + donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} if ! use x86-fbsd; then # Install the .la file for libtool, to prevent e.g. bug #176423 @@ -442,57 +427,22 @@ src_install-libs() { "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la fi - exeinto ${X11_LIB_DIR}/modules/drivers - - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - # fix Bug 131315 - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ - dosym libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ - newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h - #cuda - if [[ -f usr/include/cuda/cuda.h ]]; then - dodir /usr/include/cuda - insinto /usr/include/cuda - doins usr/include/cuda/*.h - - if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libcuda.so.${PV} - dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 - dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so - fi + if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then + dolib.so usr/${pkglibdir}/libcuda.so.${PV} + dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 + dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so fi #vdpau - if [[ -f usr/include/vdpau/vdpau.h ]]; then + if [[ -f usr/${pkglibdir}/libvdpau_nvidia.so.${PV} ]]; then dolib.so usr/${pkglibdir}/libvdpau_nvidia.so.${PV} - dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so.1 - dosym libvdpau_nvidia.so.1 /usr/${inslibdir}/libvdpau_nvidia.so + dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so fi # OpenCL # NOTE: This isn't currently available in the publicly released drivers. if [[ -f usr/${pkglibdir}/libOpenCL.so.1.0.0 ]]; then - dodir /usr/include/CL - insinto /usr/include/CL - doins usr/include/CL/*.h dolib.so usr/${pkglibdir}/libnvcompiler.so.${PV} dosym libnvcompiler.so.${PV} /usr/${inslibdir}/libnvcompiler.so.1 @@ -538,7 +488,7 @@ pkg_postinst() { elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" elog - elog "nVidia has requested that any bug reports submitted have the" + elog "NVIDIA has requested that any bug reports submitted have the" elog "output of /usr/bin/nvidia-bug-report.sh included." elog elog "To work with compiz, you must enable the AddARGBGLXVisuals option." @@ -547,33 +497,6 @@ pkg_postinst() { echo } -want_tls() { - # For uclibc or anything non glibc, return false - has_version sys-libs/glibc || return 1 - - # Old versions of glibc were lt/no-tls only - has_version '=sys-libs/glibc-2.3.5' ; then - case ${CHOST/-*} in - i486|i586) return 1 ;; - esac - fi - - # These versions built linuxthreads version to support tls, too - has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 - - return 1 -} - pkg_postrm() { if use kernel_linux; then linux-mod_pkg_postrm -- 2.11.4.GIT