gentoo resync : 18.08.2019

6 files changed, 12 insertions, 90 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7626d247cd6e..212ceb6a0558 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 00c4280cf737..fa0ed586c65e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -49,7 +49,6 @@ AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd
 AUX bash-5.0-assignment-preceding-builtin.patch 2790 BLAKE2B fbafa51f96f1fef538e56e55ab3b7067ac4532ab8c0f93d151eeaf6b3a521bc15d7d4ae580489352cc6d9ecc5b43b96494c8b661cf2db3b97265bd1dffad5390 SHA512 9a4ec56b341ed90f348c3ca5ec5c98790eb98a7d78d436131a56bcdde49f09f618398e87c81da7c1dde645690d9c779578f5a2b37dadda75c587332715ab1732
 AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
 AUX bash-5.0-history-zero-length.patch 1704 BLAKE2B e94683d245b233b95db8e67a2e536081816ce7d095080b17ee3a9ecef1d3a9094e09e8929eeed5aeff89cd268b49a9ca0cf5cba8aab0695914e88be1b724056c SHA512 2f21c7938c585d0126456b1d878e60d7ddef6a6188f49325cf1f15ab2f7f490ce8458504da8a08cf4b00c84a48f9f43079ff6ee334120d29c1529219d9e9074d
-AUX bash-5.0-optimize-connection-fork.patch 2853 BLAKE2B 88d7d1a73d891b5ba2792c631a654fa8f67e4af11f2899bbebeca835f2a78f27f5ae1b5ce0a53825703b17b1d2e3e38297d97622fab5b0789653d07b0ec686fc SHA512 9192bf50d201d325561552cc6725c2c5e8984bee9fd762089ebe45bfd013fe7a560769b1282189bc97500ea5e49de313d59ddefad544affce61f78a2d605a997
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
@@ -373,6 +372,8 @@ DIST bash50-004 1664 BLAKE2B 88b44a5268c8ec970f0c18997cfe5211f6a2a8c07f813d48fd9
 DIST bash50-005 3732 BLAKE2B 3ded5d200102ad7cc547c6f7e9bf9bba468a10791fc096988c49f46ea8d6708efb0d4c383a9e2e2fccef8a49b217e6a22d9435c807233a1d0a971265bbe31761 SHA512 4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da
 DIST bash50-006 1275 BLAKE2B ae3738874ada015202a6ff21a50ea9370c6147b4c74a23112e755396fc1db743afa42abdd4df635f0c0b9f3536796064b41d0667ef8ade1543b5c70b688ae9d1 SHA512 71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0
 DIST bash50-007 1640 BLAKE2B 1c25af8c098322ad16353dfb32cdba2613659f5042792c725dbde7b2bc276ff09a4af44bf223fd6114dcc9beee98ccbd8081d3010fa1cfeb33bc93fc9c81e4f7 SHA512 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8
+DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d5fdfc03f229ec2e98324707b10fa3aa5b3fee0e8fe5328a684cdd1b3ee5567cd1eb127a4060cb SHA512 110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4
+DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
 EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
 EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
 EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@@ -382,6 +383,6 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
 EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
 EBUILD bash-4.4_p23-r1.ebuild 7389 BLAKE2B cffb239c13ab880e815dc9e5884020f2287cdbb3074e39862223fc3d3d56d64af121f4f04528e7e94b06df4fe4d520c805cf6a8f32088860cd7c4ffa2e612e2e SHA512 d9f730ce6353e99953eb95e1417d5e109ccf3612d5148087c2eab7c742d6cba979da5468ec260f3d258a9870a3b6b216dd45c67b2a79fa6fe818d6ba88a113c0
-EBUILD bash-5.0_p3-r1.ebuild 7625 BLAKE2B 81f6b4b55c5d8f6c311469d4e06f8a729f7ab8ba892cf21d8e5befefc9d12bb39ec339b3751cc720e42a83d982e988b76878b07f37f9f71f14ee137ccbefe55c SHA512 230b6db992527d721eaf0b328cba6232548038b070c6ee40f8fb811f390927ce5dc1c171f9203e0c6113cc1ed7762384dbc6d8ddd159856108b3be75b595a383
 EBUILD bash-5.0_p7.ebuild 7569 BLAKE2B ec03c5db2337f5bd9279f1717b791f850ac027320f602df801197ac831de3018552bc8e3eb5fb9b2634e9ead091e62c6a65315e4a9e58a3dd2d3ba2ad2e08482 SHA512 828d1606b9227bd0faedfce0f83d5bfa3585ccbb52dba5fffcfbdf5c5cdd27a10d25a53e9b86adb10246a2ba6cbe95aed453b59fb3dcfe01ce56558c1a1332a5
+EBUILD bash-5.0_p9.ebuild 7522 BLAKE2B 8ec9456f0040cd7a869c486e3abed668cf0dcca6a1e5911c9b771b1ac69fb52168be4daa1ba28598329db8bedf25a600ed34d34770c702521486e8a419a2012b SHA512 96b77e64e3e7677947ac76503de702a624017b513fd8351cf8ef2969c203a1d79cc09c0557b6b5e217bbe026112ef79564eed8a80e6df7e72e58a3c99df8af6f
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p3-r1.ebuild b/app-shells/bash/bash-5.0_p9.ebuild
index a13f1c8965c2..1ead66883b4e 100644
--- a/app-shells/bash/bash-5.0_p3-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs multilib prefix
 
@@ -52,7 +52,6 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 DEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
 	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-	nls? ( virtual/libintl )
 "
 RDEPEND="
 	${DEPEND}
@@ -60,14 +59,15 @@ RDEPEND="
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
+BDEPEND="
+	nls? ( virtual/libintl )
+"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-zero-length.patch
 	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-optimize-connection-fork.patch
 	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 	"${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch
 )
@@ -190,7 +190,7 @@ src_install() {
 	default
 
 	dodir /bin
-	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
@@ -214,8 +214,8 @@ src_install() {
 	fi
 	sed -i \
 		"${sed_args[@]}" \
-		"${ED%/}"/etc/skel/.bashrc \
-		"${ED%/}"/etc/bash/bashrc || die
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
 
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash
diff --git a/app-shells/bash/files/bash-5.0-optimize-connection-fork.patch b/app-shells/bash/files/bash-5.0-optimize-connection-fork.patch
deleted file mode 100644
index 3c6561bb1268..000000000000
--- a/app-shells/bash/files/bash-5.0-optimize-connection-fork.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-*** ../bash-5.0-patched/command.h	2018-07-20 21:16:31.000000000 -0400
---- command.h	2019-02-20 11:09:36.000000000 -0500
-***************
-*** 187,190 ****
---- 188,192 ----
-  #define CMD_LASTPIPE	    0x2000
-  #define CMD_STDPATH	    0x4000	/* use standard path for command lookup */
-+ #define CMD_TRY_OPTIMIZING  0x8000	/* try to optimize this simple command */
-  
-  /* What a command looks like. */
-*** ../bash-5.0-patched/builtins/evalstring.c	2018-12-26 11:19:21.000000000 -0500
---- builtins/evalstring.c	2019-01-29 14:15:19.000000000 -0500
-***************
-*** 101,104 ****
---- 101,113 ----
-  }
-  
-+ int
-+ can_optimize_connection (command)
-+      COMMAND *command;
-+ {
-+   return (*bash_input.location.string == '\0' &&
-+ 	  (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
-+ 	  command->value.Connection->second->type == cm_simple);
-+ }
-+ 
-  void
-  optimize_fork (command)
-***************
-*** 106,110 ****
-  {
-    if (command->type == cm_connection &&
-!       (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) &&
-        should_suppress_fork (command->value.Connection->second))
-      {
---- 115,120 ----
-  {
-    if (command->type == cm_connection &&
-!       (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
-!       (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) &&
-        should_suppress_fork (command->value.Connection->second))
-      {
-***************
-*** 413,418 ****
-  		  command->value.Simple->flags |= CMD_NO_FORK;
-  		}
-! 	      else if (command->type == cm_connection)
-! 		optimize_fork (command);
-  #endif /* ONESHOT */
-  
---- 423,438 ----
-  		  command->value.Simple->flags |= CMD_NO_FORK;
-  		}
-! 
-! 	      /* Can't optimize forks out here execept for simple commands.
-! 		 This knows that the parser sets up commands as left-side heavy
-! 		 (&& and || are left-associative) and after the single parse,
-! 		 if we are at the end of the command string, the last in a
-! 		 series of connection commands is
-! 		 command->value.Connection->second. */
-! 	      else if (command->type == cm_connection && can_optimize_connection (command))
-! 		{
-! 		  command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING;
-! 		  command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING;
-! 		}
-  #endif /* ONESHOT */
-  
-*** ../bash-5.0-patched/execute_cmd.c	2018-12-05 09:05:14.000000000 -0500
---- execute_cmd.c	2019-01-25 15:59:00.000000000 -0500
-***************
-*** 2768,2771 ****
---- 2768,2773 ----
-  	   (exec_result != EXECUTION_SUCCESS)))
-  	{
-+ 	  optimize_fork (command);
-+ 
-  	  second = command->value.Connection->second;
-  	  if (ignore_return && second)
-
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 554cdfba8d45..7b46ffd377a1 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,5 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1106 BLAKE2B 1f0179714b3af6e3dc8a63ee7218dad7ed64c58fe6af36b220e76b4ebdde12a2eb6054a31dfd6e9c05e8cd8bb0d66e0e306b5790b1178a2f9f70b3cd8fe0a95b SHA512 760cc0f8fe001338456db87738d98439702d98eefadd4d1889c94e3a1229f11f2708795ab416adbc3510fe2ff3f71fa91fe2f413afd1870f410232978c0e1aef
+EBUILD fzy-1.0.ebuild 1113 BLAKE2B c5d8df73779d272cc8da1a49f5ad747b6f872ae815543cdb9d865029e84fffac4646556b2d457f282e6c10cbafb19888e0a3c5801baf20113ea04006b36774d3 SHA512 802b8edba43561e917c0fba3fad33bd53d2ac53eb95659ba7f6788a17355702e95a3867148f61fc501298168c3bcfbe132a6a3811e0512625098df465a2a3fcb
 EBUILD fzy-9999.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index 6b16195b960e..29f85a6e78c9 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"