gentoo resync : 28.04.2018

3 files changed, 26 insertions, 3 deletions

diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 96b0f86c6ef4..afdf8c342277 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,8 +1,9 @@
 AUX lwp-2.0-amd64.patch 866 BLAKE2B 231e806f36c17ec0501e0ec646f16093408ecd25bf612a29a0cd34550c966f53b891d1f2522cb810a2fec9661cef2be9747537a17e06f6e8f6e257dc7694eb50 SHA512 f66c3d7111673ddf503a8ebd82fe22db9bf92dcc4bb7d9ce8fbfd3c65fb699a4f240c04700fcdb08c582a4f2be8da7ed870ba07cbc3d81110b2fc29f69028dd0
+AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
 DIST lwp-2.2.tar.gz 376136 BLAKE2B 2f80ccab5cdc7e910a0ae41416a24a8fd2a6da86799f1393b23fb570d61e6973aa4ebc70fec8d3343465bbc5eea1280fa70d14ca2678d2b2d490333b5cef2f2a SHA512 a5fa52c0483e04fdbface5f0e9cc85bab5db59c4d730a3cb3c538ccaa3a88aaa916b37478e4c5450e77bcc45638987610ba619995a75541d728f138f103c5d7e
 DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47a1e58375775a80c96b739cc17acf6aacf3b161e53445d947af341a555edbd2cb8783741075bfacaea43 SHA512 ad8374ddf55ef9fddf9ce0b8d7c2ae0dc206e5108a01f278a37486070ab70e5bd7312f057863254b4fc430cfbed2c36f589807813e6a99067933142d5225395b
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
 EBUILD lwp-2.2.ebuild 735 BLAKE2B 8ab25555a35dfa49478fc46d75c7d516b74e396d80537119a4b9e2b98a7082218e7ecb908f88393f2e256178d5e9f7c02d115345fbfaae5479e974062b63abf6 SHA512 c9d778fadd11090b29496c8f57aec1347d5c83140742c0ff19321d859da0715bc72c9200f5a565620e341bf3cd9aae31e51827112fb6dcec64d629e01eb44811
 EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
-EBUILD lwp-2.8.ebuild 488 BLAKE2B 0e0c24dd56f5b9235955203bdaa3d05008b52b1a181dbfdcd95841e40628fbab1a12713669b84b39a993813e1c8e3c80bd5c901c5c3bdf6f095ec84b33b2e836 SHA512 26d0e09306c369147ad3777baa0642375233febe76cdfeece2fe4ecfca7ac8101dc8d4f1bf49038c98c82b3e5a002184869affe3838035f65dd0edbf905a25e0
+EBUILD lwp-2.8.ebuild 529 BLAKE2B 14ed1d138ba16b3f1b63335bc3abc84bd65abe7e76562f6773836c37eb7d9d9a82e794a5b51a0f84511beac490e5136a825a9563a3a44aa2b068117c1696e3e7 SHA512 51be560f7d92910e87c8ca20dd90cf9afb1d5ccedf3abcffc2381d8d1e006367840a8856d819db98d15d5b44b3b508948a600f8ed8caa586fa156d6ccdf269bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/files/lwp-2.8-ia64.patch b/sys-libs/lwp/files/lwp-2.8-ia64.patch
new file mode 100644
index 000000000000..bb5abe65cc34
--- /dev/null
+++ b/sys-libs/lwp/files/lwp-2.8-ia64.patch
@@ -0,0 +1,18 @@
+diff --git a/src/lwp_ucontext.h b/src/lwp_ucontext.h
+index dfb5465..adc58e5 100644
+--- a/src/lwp_ucontext.h
++++ b/src/lwp_ucontext.h
+@@ -25,6 +25,13 @@ Coda are listed in the file CREDITS.
+ #include <signal.h>
+ #include "lwp_stacktrace.h"
+ 
++// ia64 defines uc_link define as:
++//    /usr/include/sys/ucontext.h:#define uc_link             _u._uc._link
++// undo namespace pollution
++#undef uc_link
++#undef uc_stack
++#undef uc_mcontext
++
+ #ifdef SAVE_SIGMASK
+ #define JMP_BUF sigjmp_buf
+ #define SETJMP(x,y) sigsetjmp(x, y)
diff --git a/sys-libs/lwp/lwp-2.8.ebuild b/sys-libs/lwp/lwp-2.8.ebuild
index 9f58c389b04d..e6fa49ec3e50 100644
--- a/sys-libs/lwp/lwp-2.8.ebuild
+++ b/sys-libs/lwp/lwp-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,9 +10,13 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ia64.patch
+)
+
 src_configure() {
 	econf --disable-static
 }