Don't install libMesaGLU.so. Fix 'libdir' in .la files.

Package-Manager: portage-2.0.51-r15

3 files changed, 32 insertions, 13 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 17fac704638c..6822d64ca969 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.328 2005/02/10 06:45:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.329 2005/02/11 01:00:38 eradicator Exp $
+
+  10 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.1.904.ebuild:
+  Don't install libMesaGLU.so.  Fix 'libdir' in .la files.
 
   09 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.904.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index c3ab1d8d8a7e..513b2c29a0a9 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,19 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7d7088f408e2e88cd4ae2bde25eefa3a ChangeLog 78748
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 2b9b70a8a132d04ffa84b047fc2736bb xorg-x11-6.7.0-r3.ebuild 38110
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
 MD5 1a41dee2ee7de099201ab7b03c17b409 xorg-x11-6.8.0-r4.ebuild 52259
 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
 MD5 44835fc4c8bb9d475d312cfb96671654 xorg-x11-6.8.1.902-r1.ebuild 50722
-MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073
-MD5 6542d36e45190c830d6e064b01d79be2 ChangeLog 78601
 MD5 5ae63ce2f3f20585850a27e5f35ea347 xorg-x11-6.8.1.903.ebuild 57952
-MD5 dce461947608dc23f1f366e9672074bb xorg-x11-6.8.1.904.ebuild 58888
+MD5 3eeccf3dd28725e08ff04d3e2cf82cce xorg-x11-6.8.1.904.ebuild 59025
+MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 0fa47dcdfd673d5824ea3a6cfe17ade0 files/digest-xorg-x11-6.8.0-r4 911
 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902 517
-MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
+MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
 MD5 24b596cf50b39b2198ce67257bef8717 files/digest-xorg-x11-6.8.1.903 517
 MD5 5f3b2617d72c973605a9d3ca31fb502f files/digest-xorg-x11-6.8.1.904 517
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCDAQnArHZZzCEUG0RAtyHAJ9x1s/dyOyr3dUc7mysHDrGEp3QaACfQmmm
+V0wqYGit0RJrx1X5uiGDKpk=
+=FvjJ
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild
index c4777c6d1fc5..f43896b9d97f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild,v 1.16 2005/02/10 06:45:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild,v 1.17 2005/02/11 01:00:38 eradicator Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -37,7 +37,7 @@
 #			ebuild functions, no direct code, no functions of more than 60 lines
 #		Generalize any functions that make sense to generalize (i.e., anything
 #			that might realistically see use elsewhere, or repetitively here)
-inherit eutils flag-o-matic toolchain-funcs x11 linux-info
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib
 
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
@@ -210,11 +210,6 @@ src_install() {
 
 	etc_files_install
 
-	# We move libGLU to /usr/lib now
-	if use opengl; then
-		dosym libGLU.so.1.3 /usr/$(get_libdir)/libMesaGLU.so
-	fi
-
 	if use opengl; then
 		dynamic_libgl_install
 	fi
@@ -443,7 +438,7 @@ setup_multilib() {
 	# on amd64 we need /usr/lib64/X11/locale/lib to be a symlink
 	# created by the emul lib ebuild in order for adobe acrobat, staroffice,
 	# and a few other apps to work.
-	if [ -z "${MULTILIB_ABIS}" ]; then
+	if ! has_multilib_profile; then
 		use amd64 && get_libdir_override lib64
 		# lib32 isnt a supported configuration (yet?)
 		[ "$(get_libdir)" == "lib32" ] && get_libdir_override lib
@@ -1101,6 +1096,16 @@ libtool_archive_install() {
 		# (#67729) Needs to be lib, not $(get_libdir)
 		doins ${FILES_DIR}/lib/*.la
 	fi
+
+	fix_libtool_libdir_paths "$(find ${D} -name *.la)"
+}
+
+fix_libtool_libdir_paths() {
+	local dirpath
+	for archive in ${*} ; do
+		dirpath=$(dirname ${archive} | sed -e "s:^${D}::")
+		sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':"
+	done
 }
 
 compose_files_install() {