gentoo resync : 30.06.2018

6 files changed, 2 insertions, 35 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8bcddc631e3f..fa7c655bf1cb 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 88549d4123fa..d4cd2e586714 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -39,9 +39,7 @@ AUX bash-4.2-no-readline.patch 287 BLAKE2B 24d5c367440cdefc0a2e709e32867535e5dc3
 AUX bash-4.2-parallel-build.patch 4448 BLAKE2B daf719a2fac8e18403401f68f7192a595fc31ab12f968e60d690c7453559b604b6c8d9d18c6973cf12c2f66b347739eeeda36dc611a1a5f420b7f6108a2e5a2a SHA512 44690ed868ed95b7949b21a308f402af64d46873a8eb023f44e3f12381719e66b5c123c75d496ccb3d51b10b7102ae041dc41d55131ff9835757731afb9f7711
 AUX bash-4.2-read-retry.patch 932 BLAKE2B 63f61cea187aa0b228870bc764d2882c000c587e9dbbc4fcbe90b1f17536c045330b997375674e275a8bacdf227ad94af57c87c002e4a47aed63651188734cce SHA512 b8c9524a1385f8a66b964bc629ed62a1c825415e3388ac4204709440d3feedd5ffa92dd0fb54eab85283b0de49ce24a76836512b737612c0a4c45eb4ab40f8cb
 AUX bash-4.2-speed-up-read-N.patch 2858 BLAKE2B d27c211af28432bc20c2b7bc4aed6a6293218684b55548807ca40e5cf716c16a87e45d0889888a3594738737b60e9f7fa633fc06dfee3bd26bfbb0138f757711 SHA512 6b7f611ac35746c5ce8caad49def25d060397d81844c0dda2ba7c73f4b0318a28b3fb89f356695c8a7799b70ab0591d9612619403b7d4ade8aba1e60a933fdae
-AUX bash-4.3-append-process-segfault.patch 675 BLAKE2B 35a760dd9a11a44f74c9c6690aa8ae0c1ac2a17603fb69f6e9bd6ffd50d068742563039bdf0733144a1599b7d78e51a0eeacdd2134517fa1015ecdb00f9cda57 SHA512 2c243f7ca4f689decb0171ae2f5b5babf6b37f8f0988ecfbcb952a8df22dde9a543719d48b64ce45d2308340e9c601c9bd2f14f3f11bd9b9374c0f6fccaf0c7a
 AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecffd06e41b2b09ef745dcf0b8718991895d885a3484d71f52b4d6e0a680886e4cfa6faa8905f7c0290179f6f696a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867
-AUX bash-4.3-compat-lvl.patch 628 BLAKE2B 8b077871ff09cc61ab34287e57da9917170956086fb75b8fe6a49ad3d6f927a389faae15c427f593e6c1554e4f37d845b4f8bb40a0b7b557244cc2f0c7ced5d6 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
 AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
 AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
diff --git a/app-shells/bash/files/bash-4.3-append-process-segfault.patch b/app-shells/bash/files/bash-4.3-append-process-segfault.patch
deleted file mode 100644
index 6c9b2e83067a..000000000000
--- a/app-shells/bash/files/bash-4.3-append-process-segfault.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00048.html
-
-*** ../bash-4.3-patched/execute_cmd.c	2014-07-30 10:26:52.000000000 -0400
---- execute_cmd.c	2014-08-11 16:55:57.000000000 -0400
-***************
-*** 2406,2410 ****
-      {
-  #if defined (JOB_CONTROL)
-!       append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
-  #endif
-        lstdin = wait_for (lastpid);
---- 2433,2438 ----
-      {
-  #if defined (JOB_CONTROL)
-!       if (INVALID_JOB (lastpipe_jid) == 0)
-! 	append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
-  #endif
-        lstdin = wait_for (lastpid);
diff --git a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch
deleted file mode 100644
index 5734687ffeb9..000000000000
--- a/app-shells/bash/files/bash-4.3-compat-lvl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
-
---- a/builtins/shopt.def
-+++ b/builtins/shopt.def
-@@ -160,7 +160,7 @@ static struct {
-   { "compat32", &shopt_compat32, set_compatibility_level },
-   { "compat40", &shopt_compat40, set_compatibility_level },
-   { "compat41", &shopt_compat41, set_compatibility_level },
--  { "compat42", &shopt_compat41, set_compatibility_level },
-+  { "compat42", &shopt_compat42, set_compatibility_level },
- #if defined (READLINE)
-   { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
-   { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 8ffec7ee371a..9e743044cf66 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -2,5 +2,5 @@ DIST gentoo-bashcomp-20140911.tar.bz2 30258 BLAKE2B c41814a51b74b169dc0e92e4af06
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 EBUILD gentoo-bashcomp-20140911-r1.ebuild 867 BLAKE2B 2aad70a398381b631162623f63b178ab0a73b07d9aa2689e45acdf3ed3fab6e06b974e20f76c9ee20a5ee3247b6adaf1dd412957d6719149fbe4232ca32ac6e0 SHA512 d3ad74a641ece757a9431aff9d541a7178d53e6b30f79a6325548412eba958e42eea178c413e6eb80d6cecf04fb864dd0ed5622e91b20bb5e602e162ae52341b
 EBUILD gentoo-bashcomp-20140911.ebuild 740 BLAKE2B d08ffed7d83ccb43ff04a21b9e7c72eb04fdebd946d065c9d4b46117c2e7d7110fdc56163f1f18826ab8d35946c8fe075a1b8684b36f05d9da488967e212dded SHA512 7e48b33205887c87bccd740a8d61c03feaa7185148dd659d28bdb543e01f190a0e95c80064fef323209cd9b2f0b2b097e315a155bebac0cf09d264fd69f366eb
-EBUILD gentoo-bashcomp-20180302.ebuild 761 BLAKE2B 08c982bb1ca29d4932b8f0b219cab7ea4fb373fb49985f7ae43f605e1a7ada89ce177ec33c53cf52c264509db9914c01de6c25ba1fa9540cfc7aa0e4efedb41e SHA512 0b1a639774a9a04d965ade52dfb63618277bfeabf3e2c7e42272b6dae3de9022529ec22ac85dfca88c3e288477710382c9318811c3583d6fd98456b148673c31
+EBUILD gentoo-bashcomp-20180302.ebuild 754 BLAKE2B 2710c6b2625132ab96e2816ea6e0959f4b7ea9d509ab4f7fb10798d6a2977e2d503f1991c4531db61fb92ec0a93eef58aa36b4930c1e20fae79207baf0ec35ee SHA512 915c00c55a783b550a373ad9c4b3b89fc4920b80e9e47878789a10614c671847c526def6e152134a2b7b08cccbe1b0ed25c581ce07e9db1eed34cbce99b4d234
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index 0733072905ec..ce7c619fd0f5 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 src_install() {