Install .la file for each ABI.

Package-Manager: portage-2.0.51-r14

4 files changed, 73 insertions, 35 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 9a40f7be8d6b..3354363e710e 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.75 2005/01/21 00:23:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.76 2005/01/21 21:14:08 eradicator Exp $
+
+  21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/libGL.la-r1,
+  nvidia-glx-1.0.6629-r3.ebuild:
+  Install .la file for each ABI.
 
   20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   nvidia-glx-1.0.6629-r3.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 12cbbc6c09fa..8a9edfdb30b7 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 51e6c5a72c2e43d4345c62bada322eb2 ChangeLog 15861
+MD5 012763d1868724fcd205b5f9f1fd7826 ChangeLog 16005
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 f04cfe31611830254b47f3ba5e63689d nvidia-glx-1.0.6111.ebuild 5347
 MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
-MD5 5474670df19d0e73a10385623cf35b62 nvidia-glx-1.0.6629-r3.ebuild 6305
+MD5 3cb174aa4cfa90d155082be755487f6e nvidia-glx-1.0.6629-r3.ebuild 6415
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r3 163
+MD5 e9c401189106eb6f4fe81109da2ee44d files/libGL.la-r1 745
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
@@ -20,7 +21,7 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB8LwTArHZZzCEUG0RAu8fAJ9RHZGS3WcEDyZoMuAeCnZLiMoYpgCeI/pJ
-ukV/wvoCawp6WMYrm/PgyCo=
-=ZJAo
+iD8DBQFB8XFrArHZZzCEUG0RAgcZAJ9kJXo5xdZBAJ7bvW4JmMkYL6dTNQCcCs+o
+wzW/b43YtoxOGcYmt04Mucc=
+=4I1q
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/files/libGL.la-r1 b/media-video/nvidia-glx/files/libGL.la-r1
new file mode 100644
index 000000000000..7cef9dfbea0e
--- /dev/null
+++ b/media-video/nvidia-glx/files/libGL.la-r1
@@ -0,0 +1,32 @@
+# libGL.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libGL.so.1'
+
+# Names of this library.
+library_names='libGL.so.${PV} libGL.so.1 libGL.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/usr/X11R6/${libdir} -lm -lX11 -lXext -ldl     '
+
+# Version information for libGL.
+current=${ver1}
+age=${ver2}
+revision=${ver3}
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/${libdir}'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild
index c2e85bffd116..9365835fb771 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild,v 1.3 2005/01/21 08:23:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r3.ebuild,v 1.4 2005/01/21 21:14:08 eradicator Exp $
 
-inherit eutils multilib
+inherit eutils multilib versionator
 
 X86_PKG_V="pkg1"
 AMD64_PKG_V="pkg2"
@@ -99,28 +99,12 @@ src_install() {
 
 	is_final_abi || return 0
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
 	# Install tls_test
 	dodir /usr/libexec/misc
 	exeinto /usr/libexec/misc
 	doexe usr/bin/tls_test
 	doexe usr/bin/tls_test_dso.so
 
-	insinto ${X11_LIB_DIR}
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
 	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
 	rm -f usr/share/doc/nvidia-settings*
 	dodoc usr/share/doc/*
@@ -155,7 +139,7 @@ src_install-libs() {
 	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${pkglibdir}/opengl/nvidia/tls"
+	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -163,23 +147,40 @@ src_install-libs() {
 	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
 
 	# Old opengl-updates don't always make this
-	keepdir /usr/${pkglibdir}/tls
+	keepdir /usr/${inslibdir}/tls
 
 	# Not sure whether installing the .la file is neccessary;
 	# this is adopted from the `nvidia' ebuild
-	#local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	#local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	#local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	#sed -e "s:\${PV}:${PV}:"     \
-	#	-e "s:\${ver1}:${ver1}:" \
-	#	-e "s:\${ver2}:${ver2}:" \
-	#	-e "s:\${ver3}:${ver3}:" \
-	#	${FILESDIR}/libGL.la > ${D}/${NV_ROOT}/lib/libGL.la
+	local ver1=$(get_version_component_range 1)
+	local ver2=$(get_version_component_range 2)
+	local ver3=$(get_version_component_range 3)
+	sed -e "s:\${PV}:${PV}:"     \
+	    -e "s:\${ver1}:${ver1}:" \
+	    -e "s:\${ver2}:${ver2}:" \
+	    -e "s:\${ver3}:${ver3}:" \
+	    -e "s:\${libdir}:${inslibdir}:" \
+	    ${FILESDIR}/libGL.la-r1 > ${D}/${NV_ROOT}/lib/libGL.la
 
 	# The GLX extension
 	if is_final_abi; then
+		# The X module
+		# Since we moved away from libs in /usr/X11R6 need to check this
+		if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
+			local X11_LIB_DIR="/usr/$(get_libdir)"
+		else
+			local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
+		fi
+
+		exeinto ${X11_LIB_DIR}/modules/drivers
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+
+		insinto ${X11_LIB_DIR}
+		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+		exeinto ${X11_LIB_DIR}
+		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+
 		exeinto ${NV_ROOT}/extensions
-		newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
+		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
 
 		# Includes
 		insinto ${NV_ROOT}/include