gentoo resync : 21.12.2017

3 files changed, 2 insertions, 20 deletions

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index ea427960a347..e05923da612e 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,11 +1,10 @@
-AUX nix-1.11.14-glibc-2.26.patch 730 BLAKE2B 8c1cf99c8606553800c5d30971919e97d9d951ceaf6b3e710d32bca68db6103bbfc734eb0e9f8179c7347f929d1c67a1a6e116d71545d9de3dd8230489186789 SHA512 2caae0b32f4be3a8b535e784628d4fc878645198adaa0d5440d768dc01cd3a7e43b11323eb75244d719b2eba0256c80415dcf081cbb05dcbb8250021106e95db
 AUX nix-1.11.6-per-user.patch 554 BLAKE2B c56fcbc5154a315cdb87827a4f0aaa2991903f149608ef5168e2b26932802a9d466e41ee673ffbaf23d3ccd0292fce6a8a3d5fe91d4c4aa891cd8a750725ac17 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a
 AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6
 AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 9ea08e8edf9833354d33d8f857d0def1f062d3ae4f9baeda03802f4b8c7c99d6a07002137d6674c72eed0337b35be354af83b03a4ee5fff36d2fbb62f5647b3f SHA512 a5f39652c7fd829f11e75b1e3640a218129cac8a47c15a34b0390f51234fda45b7841e43ec6ed441803405483750ee6b82e7c3f918d22222d1e08a79e359c5dd
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-1.11.14.tar.xz 632260 BLAKE2B 5ee239aca547a8918c574dbdc6f1276dff1b66f83c89f85c23f242551a6e6784e2bdc4fcfce327395df7628148409ab13954b6eb78710325bc04c370d401ea82 SHA512 48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca SHA512 449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
-EBUILD nix-1.11.14.ebuild 3143 BLAKE2B 9c10286b24d60693a4f09917d13752362bb887e4d949ce67b5d2348f0f3ffeb097b02e2f171cddae76842834c72f936ff4cb4250be9f77cc7d7bb98e2dd84eb3 SHA512 f7921c26693cacc9c049013592f048fe4d48f2b728b5cee4db91344e4d7057dc5e66194570059ac5cfc7610678b1012bde9eb82ac18d26e78a8189cb22421dee
+DIST nix-1.11.16.tar.xz 632440 BLAKE2B 0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834 SHA512 164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
 EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
+EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
deleted file mode 100644
index 44c995e3239e..000000000000
--- a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-'context' is no more after:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
-
-'ucontext_t' is the new name.
-diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc
-index 41b617d..695aaad 100644
---- a/src/libmain/stack.cc
-+++ b/src/libmain/stack.cc
-@@ -22,5 +22,5 @@ static void sigsegvHandler(int signo, siginfo_t * info, void * ctx)
- #if defined(__x86_64__) && defined(REG_RSP)
--    sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
-+    sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP];
- #elif defined(REG_ESP)
--    sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_ESP];
-+    sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP];
- #else
diff --git a/sys-apps/nix/nix-1.11.14.ebuild b/sys-apps/nix/nix-1.11.16.ebuild
index 55f0dba8e525..d4e616516f72 100644
--- a/sys-apps/nix/nix-1.11.14.ebuild
+++ b/sys-apps/nix/nix-1.11.16.ebuild
@@ -44,7 +44,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
 	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.14-glibc-2.26.patch
 )
 
 DISABLE_AUTOFORMATTING=yes