Only do amd64 libdir overriding on older profiles.

5 files changed, 40 insertions, 22 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2d29108adcf9..5ce6e58ba534 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.262 2005/01/10 19:42:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.263 2005/01/11 10:49:53 eradicator Exp $
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild,
+  xorg-x11-6.8.1.901.ebuild:
+  Only do amd64 libdir overriding on older profiles.
 
   10 Jan 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.1.901.ebuild:
   add ~alpha
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index d111699e723f..b949ec5b7a4b 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,15 +1,25 @@
-MD5 91ba17f241c7a2e04d697b173073a1eb ChangeLog 63769
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 41ca61a28882e37cfa6ebdbda847042d ChangeLog 63965
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 6c24c8a3aa69cebf79e8633555073c36 xorg-x11-6.7.0-r2.ebuild 38088
-MD5 d548e768ef760adbe7776ac667dbda13 xorg-x11-6.8.0-r1.ebuild 41337
 MD5 6f04e427204ce7edb6997f355147f17f xorg-x11-6.7.0-r3.ebuild 38106
-MD5 cec0cbc2cc6f6350b15b8edd3763635f xorg-x11-6.8.0-r3.ebuild 39939
-MD5 023d40db1a9bc84a3f8c213d50801c52 xorg-x11-6.8.0-r4.ebuild 50930
-MD5 aa208c17127a19f54a5bbda5c819446b xorg-x11-6.8.1.901.ebuild 50937
+MD5 d548e768ef760adbe7776ac667dbda13 xorg-x11-6.8.0-r1.ebuild 41337
+MD5 fc4a87597c9777f4672de5d940e20b03 xorg-x11-6.8.0-r3.ebuild 39985
+MD5 f902ed3ca0999ab47ac78ecf1c6d9e27 xorg-x11-6.8.0-r4.ebuild 50972
+MD5 b5d8d6ab3d56314d8d0ea480473aacc9 xorg-x11-6.8.1.901.ebuild 50980
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
-MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 e5419ff1c0cff3236fb5673ef2263bea files/digest-xorg-x11-6.8.0-r4 911
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
+MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 9a74da809b31adcfd00fd65af29ee55e files/digest-xorg-x11-6.8.1.901 517
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB4696ArHZZzCEUG0RAvS3AJ0TQ9uTmkvmJjBg8Rq44HF3ySzd/ACfUBEb
+dLIha/K7JdlkubBi9UiQtY0=
+=v8rM
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
index 84ac13aa0ad2..cb4155d82d9a 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.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.0-r3.ebuild,v 1.9 2005/01/01 22:13:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.10 2005/01/11 10:49:53 eradicator Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -199,10 +199,11 @@ pkg_setup() {
 	# on amd64 we need /usr/X11R6/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.
-	use amd64 && get_libdir_override lib64
-	# lib32 isnt a supported configuration (yet?)
-	[ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib
-
+	if [ -z "${MULTILIB_ABIS}" ]; then
+		use amd64 && get_libdir_override lib64
+		# lib32 isnt a supported configuration (yet?)
+		[ "$(get_libdir)" == "lib32" ] && get_libdir_override lib
+	fi
 
 	# Echo a message to the user about bitmap-fonts
 	if ! use bitmap-fonts
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index b7a0ac48f6ad..01e49f88f982 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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.0-r4.ebuild,v 1.41 2005/01/07 22:27:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.42 2005/01/11 10:49:53 eradicator Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -160,10 +160,11 @@ pkg_setup() {
 	# 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.
-	use amd64 && get_libdir_override lib64
-	# lib32 isnt a supported configuration (yet?)
-	[ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib
-
+	if [ -z "${MULTILIB_ABIS}" ]; then
+		use amd64 && get_libdir_override lib64
+		# lib32 isnt a supported configuration (yet?)
+		[ "$(get_libdir)" == "lib32" ] && get_libdir_override lib
+	fi
 
 	# Echo a message to the user about bitmap-fonts
 	if ! use bitmap-fonts; then
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
index 4c9700080dd7..4363a743764c 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901.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.901.ebuild,v 1.15 2005/01/10 19:42:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild,v 1.16 2005/01/11 10:49:53 eradicator Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -161,10 +161,11 @@ pkg_setup() {
 	# 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.
-	use amd64 && get_libdir_override lib64
-	# lib32 isnt a supported configuration (yet?)
-	[ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib
-
+	if [ -z "${MULTILIB_ABIS}" ]; then
+		use amd64 && get_libdir_override lib64
+		# lib32 isnt a supported configuration (yet?)
+		[ "$(get_libdir)" == "lib32" ] && get_libdir_override lib
+	fi
 
 	# Echo a message to the user about bitmap-fonts
 	if ! use bitmap-fonts; then