Drop sysfsutils dep as it appears to be unused (builds fine w/out it) #377699 by Anthony Basile. Add fix from upstream for building on s390 with newer binutils #391433 by Raúl Porcel.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 87 insertions, 13 deletions

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index eea7ed943f0c..30a80eca7e1f 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/s390-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.27 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.28 2011/12/05 19:05:33 vapier Exp $
+
+  05 Dec 2011; Mike Frysinger <vapier@gentoo.org> s390-tools-1.13.0.ebuild,
+  +files/s390-tools-1.13.0-larl.patch, s390-tools-1.15.0.ebuild:
+  Drop sysfsutils dep as it appears to be unused (builds fine w/out it) #377699
+  by Anthony Basile. Add fix from upstream for building on s390 with newer
+  binutils #391433 by Raúl Porcel.
 
 *s390-tools-1.15.0 (20 Nov 2011)
 
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index fdcbe71e6f1c..742a6fe372ec 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX s390-tools-1.13.0-build.patch 4770 RMD160 1d950de92fd50aade8f66ac42459f640a8af388d SHA1 f43230d29468b30db548c8583da2d98cf8b8abeb SHA256 e7278dd938d7bfb02a4d9ee7af1487eef73e1237769e9c5c8d4e1cb57837cfc0
+AUX s390-tools-1.13.0-larl.patch 2005 RMD160 55b975a5aa6878fee2c42443a822394908984bbf SHA1 b105e7efc8e9e7da4285bdf35980e6318e30c409 SHA256 1c143dab124dddc0c5d69660782ee1003d84085b0ac197ff2a7bb4c71bb8c793
 AUX s390-tools-1.9.0-build.patch 4850 RMD160 d57e71ad7f999f10218b33cd6d4754ed4f832a2d SHA1 5f0f3e021e271936fc7398a493846ea433a83f68 SHA256 474f46b40f0a9d292a077b90161ba34f4546e5af603c674a5aabc92faa6ed736
 DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
@@ -10,15 +11,15 @@ DIST s390-tools-1.13.0.tar.bz2 590468 RMD160 9f58287e054eb894f6b8a7043604fcb2407
 DIST s390-tools-1.15.0.tar.bz2 592531 RMD160 1c40da955dabf56057f18e0aff2ff8487925c413 SHA1 6fe1737cd804d46db83dafa6559499834f7219dc SHA256 902b81865c1b3c804327fb2f9767af679ad4bf969f65f604247b0aab465606e9
 DIST s390-tools-1.9.0.tar.bz2 535384 RMD160 2304b19cc481b9fb08ce149801307cb336010eb0 SHA1 d80d094d39d3d62d9e6905e2f549a3a939e2d198 SHA256 4ece6cc0c255c26f3cf29b7d95fc2000438b809501a0a3ef9fb137114c270cdb
 EBUILD s390-tools-1.10.0.ebuild 1635 RMD160 e1ddde819f5daaab387844fae748e9aec278db10 SHA1 b79601d4c9d56d7c123fe9df8cd4b0091f02d374 SHA256 8261d50145e22b709e6b62c0d72592fb39a01bbe0d30ddc506944011a9712779
-EBUILD s390-tools-1.13.0.ebuild 1614 RMD160 52ea5a63ca381a7172a8279421053c7730514d68 SHA1 e5baec576a5f31652139f98d7dc504ad2789638f SHA256 7dc590065a505e0e977ab1b74f1c639e3f78d1d8bdc430e5ee3b247d27a53e6c
-EBUILD s390-tools-1.15.0.ebuild 1615 RMD160 ab2450dc649d682debfe96d7fe095f8b3f390c44 SHA1 142050ead8a3cfa6add2c3bdaf097f631f3cc98c SHA256 58e240843b4379c9ccc1c0f9cc4076b71a231873f95f0027400edaf55fd1b8c8
+EBUILD s390-tools-1.13.0.ebuild 1649 RMD160 b354a12413c521830cf0a60ad34760ab13f92b1f SHA1 eb0a76ae1c2456b7b88513774ca6430a87b0a385 SHA256 fec7b11265342949128e3b6b7b3dfbfab980d2c1774563bf5e8b38ee7fc40d71
+EBUILD s390-tools-1.15.0.ebuild 1650 RMD160 c778e9292086c74567a0efb8ee8117fab0602a19 SHA1 cd780aa25623c76de1e0861e5199c2a43c0baf5d SHA256 5e224e047170f4abcb462f3336a08b32d4fac70978d87fc9d26169f5ed3c7a16
 EBUILD s390-tools-1.9.0.ebuild 1634 RMD160 a76dfee5cc74bfe260f41ef5ba5dd405a1a5d038 SHA1 1bb9c6058b66eb73298c7333ce6ef2c179344e6e SHA256 36e511ee866221298a7e9c8b8edc1e9788cc6410abec8d657e02367c9a3fa1df
-MISC ChangeLog 4108 RMD160 bebdd4b31f7b2e2fab8740cd7f3b2764fff19ee1 SHA1 24d16194a692805a21c88261e277c9e5ff53a0e8 SHA256 441760deb5ffeb4de2f9fc94b1cc9c5eb6daeb1053d8f4c1c1757919b9c1e1a5
+MISC ChangeLog 4441 RMD160 686370525c50bb2a5bc659212f97a180272e6b33 SHA1 50ed399b8b0c9e30e5f9421302192a4d65d9c9a5 SHA256 0aee38ed88733c4105a58f94a8bc94f4478ff69369eaa2d2e6c2a8b9bcb23528
 MISC metadata.xml 542 RMD160 34f9f6edda0a1c48c8222ab1909dcb5bf175c1ad SHA1 b5901898164650ea4a8fc3597424d46a48a20cf3 SHA256 8756df3f4e87725b0127e06b6be6905a5e36a4d20a5d6509f3776de0663649cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7Ion4ACgkQaC/OocHi7JZblAD/f8FWnTje+nDHO47ELTOpxhmv
-2AXXrnJcr3lwHbuvdIEA/0B0/Rw037kT8PUwc6QOqPsFTWU6YRlEEivXmJlTtXlp
-=jGI7
+iF4EAREIAAYFAk7dFgQACgkQaC/OocHi7JYIeAD/XbmqoF4+SgVAK5xP4sx9gHuj
++t+/N1yJNGFh2maiiscA/1zNTJoXE3p6Fh7idtkwh+YuC6AfSkArljNWf0W9yo+J
+=9zv4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch b/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
new file mode 100644
index 000000000000..7bf6cf41e94c
--- /dev/null
+++ b/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/391433
+
+You reported a zipl build problem for 31 bit:
+http://marc.info/?l=linux-s390&m=132307473025493&w=2
+
+The following patch (for s390-tools-1.15.0) should fix this problem:
+---
+From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+Subject: zipl: Do not use larl for 31 bit code
+
+The larl instruction is not available for pre z900 machines in 31 bit mode.
+In order to be able to compile zipl also for that machines, with this
+patch the larl instruction is replaced by instructions that work on
+older machines.
+
+Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+---
+ zipl/boot/dumpcommon.S |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/zipl/boot/dumpcommon.S
++++ b/zipl/boot/dumpcommon.S
+@@ -1005,7 +1005,7 @@ _count_mem_32:
+         mr    %r2,%r1                   # mem size in bytes in %r3
+ 
+         st    %r3,.Ldh_real_mem_size+4-0b(%r13)
+-        larl  %r7,.Lmem_upper_limit+4
++        l     %r7,.Lmem_upper_limit_addr-0b(%r13)
+         l     %r6,0(%r7)                     # check if we have an upper limit
+         clr   %r3,%r6
+         bl    .Lsavemem-0b(%r13)
+@@ -1018,13 +1018,15 @@ _count_mem_32:
+ 
+         clr   %r6,%r3
+         bne   .Lexit-0b(%r13)
+-        larl  %r2,.Lmsg_mem_limit_set          # print mem limit warning
++        la    %r2,.Lmsg_mem_limit_set-0b(%r13) # print mem limit warning
+         bras  %r14,_sclp_print
+ .Lexit:
+         lm    %r6,%r15,120(%r15)
+         br    %r14
+ .Lonemb:
+         .int 0x100000
++.Lmem_upper_limit_addr:
++	.long	.Lmem_upper_limit+4
+ 
+ 
+ # expand Macros
+
+> it fixes most of them, but seems there's still one left :)
+
+Ok, try this one:
+---
+ zipl/boot/tapedump.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/zipl/boot/tapedump.S
++++ b/zipl/boot/tapedump.S
+@@ -532,7 +532,7 @@ _dump_mem_32:
+         # Cartridge full
+ 
+         la    %r2,EMEM
+-        larl  %r14,_panik_32
++        l     %r14,.Lpanik_32-0b(%r13)
+         basr  %r14,%r14
+ 
+ 1:      # All memory written
diff --git a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
index f5b7871bda88..cf8a3ebb8529 100644
--- a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.13.0.ebuild,v 1.2 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.13.0.ebuild,v 1.3 2011/12/05 19:05:33 vapier Exp $
 
 EAPI="2"
 
@@ -23,8 +23,7 @@ SLOT="0"
 KEYWORDS="-* s390"
 IUSE="fuse snmp zfcpdump"
 
-RDEPEND="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse )
 	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
@@ -32,6 +31,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.13.0-build.patch
+	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
 
 	use snmp || sed -i -e 's:osasnmpd::' Makefile
 	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
diff --git a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
index 30e78b019c30..968cf0c69218 100644
--- a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.15.0.ebuild,v 1.1 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.15.0.ebuild,v 1.2 2011/12/05 19:05:33 vapier Exp $
 
 EAPI="2"
 
@@ -23,8 +23,7 @@ SLOT="0"
 KEYWORDS="-* ~s390"
 IUSE="fuse snmp zfcpdump"
 
-RDEPEND="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse )
 	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
@@ -32,6 +31,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.13.0-build.patch
+	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
 
 	use snmp || sed -i -e 's:osasnmpd::' Makefile
 	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }