gentoo resync : 24.02.2018

5 files changed, 15 insertions, 13 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 062e18728ea2..ffee77d51581 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index ad6532279d1e..b934a41b7ee6 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -13,6 +13,6 @@ DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 DIST criu-3.7.tar.bz2 749499 BLAKE2B 41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258 SHA512 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f
 EBUILD criu-2.5-r1.ebuild 2400 BLAKE2B d69f86d8cbe441515adaa45f60f394193c4cf0d66a138762b9cf2a9e3687c2b283e293f3ddfec06606421c8c57dd4d07abf0ed9372b9a3739a25e137432551e8 SHA512 2f6511dad5b89065430ed58786c4b12f539cdf0222c655eff5c9635ab83e4fc7bee4dc2f28dd8be5423078c6fb6f00beffb20a388962aaa99f16c06475cb8610
-EBUILD criu-3.6.ebuild 2595 BLAKE2B a834b690e575a9b1cd6dc1d3d8109037cd9ef8942c6f3d4096c479201a0b9c2fe3d5e3714b2d8a4a448e377938d19dd5c3f4dd2dd3e75b810d68752a94ffc208 SHA512 464aabd062cca613fc10f6976c7a798404f3d6d79d9f9aa7d9c3d849ffa128c66404a14cb75cb8bfa5eb17595b04e62f1a6954cc35db8a4df9cc8de7e0663183
+EBUILD criu-3.6.ebuild 2594 BLAKE2B e4b3e15c80cb0824685e39bb5fb31a6faae9a03c427c5ba8371b493a9cc3e986f480219e05389a4561577d204e2923effdb5e709448908fc595eab816d1dfb41 SHA512 030924119034d78110dc6f78ef1c19d1e01f48cc42b5c3d2616dca43b295a46b90e975547ffe1eca565ef16d467a7d2112b0c39a029264aac0f218d0e39e77dc
 EBUILD criu-3.7.ebuild 2595 BLAKE2B 2d4ea71cb432008f122fc9e46c60a533e9f5fdaa4dc224834024967741a28fe348b5b19b30e8b3da411cf86a9cb9926522d5ed80c1eaa50bcac5a1ddea903901 SHA512 1fcffccf0221bade98f452dcad0c9f611336d7d365d12be07d150943d74f1154497eaee8812a30cbbfbb984be43b8acc5e95ef4d06361e3b13b4fe26b9cba901
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
index b0ed466c0a8c..857633f50459 100644
--- a/sys-process/criu/criu-3.6.ebuild
+++ b/sys-process/criu/criu-3.6.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
@@ -13,7 +13,7 @@ SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="python selinux setproctitle static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index b28cb647d276..5f5364b2be29 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,5 +1,5 @@
 AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
-AUX htop-2.1.0-sysmacros.patch 1070 BLAKE2B 66dbe1cd52dcd972a2d9a9cd927ef0fd16e77c95b9c00b6953620a02e7af32d16d3e92ee7620f7dd39c9eb465575b82817fb57ea348fa55767886aeff1a2cca6 SHA512 e84be1b866209f0eef4f62021725757c57bdad3ef99aab79c4ce3d6f48d1c6dab1189d37681f91b929c091f76311dba9aba0388b61c7253a9fa5f1e939e2df0b
+AUX htop-2.1.0-sysmacros.patch 1124 BLAKE2B 4fa3ef919eb6e814d2bab2b749edd36a805a7b3369c311cc6a4b0aae8da7b15c14aa3e3b7ff6f8b9ce9426c06942b96e31ee7e370ed6bac08f5ff8f67654aaed SHA512 08c24d7c720059b25acf6c107c53f47b1253f49fed4734af2ede1886b2f193a0fe76814b552862faea7ea11478ee3431463b8778be4240515cfb225681fb4340
 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
index 08f023b442e5..63677dd35fa9 100644
--- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch
+++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
@@ -1,28 +1,30 @@
-From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001
+From 7fd09c08b5b50e5c0a2aebb66072deda4ac503fb Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
 Date: Mon, 5 Feb 2018 16:02:19 +0100
 Subject: [PATCH] Add <sys/sysmacros.h> to two files.
 
-Future glibc releases will no longer include sysmacros implicitly.
+>=glibc-2.28 will no longer include sysmacros implicitly.
 ---
- Process.c                | 1 +
+ Process.c                | 3 +++
  linux/LinuxProcessList.c | 1 +
- 2 files changed, 2 insertions(+)
+ 2 files changed, 4 insertions(+)
 
 diff --git a/Process.c b/Process.c
-index 1836080..5122afb 100644
+index 2ff778d..e135c60 100644
 --- a/Process.c
 +++ b/Process.c
-@@ -19,6 +19,7 @@ in the source distribution for its full text.
+@@ -19,6 +19,9 @@ in the source distribution for its full text.
  #include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-+#include <sys/sysmacros.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++# include <sys/sysmacros.h>	/* for major, minor */
++#endif
  #include <unistd.h>
  #include <stdlib.h>
  #include <signal.h>
 diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 6f2631a..7522fb1 100644
+index c8ba89d..fb95440 100644
 --- a/linux/LinuxProcessList.c
 +++ b/linux/LinuxProcessList.c
 @@ -25,6 +25,7 @@ in the source distribution for its full text.
@@ -34,5 +36,5 @@ index 6f2631a..7522fb1 100644
  
  #ifdef HAVE_DELAYACCT
 -- 
-2.16.1
+2.16.2