Fix build issue on S/390x, bug 205555.

Package-Manager: portage-2.1.4_rc14

4 files changed, 49 insertions, 13 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 36d3fbcdcb43..386986841c7a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.227 2008/01/10 10:29:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.228 2008/01/13 09:48:47 ulm Exp $
+
+  13 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.1-s390x-non-multilib.patch, emacs-22.1-r3.ebuild:
+  Fix build issue on S/390x, bug 205555.
 
   10 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r14.ebuild:
   Update DESCRIPTION. Re-add dropped keywords, following dependencies.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 471e805f0dd7..d4456a740218 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -29,6 +29,10 @@ AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb63
 MD5 56912f79ce93e75206cf10fdeb85bf49 files/emacs-22.1-oldxmenu-qa.patch 448
 RMD160 ac5b0e57569f0963862ded46953be899fb637590 files/emacs-22.1-oldxmenu-qa.patch 448
 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590 files/emacs-22.1-oldxmenu-qa.patch 448
+AUX emacs-22.1-s390x-non-multilib.patch 969 RMD160 ec3044bc13ee11fb1dddf7c9aeb15fd9d00813ef SHA1 5ffddb8dd930b315df256d52a232b3e4c77bf52c SHA256 5be744a3eca3ac8a137dde6ba73455a9a4c1083ddc3ac834f452910e58570297
+MD5 c35b75220e555af3489884d29e52ce11 files/emacs-22.1-s390x-non-multilib.patch 969
+RMD160 ec3044bc13ee11fb1dddf7c9aeb15fd9d00813ef files/emacs-22.1-s390x-non-multilib.patch 969
+SHA256 5be744a3eca3ac8a137dde6ba73455a9a4c1083ddc3ac834f452910e58570297 files/emacs-22.1-s390x-non-multilib.patch 969
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches.tar.bz2 16592 RMD160 87410388441f3dabfb300154a7e3f2ee501e6ac0 SHA1 108fb43146568ac78052243bdf6b804e038efcf1 SHA256 9359bd2e8bc6fd0d7532ad4c91fccdfb12342a4e5c578d8e35f2abae11ccf024
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
@@ -50,14 +54,14 @@ EBUILD emacs-21.4-r4.ebuild 4598 RMD160 ca4f3078763d21b3331e7b54ef64b18d4df93f38
 MD5 c4c94ad71b79a9c5865fe1d2c7520b05 emacs-21.4-r4.ebuild 4598
 RMD160 ca4f3078763d21b3331e7b54ef64b18d4df93f38 emacs-21.4-r4.ebuild 4598
 SHA256 a6b910d89d85c84a0dd0a5953fee402aa35dc4933cf43253f9bf6e2f19e1e306 emacs-21.4-r4.ebuild 4598
-EBUILD emacs-22.1-r3.ebuild 7820 RMD160 ce116f451c572a50ec82423a3e454e60342508b3 SHA1 1fa63c9bde05211303f73def2ff3c632feee4163 SHA256 bb2591288133a9bda8790491a386d91a61ebc7dd89026ecd96c737645567e11f
-MD5 a2fccb961973f4a59614a872cbefccde emacs-22.1-r3.ebuild 7820
-RMD160 ce116f451c572a50ec82423a3e454e60342508b3 emacs-22.1-r3.ebuild 7820
-SHA256 bb2591288133a9bda8790491a386d91a61ebc7dd89026ecd96c737645567e11f emacs-22.1-r3.ebuild 7820
-MISC ChangeLog 33304 RMD160 c8a9f19f6ad9c89e5063a1f6912f5fa80601dfc3 SHA1 98260b822159acb3e581736fffed0c004fd491a8 SHA256 f6921770fc27101ecb0c9bde96697d3d3ce7026091f50419bd1a212656b33fa4
-MD5 70a9e0d375a34d3d2bab0c160b9eaefd ChangeLog 33304
-RMD160 c8a9f19f6ad9c89e5063a1f6912f5fa80601dfc3 ChangeLog 33304
-SHA256 f6921770fc27101ecb0c9bde96697d3d3ce7026091f50419bd1a212656b33fa4 ChangeLog 33304
+EBUILD emacs-22.1-r3.ebuild 7872 RMD160 72180dee2e75a82603189b9b8da8f6c3fcf03fcf SHA1 629eecc74bd2bd9abc9c6b6c73cc3111bd0ea4fd SHA256 58d0c5bdcbde31da3adff4932661f3d4889a40791690ce4ea0c9bf8c289a0bfb
+MD5 276ec7307540eee3e9b2888dbb41f861 emacs-22.1-r3.ebuild 7872
+RMD160 72180dee2e75a82603189b9b8da8f6c3fcf03fcf emacs-22.1-r3.ebuild 7872
+SHA256 58d0c5bdcbde31da3adff4932661f3d4889a40791690ce4ea0c9bf8c289a0bfb emacs-22.1-r3.ebuild 7872
+MISC ChangeLog 33461 RMD160 427ea9b5131f46be79394c5e49b63102ca7624ab SHA1 82545b4b177ca83ae29322b6880978f1eca556cf SHA256 30a1b81cbd8f2d2446fb91df1de29dda987fdc83e19e66bf0a41254119b16c87
+MD5 776836c5c83f5a1a5abac5f372b5eb64 ChangeLog 33461
+RMD160 427ea9b5131f46be79394c5e49b63102ca7624ab ChangeLog 33461
+SHA256 30a1b81cbd8f2d2446fb91df1de29dda987fdc83e19e66bf0a41254119b16c87 ChangeLog 33461
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -77,7 +81,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkeF87wACgkQOeoy/oIi7uymmACeLqf4QUg5vzDPOi5lABIIUp0Z
-GSwAn06ZL8Gp2vXQ8GXZ9YMYBYGgfzTa
-=9JFZ
+iEYEARECAAYFAkeJ3pkACgkQOeoy/oIi7uwPdgCeNMftCo2dT3oM4sKhqvRuvt0D
+ddsAn3g/Y94ut1Rlubb0v78937//hxLh
+=Uk4B
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
index ea45567b1ac3..97b287555cd6 100644
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ b/app-editors/emacs/emacs-22.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.14 2008/01/10 10:29:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.15 2008/01/13 09:48:47 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -71,6 +71,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-backup-buffer.patch"
 	epatch "${FILESDIR}/${P}-hack-local-variables.patch"
 	epatch "${FILESDIR}/${P}-format-int.patch"
+	epatch "${FILESDIR}/${P}-s390x-non-multilib.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
diff --git a/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch b/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch
new file mode 100644
index 000000000000..415b431951de
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch
@@ -0,0 +1,27 @@
+--- emacs-22.1-orig/src/Makefile.in	2007-03-21 15:31:24.000000000 +0100
++++ emacs-22.1/src/Makefile.in	2008-01-13 03:53:26.000000000 +0100
+@@ -29,6 +29,9 @@
+ 
+ # Here are the things that we expect ../configure to edit.
+ # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ srcdir=@srcdir@
+ VPATH=@srcdir@
+ CC=@CC@
+--- emacs-22.1-orig/src/m/ibms390x.h	2007-01-21 04:59:39.000000000 +0100
++++ emacs-22.1/src/m/ibms390x.h	2008-01-13 03:51:46.000000000 +0100
+@@ -160,10 +160,10 @@
+ #define XPNTR(a) XUINT (a)
+ 
+ #undef START_FILES
+-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
++#define START_FILES pre-crt0.o $(libdir)/crt1.o $(libdir)/crti.o
+ 
+ #undef LIB_STANDARD
+-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
++#define LIB_STANDARD -lgcc -lc -lgcc $(libdir)/crtn.o
+ 
+ /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
+    (do not change this comment) */