gentoo resync : 08.06.2019

6 files changed, 3 insertions, 16 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 86dee11916c7..5e899f747a76 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 71aa438e7f58..63aedf81df62 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -7,6 +7,6 @@ DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
 EBUILD bash-completion-2.9-r1.ebuild 4816 BLAKE2B fb10aa20dcace7020a209d479aa2346bdbddb28eb73f3d7a7aeda1cbd02820b8e2ddbc63ecc46f7ea255aa1a442a4341ab4416a1b566fe99657827f3f1adeaa0 SHA512 62f99d0f540441b5e14c26de777e0c41b40c1bb8eb03faf194d93ffcd3923b0adf573512a2056544e44a798f9645b7cf30c6dc870ce6a8774aaea66e710fdf6d
-EBUILD bash-completion-2.9.ebuild 4699 BLAKE2B 9bb3a90bee16acb270a76a669e710c1c6095d07bb89803ff51668cf37e60809b31f58ba22c2d15b772292b3cfbddaaadcfdf843a8f503b772f7c5c7685607d98 SHA512 330b4679a4e98c39d14f25c02a25626fd216c65cce2fbc80b6dac894837e87028e448730f2bfdf63397349ec7525fcf3b96e6f67ccab47295cae271b95d3a299
+EBUILD bash-completion-2.9.ebuild 4696 BLAKE2B e7ee1e84ed91c7b7d55c620a08707d0cdff75800646a44c2d36128d18d048e74dd1d4cd76981ce95bcde2a49136e875d85d64f110a09ea6a3b749341c864cd6d SHA512 c6ef72a37401ad5f2568207062c0f6e85ca60d6ffa9c6050d5f4f7e17f2ec00bc5ee6881d4359e2fd40345ee75a9370484207eeb86a12b23e96c3fe60952d5d9
 EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
index 0046eb1249db..cad1bcb1c066 100644
--- a/app-shells/bash-completion/bash-completion-2.9.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 1b05d1216da0..bdbbc7f1cb4d 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,3 @@
-AUX hstr-1.23-tinfo.patch 482 BLAKE2B 39983f9f9796aab2134e6a82a602df83173ffd83f5036cb53be5277a8856e70e63df423eea5d99446947adbd9215d085f96bac154565a215bb85a585f12065c8 SHA512 98382b7f99a398347e2e00d01ad06663d26be46533428e02920c7be3fa1fe25871c07858b4207b3cbc72ff3c840b07e64b3b681c7aec1ebc18f37828da07594d
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
-EBUILD hstr-2.0.ebuild 645 BLAKE2B d7ba8cf429e90e51958e0ecb090ceb4c0f7d4d134c6329c54bf3481cc66c1e1ebd171a974ff21bf643a3d5589ecbfda046bfa4d66e5d3d12d6d795acf398b07a SHA512 90c3ee1690c60cdd76de5a51ffa0e8863f107ade1450c2a3eb1fc66581cb581fe6f0592e2ec6653d2ded7fd2a9e7b95664b719f799431af4aae615c8af5448a5
+EBUILD hstr-2.0.ebuild 596 BLAKE2B dcd36d416a1ff7750e5f387ff9091fa3cc862555ecb7bf19823176dd8552a6aba6540e661b9f0e8309b7aab9d7109ef1f689e1c65297b5116a264801fdeac072 SHA512 fe8b9608e569f0790ef9a3f0f9524c3a675f779252e9764e368f4566251e94813978da81dc881c7d7fc0e1f3ebb7c34163fe872aa89aac6b34a80ca5cd99005e
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-1.23-tinfo.patch b/app-shells/hstr/files/hstr-1.23-tinfo.patch
deleted file mode 100644
index fd4eb414b12b..000000000000
--- a/app-shells/hstr/files/hstr-1.23-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@
- AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
- AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
- # ncurses might be linked in libtinfo
--#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
-+AC_SEARCH_LIBS(tinfow, tinfo, [], [AC_MSG_ERROR([Could not find tinfow library])])
- 
- # Checks for header files.
- AC_CHECK_HEADER(assert.h)
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 887a5f6d55af..0f78fdf6d9a8 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -21,7 +21,6 @@ DEPEND="
 	virtual/pkgconfig"
 
 DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
 
 src_prepare() {
 	default