Fix building w/gcc-5.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 39 insertions, 20 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 87bdf1f0b03c..dbbc61c9a38b 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sandbox
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.182 2014/01/18 01:59:21 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.183 2015/04/15 03:25:06 vapier Exp $
+
+  15 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/sandbox-2.6-gcc-5.patch, sandbox-2.6-r1.ebuild:
+  Fix building w/gcc-5.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> sandbox-2.6-r1.ebuild:
   Add arm64 love.
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index e40f62277192..560173c95109 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -7,6 +7,7 @@ AUX sandbox-1.6-disable-pthread.patch 959 SHA256 c4fefddab05d440b3b1c2df766c5b2a
 AUX sandbox-1.6-disable-qa-static.patch 332 SHA256 060afa33dcfb6836676dc0febd5bc272b66b55e3753f739b56664e9ebce0eb20 SHA512 8839d4e279be41f1ee118b897c7eae8fd4058e4b7ecc1b5872450c177e09b5eefe569964efc294bd6f3e4ea92a3b4ba9840852d2be8db14810cd4578640ca6c4 WHIRLPOOL 6730b53afc16033911527492b0bf14a35f0e4b0b7cf3d42b1af299e9caa4a82f5e424e514aec81720da53a497cbc31b4f3928fc85dc8b04f979b726dce5ff2d8
 AUX sandbox-2.6-check-empty-paths-at.patch 7454 SHA256 a48759a4d3e9a70713473b6fad59bdd750b5cd37e7d632c786205ff20004ae2c SHA512 5eba7915dedf57f44c37881e9c6b48db8733d1493779a33127d08bb9ea77056d788ec9ace72c13eb101f42f01c95309c7cebca6c76212a8c99a8655372c0b7d7 WHIRLPOOL 46eb3a8ef8f22030cd793f3b16adc190b5750019c0df83e161c6918f08555a8ad890c1425b03cbf7e53ebcd34a07a9dd9b594d0c0fe31834656ffce3d58fa284
 AUX sandbox-2.6-desktop.patch 875 SHA256 2eecf67790aeac210f9aa899a86f7664776ed65d9b55159e1b359162dfb9ff74 SHA512 b72ec7f414d19bf513dfb1aea10523fa5dc07a1375d8f08f664d204b64b23c891a79ca14987528c595936f441e1f595b366aabbc57313667c7639d73d089ed9a WHIRLPOOL 7f787b8be9b5712eb2b2a0cd2ff825df1045ebf1cc4e73a50f610e620d30752045690a5c28835465d0ab0c3c4a9eaf8b92a5c123cd741ad69dfedb31aa457fa0
+AUX sandbox-2.6-gcc-5.patch 455 SHA256 1807ba66a53462b67f74f43232aaebde20889a553a24dde36025d751928a2e1c SHA512 9d6aa204fc60aae7f2243f403fbadf41a83aa1232e92d96fc1f6b772b27e0e6a3b25097cf23d7138145efddc3a194e879a0e2e84b687b05e89b470bd4a849a77 WHIRLPOOL 678125baa90fa568ca58053086bbe299484c5f6ce0ebc1943a91e72e01fff13cdd99a821a93d36ca71ba2a8f552bf6cc917994209203c45e90315bae64202f2c
 AUX sandbox-2.6-log-var.patch 2039 SHA256 f464a29cdd9de0c510277310f4febc8f96515ff2ff03fc92df1c75b9cbd75619 SHA512 cf6f900b4078eff5870b63b2bc7c81c5b00488e030d7e9ce3007693e9d1339ac6201ddacfaff552c6c9b99b6d32383229133c80190404b7e4fde06ad376b2050 WHIRLPOOL db99737a6567788194f7b37b12b92fcfb4c263df40f40aef9e0a3ef2b6a1523331313b791fffa2b26775b646795364ab1db1711eb4329cda3337df27aebfeffa
 AUX sandbox-2.6-no-pch.patch 702 SHA256 d95a65ffe23c6c81f6b1e695f27cffc1cb617ebf62ca467c8eae5e4c3771089b SHA512 2269b806c2b04c0891644c694d2e0cb87b3ad9236457add50df58d3af62ca5daf17e8b599d0190b4efcae7e84ba99308ea4b0f4a1482d08314d4f3b64bdaf884 WHIRLPOOL 343b62bcf88b0491d69b507eb2feb02b21e9e66cb9006c2043fcaee87f461b3228d37e9053f092e32fff4eb73b14db32a262b79c7430cddf0ddde6f90958e21b
 AUX sandbox-2.6-open-nofollow.patch 2027 SHA256 c8816ae4e1991f9941abd43ec4bfdbf4e99cf36ee90694f77ab88754c53785ce SHA512 dd5222f32a40def38c9719363a24c48d5b112e3560b44c5f32afc3daa0614fe9bc5cb68ca8ac69032cc8d6299f09b25d4d7c72e16892188b42768ffb28c19f07 WHIRLPOOL 03cb5fb9df04a8d7f92855c292a6c431d01d330fecae198f2c4b95d824454f10ce1ad66db1a9d54d1bef5f74989cf6debb2d98de28ee0c2c6a09c1a0752b5519
@@ -21,23 +22,23 @@ EBUILD sandbox-1.6-r2.ebuild 2698 SHA256 8009ef1c543c35eb4bf9ad02000c9facf24693e
 EBUILD sandbox-2.3-r1.ebuild 2737 SHA256 6e00ef844e302a4b6624e0c338820edb450bc0031862797e6f93b88c3debc7e7 SHA512 43245163ad47b5062002f58d34611a63ed2500bff12883aed476b29be9cfaf876dd977df57438c886b105174b4bef79c299945252c6d4edaa5c4a84eb5201294 WHIRLPOOL 99f920efc06109d580141507927ed6f4cc9634830ade2600649bb0841487c3ab59b78a7b894e16d223a94c92c112bd8e5d7d172e5595d5a4895248fc94901a0d
 EBUILD sandbox-2.4.ebuild 2663 SHA256 3e8223119db75ef1624e1aef40a4c42fca0bd9bae94c446f892f4aa6e519b6e0 SHA512 e5016d9e548eeb4db1817955646463c9cb503a8b1a4b44352683b6fd3639e5d80a09ce19c0b22d7221eddeb8d62d6e8dba80f77eaa90cbb80cdb8542da1cf8fa WHIRLPOOL fd2f3f2ac4401a1f67cb8c9eb392aa57ec60c8cdf73da1bfb0c72dd37152ab280dc1a62420a713788a5cdb02da2ce85df9d9e2b4577ddc763543b360b8f890f2
 EBUILD sandbox-2.5.ebuild 2715 SHA256 236a1edd16571aa802fd6da0d9751b53d3354b865857d247b065ccf69e5ccb14 SHA512 ab65669bb0bc19d7fc0295d60970e75d4967a18d4a258ee9aa92c7afd7aead86f966e38c4741c8d5f9c7d4f3070da43fac09701112a7f24da945735244f798a0 WHIRLPOOL d51b5a8cfd3b745159d6e61e0c5137e778442bd8926ec65b9d6290d1fc24b40b2ea1339a4b3bc1f915f6e38dabc09d1b1508288270bb126c746c1d223fdbe7ee
-EBUILD sandbox-2.6-r1.ebuild 3140 SHA256 ac86caa0205da340d89d3614ecde434e992f64ede3144ac52bdd42e49b6f3153 SHA512 f84e7ad73146dbcbcb0b7852d67c933ee5c8dd58cc3f8fc8123f67f5768892169cac2e675b6cf07d73ac2e0dbfc14827717dd618d917f1914585b46d8b329590 WHIRLPOOL 9274d64d9571ad36c50121b690b855ba8fa8db291270e3c986fc51df659d6444ffe20d46bff7c2642f6b9c6115b7e9a690334e48b5cfae9aaab2fb0602a21b52
-MISC ChangeLog 25193 SHA256 81ea7f9419bd1491ad600aa668d940a0f057ea2bd6db0a58ae18ccaf8011b009 SHA512 b105c4f54b525c374afd63c0d1ddb1cc1578eca70b0d777f6294fc4f1ac8a431e57ffd510568d76513d1ce964a5adde8ad1d88154f2e837e1b8997956c0b8a99 WHIRLPOOL bba1115e629b70b8b17fcff41fbaf3db64edea9401479d3f787c4b2e28fa376150533fe27b851d22afb8b633b0629a3d6fbefcfb19dace31bae7662232402b53
+EBUILD sandbox-2.6-r1.ebuild 3179 SHA256 2ebc510ce5f85c5a5d9dd893324fdde89ead1b198ed41215427cc2b4a3eda8e6 SHA512 372af1ac72ddf6e6c1f8f31eea04b4f9d07b6c9e11757811567923c4f2f51242fcb5495ac76f3e9f04a0e8035b14b7fee9534368709c7e5cd60e9ccd08e9b44a WHIRLPOOL 28329eeb87f85102e32d2c4807f47c48011fa656e3a8347af7cf7cde5817d3cbb72c942a4e26aa8a58ee8a95e0b5cc3d29757e12f16e6f7d2e749524835a4e7a
+MISC ChangeLog 25325 SHA256 9e1e3512cb2dceb07f7f480661aa00528d23e41765893244a6dae27bf039f0f6 SHA512 6c714a72b2d1848381543031478dca397fd8150a8ac82febdf4017a339ebdc0dfca8adac95aef4682311e2ada9742aaf9b86d49c9bb6768ca9c802af00744a53 WHIRLPOOL ebffa03ba18522039481fcdf1bfccc2ab5936e0fd4e0d081ae56eca0c784a8e250850855635e7a20025cb38e99e8f7dd80e448bf9e1ba70e6b8295f9aa502312
 MISC metadata.xml 316 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b SHA512 2b4ddea0bb5a40cac834a09b89624049b8561a4a4f648b4d5072c413d4eca78b5cc24859664fa746be36c8b60188e88f2ae38c2c5af30d91dc6273c0f85de278 WHIRLPOOL 64ed27fc7abb1b3b82621f6bb91f03d0070933d0423f9d323ac803354fc6acf2182df1dd85a083fa047d63561a5e92d44287ef4935a11a733244d4393edf8f6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2d//AAoJEPGu1DbS6WIAhu8P/2Cc690zBopwc8C7u3pCFeJj
-Ue110o6+cAA3IpSHillFExzekhSE6Z3yGavXlt0im7H2zmAC0CGLxnoZRiR6EjSX
-B/RB1EEqweRbc+HxsGKqMZN97X+EIVW7G5r2sBfpGGOLWHX5IDZdTuYlHcW4pDBl
-xVCLL0FMrlwi6f/CmyVDgQySYGeKhYUNEByZ864AGXngD7n/Mck9zcHI9rIw28VT
-aCVyMJD4LOnakVm726w8Z8L8xeHzkg+QMTmtLg8BOuGc8qNIFjwc9GndyybRYxw+
-vwMeHjPdGnZPTXo9XU1Fs79YbXtZJP7AYqFG/E741IyAahXONnaYBF5cnKaHGCyx
-pBJ43o+Fai8xj2C4LCCND7EG1GRj52TNRh7LM18jK6nYdcogaf4s8ux0EHWU3pMO
-nL/akhrY9HSjwKYgZzMB3E1SoIyQal9KJ7ba8jS25znXuGW23AkHzQHzX+RFXN0D
-XxeEK2Xl51K2Vq2wvYTNI1xDKPQdm66NI+mgwbVZ4y4N1Q3nJOi4IYUHmbqImR9s
-3JJMecxIwACuaT9TnQdNX40aqxN/+JXprGCmaIlG+eXWR+ka9h4vn1Sm0K6RRZbo
-KdtvHe6FnyCO4O9dmRMY4fzI2yltf3ZfFnCzOlIqojBfJLbX/tEvbeEyTQJs9sEB
-E8e4nTOl3iOPoZSiWceh
-=KTTy
+iQIcBAEBCAAGBQJVLdoTAAoJEPGu1DbS6WIArBwQAJKcnbsrhoshwEPgnFQVLUfh
+CNgt3jIqUS2+K46wCUVGReZaAVDBjhjBSCkux9w/Qrgv+l8h8GM+aftzuahDLMm2
+2k1bgkpzbEExWa1OBSc2L1JC9N5dbIvmX1+SscErfvg6VcPz5JLg+nPmQCNM5EaV
+r8FpTdylzG0VaA8PQVdFE+NVa+3id54ETcPOiXf1WSsYwr3rEMGeUyN7m/lF8v7b
+rJWAoieJtqfYGKfRPxdnjfmvn1B4olQ0goFnWUDQj5R+xh4yommiNp7c0LisOWwO
+pgqsZYrkjhKtDHKsOyZQgZzh6840UbEcbzN2rr0OXT9zkMbaed3v9k8WRr9Ius2O
+o1/GN8DjJUhdTBXzIEkBBjYg8L6+di1eGBZlAgofNDaeHqONTU5iRpIN9ihtQQLS
+WuwDNUKl94PBXNUtIzmQCzNJZivdxFXoEWtbj69cZndtyGTWyBnt5zebZy2U8dM/
+S12CbmNUZY9aFBdc1cnsdzPhrqAqlxHp8JGVTmdtH9Ztc1atSav296+VOk4T01iT
+wOQ46CTRKHZctlWHXdnlzuJc8AxEgRUpEUcm2SWvZV3aHQTRLCqQhGMZ8P/Txkrk
+6g4y97O7sN8/snDo5avhovAJT3izKhPKD0YePQjVKBMVWbOyrBfhLJaBBK/lvTNc
+LcJXGSLo7TemAYC4E7Hw
+=BdkZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/files/sandbox-2.6-gcc-5.patch b/sys-apps/sandbox/files/sandbox-2.6-gcc-5.patch
new file mode 100644
index 000000000000..fd87d6a272a5
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-2.6-gcc-5.patch
@@ -0,0 +1,13 @@
+fix building w/gcc-5
+
+--- a/libsandbox/Makefile.in
++++ b/libsandbox/Makefile.in
+@@ -68,7 +68,7 @@ sb_nr.h: symbols.h $(SB_NR_FILE)
+ 
+ TRACE_MAKE_HEADER = \
+ 	$(SB_AWK) $(GEN_TRACE_SCRIPT) -v MODE=gen | \
+-		$(COMPILE) -E -include $(top_srcdir)/headers.h - $$f | \
++		$(COMPILE) -E -P -include $(top_srcdir)/headers.h - $$f | \
+ 		$(SB_AWK) $(GEN_TRACE_SCRIPT) -v syscall_prefix=$$t > $$header
+ trace_syscalls.h: $(GEN_TRACE_SCRIPT) Makefile
+ if SB_SCHIZO
diff --git a/sys-apps/sandbox/sandbox-2.6-r1.ebuild b/sys-apps/sandbox/sandbox-2.6-r1.ebuild
index d7b6324b32c6..b60ad088b13e 100644
--- a/sys-apps/sandbox/sandbox-2.6-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.16 2014/01/18 01:59:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.17 2015/04/15 03:25:06 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-open-nofollow.patch #413441
 	epatch "${FILESDIR}"/${P}-check-empty-paths-at.patch #346929
 	epatch "${FILESDIR}"/${P}-no-pch.patch #425524
+	epatch "${FILESDIR}"/${P}-gcc-5.patch
 	epatch_user
 }