Fix build failure against modern binutils.

Package-Manager: portage-2.2.11_p14/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 47 insertions, 14 deletions

diff --git a/app-emulation/ski/ChangeLog b/app-emulation/ski/ChangeLog
index 142656815cfe..cff7e767c9cf 100644
--- a/app-emulation/ski/ChangeLog
+++ b/app-emulation/ski/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/ski
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ChangeLog,v 1.6 2013/12/31 17:09:19 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ChangeLog,v 1.7 2014/08/19 06:59:27 slyfox Exp $
+
+  19 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/ski-1.3.2-binutils.patch, ski-1.3.2.ebuild:
+  Fix build failure against modern binutils.
 
   31 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
   -files/ski-1.3.2-gtk-linkage.patch:
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 11341f5e1b22..36be728503b9 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -2,22 +2,19 @@
 Hash: SHA256
 
 AUX ski-1.3.2-AC_C_BIGENDIAN.patch 2266 SHA256 e15a60efaaa0ce3fb1d25d68029f9c35928daa468ecb110d2f7ee1ab50a93774 SHA512 0970007c99f29dd19d4e64f433cd7addec8a316ec68a7e3c07c11ec3849d70086ba262883eb82f66c0517b9bf2c77399d69d72345ca0e8d9cb3723086fe4a6a0 WHIRLPOOL 636a0da82e04e8036c3ce5c1f895a41e361c4330c2d0ebb0c0950cb56b4079c35e094c837472730271c25bc1e1c867d5bfeb1938ae482c2c13471c709ef02bcc
+AUX ski-1.3.2-binutils.patch 1039 SHA256 d737f8f4687f2eba3dbd2333a0b7aaf60b1c4a83d103b36708f42bd9239ccaac SHA512 b473ed658a5496c849cbb82dfeaa1913834dde60e2da17d09a4a882e87067236ecf25b807281921c86fc4a2cca5461f2a608e1a4c301d4cfda39507bdfcc4d6a WHIRLPOOL 5478593f0f7341d4bff752a7a92d7b726977a8cafc8754c3d8541f4fc441f6e58b95946d3d463bb2dcdce6ec899c74ac6ad9d2bc054cf033eab5618a6b5602b8
 AUX ski-1.3.2-configure-withval.patch 634 SHA256 5ad259f8527bd726719e74369d2a2493b1480738b358ab7761d0f1422da26496 SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec WHIRLPOOL 19650ba28d33487815d73e9b48efe4c452a971128a07f8dbb623a4f9520244ab603064bbc469576d3cec3cd955c0d4ce8df3bfe145d83b0a9d6d67a84c8b8662
 AUX ski-1.3.2-no-local-ltdl.patch 366 SHA256 2cf7edfe93c6e99e94b3311f9eadf4eec856c05476739273a2fd7ac5c87df38e SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81 WHIRLPOOL 8b064cb3475d2aaffd697182c8bf415b9cead758b0a46f526a3c58723cbfa96d17fed2e2d73a56816d8e47c3563cfc77b4d439aae539af8386e98d16e69f2f06
 AUX ski-1.3.2-remove-hayes.patch 682 SHA256 8773ce8867e7cde313ce32a84a427e5e593fea55d6d447ee09ff2e2414ead4f1 SHA512 efbaac0e9c6d1423def13d22b361aa9e7766b8959f2def6e146e12e74393f142b0212e2234ba2753aa71e19b6a0c30e86a74a05026efba2db01229d1a7e43a5e WHIRLPOOL 5b962643c5674612c1f9c713f3268dd2aeedeb7200b84c3bdcca77063773e36e5f158897b53490f1af5701d6bf8102b426af97bacb58ac543485a18aebcb508d
 AUX ski-1.3.2-syscall-linux-includes.patch 397 SHA256 0325662033c7674b275dbc2caa8e294a0d903e53266043d5a0551e67ba1ed56f SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f WHIRLPOOL 0c76d91c77ebb3a5483971ab3c5f47612b59ca415eaee2f9278347f4afc755f67494386b0b3cba8350bacda60fbc05a05f4adeecac85bf69d136678ab19396eb
 DIST ski-1.3.2.tar.gz 2715791 SHA256 34b2a1b2575d6c8703df8f1f3980f7b668e744c4a03f20ed4ed91d40cf40c076 SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0 WHIRLPOOL a6b00dc928612a37c33dc3dacd8a53f749ffa660f3aef5572b214e5c97ed93728e987c4be8abb2d375e0a84eb3037f9de490f3f0474a579e3c0476e50d6010ef
-EBUILD ski-1.3.2.ebuild 1257 SHA256 2ad97abd6c27d334a7f4529dd42189df132b0688c78732500a566e9ad7dc8ba9 SHA512 dbe1d0f72c576134e6d4173f937b80e31bb3df14fdf7a345c1a417d225091de6250e8db1cbc1021c8e492c2f2184c2bf2c84856778517d74c6bbe1838a2729e8 WHIRLPOOL a0c3ddea84ffaa34d27eb24b51fdd881108b80557c4659f4076714eba6802e93bf053cfc178eeb492e4fa5766cdf608e8c9b52992cb31d6054782a3d08054b15
-MISC ChangeLog 1280 SHA256 43635f2395d966f98e2365966a1614a0ac5249369c6c741bbeba23453a05fb33 SHA512 57f3cd752d8e57a2906ede12683fac068c64f4e12ef27b6e6e29e44b9d82789f853aabeab8f1acbdccb0c19a18dbeb3e06479e2c86bd08703feaf565f7f5d564 WHIRLPOOL cc35968675160be078795c37c98db90bb81c4c51366638390f5d2f9c6260480a24ef6e7d11eb8e7efcc161cecf29850afc8f7c0a6ab30c20a5c0f9484f9233b2
+EBUILD ski-1.3.2.ebuild 1292 SHA256 a0a7572084c6673cc8d5ee55a66567abed1182055285669eb7726a1a3ed148e8 SHA512 1d88e2d4b98d68ea68e656400116fbf6b2a6f15b5ad1cb89f3c46cddea91f227e817a5ca545b17c2db510aa1086196ac5ba1346e82f22dd1bfd684f539b68cd7 WHIRLPOOL adc0ad05956ee86d68a2df6259a8f2d449f9a3d49893d8dab60b618944cdda5869590029d2803f3e4dde1b4936b6870ddb4a19a3999c9d48b9187554e850efcb
+MISC ChangeLog 1433 SHA256 df4af9155e2c889d7eeb980c4466b0fd936ce8b3c8aace4efc116193748445f0 SHA512 b23843c1163f971ff514721d94f59c9499335b5e55ae6e81f9217802e33c9a66b3b8cc3c50096645e6d1b6bed9dc21e601b1503d34747e42d407b013b0ebaf93 WHIRLPOOL 8243b64b9eaa3c461e99b5130956e1066a44838285a8f142adf7aa763c3bcd2e1b940fe3803e146fbafee4fed1df1f82d5b79fd535587118eccbd73e23985003
 MISC metadata.xml 157 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a SHA512 0d0a45c88d8f80bd12c6f182387db789e11fb77de5f17f6896e638d1f57be0e207f8a0bdb63c4cbf570d30fb9d4d9928374bddd26bd035dd13485779158e078f WHIRLPOOL 431702b09d79742c3946fca1ee4adc8c7dc7bc1f35b8baa9db077208d540808a9dd774077e268a18b72cbe97305165b599a2cb4553f514691697da7f2251418b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSwvooAAoJEJWyH81tNOV9y7wIAIytn4RMnExjwBBkxBN70db4
-UsL9ygymfAd8yhf/uJ7eGoOC7jE8fjiiqHm42rRyRfYs9EGMcHxHbykjInzHRetD
-u2ttc9nW3G6EL1w0VvO8boj88QqF5cbTb7q0Upz3Pdx2WnHn7uSMm5GrrdR22L7u
-bvhy7TkcDnsM5j5n6mKc5rxaQ1d0wWt/cWQih4Ja8EgeATmBK3lsbJTWx57Kt2gB
-HkGYqRL8hx7bm8+p2uyGn/wYVybCgBwISMqKt0uUiKQ74qzXBE7Ah2bMEDOV4UY3
-QQhfdazgvoNgSFN4ElQDUkctjD5LO+0sZVxBSsiYhnuHIXBkMQKzT+gfZ0WxQuU=
-=dN2X
+iEYEAREIAAYFAlPy9ccACgkQcaHudmEf86o5twCeO+x17a78WYWCm9j62r6hzaW+
+aiQAnRC8FHFRex5XICp8J/PexkZOFtOd
+=uSMw
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils.patch b/app-emulation/ski/files/ski-1.3.2-binutils.patch
new file mode 100644
index 000000000000..71094f3bf4b6
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-binutils.patch
@@ -0,0 +1,31 @@
+From 30d3253c6b413ba22ca0ca30dcd4c4c24daec2e1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 19 Aug 2014 09:42:43 +0300
+Subject: [PATCH] Fix build failure against binutils-2.16.1 and upper.
+
+Follow binutils' upstream change from 2004:
+
+    https://sourceware.org/git/?p=binutils.git;a=commitdiff;h=7e2dd9e4c3e0b69dcb7d471b891879b5fd28687e
+    > section.c (struct sec): Rename "_cooked_size" to "size".
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/linux/dwarf-linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
+index 1941a1f..73be0e6 100644
+--- a/src/linux/dwarf-linux.c
++++ b/src/linux/dwarf-linux.c
+@@ -155,7 +155,7 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
+ 	      first.function = function;
+ 	      first.line = line;
+ 	      first.num_lines = 1;
+-	      first.limit = sect->_cooked_size;
++	      first.limit = sect->size;
+ 	      last_line = line;
+ 	    }
+ 	  if (line > last_line
+-- 
+2.0.4
+
diff --git a/app-emulation/ski/ski-1.3.2.ebuild b/app-emulation/ski/ski-1.3.2.ebuild
index 0ca93d6893a6..4446b11a8e70 100644
--- a/app-emulation/ski/ski-1.3.2.ebuild
+++ b/app-emulation/ski/ski-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ski-1.3.2.ebuild,v 1.5 2013/09/30 06:57:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ski-1.3.2.ebuild,v 1.6 2014/08/19 06:59:27 slyfox Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-no-local-ltdl.patch
 	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
 	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
 )
 
 src_prepare() {