Removing nptl enabled TLS from install files

4 files changed, 76 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-nvidia/ChangeLog b/app-emulation/emul-linux-x86-nvidia/ChangeLog
index 5d086cc7f83f..7b42960f1bc0 100644
--- a/app-emulation/emul-linux-x86-nvidia/ChangeLog
+++ b/app-emulation/emul-linux-x86-nvidia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-nvidia
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/ChangeLog,v 1.6 2004/08/06 01:01:12 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/ChangeLog,v 1.7 2004/08/19 09:35:00 cyfred Exp $
+
+*emul-linux-x86-nvidia-1.0.6111-r1 (19 Aug 2004)
+
+  19 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +emul-linux-x86-nvidia-1.0.6111-r1.ebuild:
+  Removing nptl enabled TLS from install files
 
 *emul-linux-x86-nvidia-1.0.6111 (06 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-nvidia/Manifest b/app-emulation/emul-linux-x86-nvidia/Manifest
index 80dd660d182c..0a6bc5802e2c 100644
--- a/app-emulation/emul-linux-x86-nvidia/Manifest
+++ b/app-emulation/emul-linux-x86-nvidia/Manifest
@@ -1,6 +1,8 @@
+MD5 18ce57aa2bf8f715218995f960c465b7 emul-linux-x86-nvidia-1.0.6111-r1.ebuild 1964
 MD5 de818ee60fb683bc3a08361f1c61bff9 emul-linux-x86-nvidia-1.0.6111.ebuild 1925
 MD5 73b6bb75058604bd431b4a8faa607259 emul-linux-x86-nvidia-1.0.6106-r1.ebuild 1926
 MD5 d5c54cbfe3f49e14e16984b974679719 ChangeLog 1448
 MD5 c43db74843f8f0d8b668e13947befe31 metadata.xml 296
 MD5 3dfbbce04db9e006a9998e7dee244647 files/digest-emul-linux-x86-nvidia-1.0.6111 83
 MD5 58184a40423b6f855eb526e9f860eea2 files/digest-emul-linux-x86-nvidia-1.0.6106-r1 83
+MD5 3dfbbce04db9e006a9998e7dee244647 files/digest-emul-linux-x86-nvidia-1.0.6111-r1 83
diff --git a/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6111-r1.ebuild b/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6111-r1.ebuild
new file mode 100644
index 000000000000..3a3521588cdf
--- /dev/null
+++ b/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6111-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6111-r1.ebuild,v 1.1 2004/08/19 09:35:00 cyfred Exp $
+
+inherit eutils
+
+PKG="pkg2"
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+S="${WORKDIR}/${NV_PACKAGE}-${PKG}/usr/lib32"
+DESCRIPTION="NVIDIA GLX 32-bit compatibility libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG}.run"
+
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+IUSE=""
+
+DEPEND=">=media-video/nvidia-glx-${PV}
+	>=app-emulation/emul-linux-x86-xlibs-1.1-r1"
+
+export _POSIX2_VERSION="199209"
+
+src_unpack() {
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG}.run --extract-only
+}
+
+src_install() {
+	local LIB32_ROOT="/usr/lib32"
+	local LIB_ROOT="${LIB32_ROOT}/opengl/nvidia/lib"
+	local TLS_ROOT="${LIB32_ROOT}/opengl/nvidia/tls"
+
+	cd ${S}
+	# The files exist we just have to install them
+	exeinto ${LIB_ROOT}
+	doexe libGL.so.${PV} \
+		  libGLcore.so.${PV} \
+		  libnvidia-tls.so.${PV}
+	dosym libGL.so.${PV} ${LIB_ROOT}/libGL.so
+	dosym libGL.so.${PV} ${LIB_ROOT}/libGL.so.1
+	dosym libGLcore.so.${PV} ${LIB_ROOT}/libGLcore.so
+	dosym libGLcore.so.${PV} ${LIB_ROOT}/libGLcore.so.1
+	dosym libnvidia-tls.so.${PV} ${LIB_ROOT}/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${LIB_ROOT}/libnvidia-tls.so.1
+
+	# TLS libraries
+	# not sure we need these as glibc in emul-linux-x86-baselibs is non-nptl
+	# See bug #58668 glibc is non-nptl commenting out for future reference
+	#dodir ${TLS_ROOT}
+	#exeinto ${TLS_ROOT}
+	#doexe tls/libnvidia-tls.so.${PV}
+	#dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
+	#dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
+}
+
+pkg_postinst() {
+	# Setup nvidia opengl implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update nvidia
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6111-r1 b/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6111-r1
new file mode 100644
index 000000000000..242ff8278045
--- /dev/null
+++ b/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6111-r1
@@ -0,0 +1 @@
+MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486