Support 32 bit build on amd64. Add ~amd64 keyword, bug 166839.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 33 insertions, 10 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4edf22cd0927..7f30835d2ed7 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.334 2009/09/15 22:57:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.335 2009/09/16 18:42:39 ulm Exp $
+
+  16 Sep 2009; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r6.ebuild:
+  Support 32 bit build on amd64. Add ~amd64 keyword, bug 166839.
 
   15 Sep 2009; Christian Faulhammer <fauli@gentoo.org> emacs-23.1.ebuild:
   x86 stable, bug 285063
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c897daab773f..4c40c6f7d2d7 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-23.0.94-handle-xz-suffix.patch 751 RMD160 6380952113ef9652c58f82de6b6a4254281721a6 SHA1 2666b767674a1b57853d8802e3243ce9b5f5b0cd SHA256 167b019518b147f737c7e69281a76d0e5651db44c82dff0834d6e2a964870bfc
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712
@@ -8,9 +11,16 @@ DIST emacs-22.3-patches-1.tar.bz2 2622 RMD160 43d68a7dba5e57676a587ca1bbc97b41c8
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2517 RMD160 e4b5cfb9d6710a7ff31f9d77bb2738753fab36fc SHA1 0adec98b539e5165fbee402a1924281d83400aa0 SHA256 e57897cbd150b96fedb234f24ca33fadba5bef18ee9059b9a59f456e3768a565
+EBUILD emacs-18.59-r6.ebuild 2825 RMD160 e9f60d0bb3494a2fdcf9393dc00def9e71612ace SHA1 d97d2626103fa0f5384499538118129a3c0b96a6 SHA256 c31637b2db41e940709aa00ae93c34518639f0d1325920b4abc4945842b83f2f
 EBUILD emacs-21.4-r19.ebuild 5314 RMD160 163ffd52b686ad7fe4aa2126e34250d9c4e33950 SHA1 3a6ebd946d73a0cf86f19633a189bf8ea9069d31 SHA256 9c93d672f72648fb383c5bdb8bc305db9609d5e88e2b0e856fbc3ac621e53cc8
 EBUILD emacs-22.3-r2.ebuild 7848 RMD160 4ff1cd1dfa6aa792b92f48ddd1acbebd839368cc SHA1 914f22df412ca73b4a128fc25f7675d54df7f435 SHA256 b94cca9747e3d117a58aa2245d1b30c63fc7bcd56e9e7548b54c92b5b948b3ab
 EBUILD emacs-23.1.ebuild 9374 RMD160 c066a2c2f40ca08e0d7ab893ddd12c597edfbdac SHA1 dfc204888f483cbbc5afe2d9e346d1f4fd3e455b SHA256 01831e4b53a657a20a05275b8ec8357dbb5ecc7afe49781da0df18f0c3d17de6
-MISC ChangeLog 47750 RMD160 0a4cfbd35935c54ae54c1904009085979ce73b60 SHA1 51adcc7f352e14728d31d21975ae4f8f9ebbb0ed SHA256 2940338dda37f10c27c09678077cacf5e7f8f15a3b9d3b5011aed34353ba972f
+MISC ChangeLog 47884 RMD160 183b33f4c5f92e105088be529622929774a97f41 SHA1 cf048ccb939901f8e3f5ba66f35d30151c9a7d09 SHA256 d501914214c9fc179d5bf1e420f7a92722c6dc7c5578dc3d4e6c3c89cd8e0192
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAkqxMiEACgkQOeoy/oIi7uwDtgCdG0jsmgjG8ETWSYpjSj009ZAG
+rgwAnR+/3JyXcWHBduciajO5yWTkA9hf
+=k31k
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index da14b573dbc9..4cf70db6a42c 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ b/app-editors/emacs/emacs-18.59-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.3 2009/05/29 16:14:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.4 2009/09/16 18:42:39 ulm Exp $
 
 EAPI=2
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
@@ -14,12 +14,16 @@ SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-1 GPL-2 BSD as-is"
 SLOT="18"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	X? ( x11-libs/libX11[-xcb] )"
+	X? ( x11-libs/libX11[-xcb] )
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+		X? ( app-emulation/emul-linux-x86-xlibs )
+	)"
 DEPEND="${RDEPEND}"
 
 MY_BASEDIR="/usr/share/emacs/${PV}"
@@ -31,11 +35,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# Feel free to fix the sources to be 64 bit clean.
+	use amd64 && multilib_toolchain_setup x86
+
 	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
+	local arch=$(tc-arch)
+	case ${arch} in
 		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${ARCH} not supported" ;;
+		*)	   die "Architecture ${arch} not supported" ;;
 	esac
 	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
 	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
@@ -48,6 +55,9 @@ src_configure() {
 		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
 	END
 
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		src/s-linux.h || die
+
 	# -O3 and -finline-functions cause segmentation faults at run time.
 	filter-flags -finline-functions
 	replace-flags -O[3-9] -O2