multilib fixin.

4 files changed, 35 insertions, 22 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a55b8b7b454c..af80910863ae 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.46 2004/11/30 20:51:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.47 2004/12/19 11:09:05 eradicator Exp $
+
+  19 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  emacs-21.3-r5.ebuild, emacs-21.3.50_pre20041027.ebuild:
+  multilib fixin.
 
   30 Nov 2004; Sven Wegener <swegener@gentoo.org> emacs-21.3-r4.ebuild,
   emacs-21.3-r5.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8095f7058f1a..2d465c11edf1 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,33 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cd950ca660715c0324588702db8b152c emacs-21.3-r3.ebuild 2606
-MD5 aeeadf9ebf3662aee6430631a8906221 emacs-21.3-r5.ebuild 3855
-MD5 7c1bb3b83cc8d65547925c15dd605a71 emacs-21.3-r2.ebuild 2190
+MD5 b94aead4e7ce9e9ee8537082cb266233 ChangeLog 7582
 MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
-MD5 6416d39deb50703bcf53aaa9f846c958 emacs-21.3-r4.ebuild 3686
-MD5 7256fd55a9cb306388b31eed27342df3 emacs-21.3.50_pre20041027.ebuild 5089
-MD5 ed1264dbc38dd4c513870cb9650c8a47 ChangeLog 7446
+MD5 173662f1ef8aac9a67afcdef3e4249d6 emacs-21.3.50_pre20041027.ebuild 5240
+MD5 7c1bb3b83cc8d65547925c15dd605a71 emacs-21.3-r2.ebuild 2190
+MD5 cd950ca660715c0324588702db8b152c emacs-21.3-r3.ebuild 2606
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 6416d39deb50703bcf53aaa9f846c958 emacs-21.3-r4.ebuild 3686
+MD5 88316dacb99f4846bc6bc0df4b777973 emacs-21.3-r5.ebuild 4004
+MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
+MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r5 126
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
-MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
-MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
-MD5 6ad048aba58fdae6c516ed18ad728d95 files/digest-emacs-21.3.50_pre20041027 242
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
-MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
+MD5 6ad048aba58fdae6c516ed18ad728d95 files/digest-emacs-21.3.50_pre20041027 242
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r5 126
+MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
 MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
+MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBrN1SI1lqEGTUzyQRAokLAKDLrFmazBmmTOeHyQ395/JRj2yY4gCgrWaX
-h9QoqDDCfJ5aH3iBi+pJL94=
-=cTJ4
+iD8DBQFBxWFdArHZZzCEUG0RAkf2AJ48EBlfGl7fgfMtsZYUZck27zaKIgCffKXR
+zFVw7yzgJT1Jv6VLwEXoLlY=
+=YgFv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.3-r5.ebuild b/app-editors/emacs/emacs-21.3-r5.ebuild
index 228215c3da55..716a9184b430 100644
--- a/app-editors/emacs/emacs-21.3-r5.ebuild
+++ b/app-editors/emacs/emacs-21.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r5.ebuild,v 1.2 2004/11/30 20:51:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r5.ebuild,v 1.3 2004/12/19 11:09:05 eradicator Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -47,7 +47,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-amd64.patch
 	epatch ${FILESDIR}/${P}-hppa.patch
 	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+
+	# This will need to be updated for X-Compilation
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+	       ${S}/src/s/gnu-linux.h
 }
 
 src_compile() {
diff --git a/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild b/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
index 94de16e3f246..0b0a69bdb323 100644
--- a/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
+++ b/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild,v 1.1 2004/11/06 16:06:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild,v 1.2 2004/12/19 11:09:05 eradicator Exp $
 
 inherit elisp-common alternatives flag-o-matic eutils
 
@@ -65,6 +65,10 @@ src_unpack() {
 		fi
 	fi
 
+	# This will need to be updated for X-Compilation
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+	       ${S}/src/s/gnu-linux.h
+
 }
 
 src_compile() {