gentoo resync : 18.05.2019

11 files changed, 9 insertions, 44 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ea988b0ed57a..8a62c58858ea 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 3a3278b5663d..47de2f09df19 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2419 BLAKE2B b94dbcf8431311f50ec2b49ab8ad62e8af3519262b2518d4b72a0074e837b38bf3aea6e93655d7b60ccbb09ef2abbbab946ba5012337c15de73a3c7d910295a8 SHA512 d818578a42171939d35ecd9dadbe875bbf93427e662783fb6bfb3033f17ab3298df58999f4e71e4ec8af666c7388fbc6bd694af119c0d1532c78ff5de1286b41
-EBUILD fish-3.0.2.ebuild 1691 BLAKE2B 16609403cc4902946841384b4c94fc54aaffbd5c30020aa6b9d16d141b4884c41a0e8fe743e7616031fd09db1096bc08a1458ce8ac6bfdf823a9b2fe7bd4ba8c SHA512 7d5b14ff707b72a5e5eb287b3a867e78cde669711a63b7f60f19a9e18f29983ad4da5eac621ef8f3192f47c8cce88974b5d4f84a95dd23e6d3073bfb7846b697
+EBUILD fish-3.0.2.ebuild 1688 BLAKE2B 7556f844fa2a8de576c62344217c3f9a90b05ef997de76fd508d8b200f65ac5c70d9b4491407d26b36e18eb52c28f2d66fd12bde366475b86c056d8cedab8a37 SHA512 5d460c55cb77947d88f41c148219d355fb3a68f2f415d780a57e1caac47088ad2d0703697c80666ea083ed936a654976a7a929bc4594ec581253954a7f9bf8cc
 EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 8cc9571025c2..2471ccf4e34c 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 4f32e67062ab..554cdfba8d45 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 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
+EBUILD fzy-1.0.ebuild 1106 BLAKE2B 1f0179714b3af6e3dc8a63ee7218dad7ed64c58fe6af36b220e76b4ebdde12a2eb6054a31dfd6e9c05e8cd8bb0d66e0e306b5790b1178a2f9f70b3cd8fe0a95b SHA512 760cc0f8fe001338456db87738d98439702d98eefadd4d1889c94e3a1229f11f2708795ab416adbc3510fe2ff3f71fa91fe2f413afd1870f410232978c0e1aef
 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 a3c83e613fea..6b16195b960e 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 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 7eb3a517e622..1b05d1216da0 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,4 @@
-AUX hstr-1.23-tinfo.patch 481 BLAKE2B 3279671caf216d810c3fef490c5ae219906e59430dc15a850118bbafe49140f46fb1645be1c0a8a8977c795af018164027f928d4fcb0a664186c97f2b968edfb SHA512 64c1e0a5b2ee28354f85563472dd301a9e45eb568fe74c0d601765ee25095650320b8f853c95280f294f323eec6b7f9a155c2a09a5fde2e52568d2c9809c1e91
+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 636 BLAKE2B 4a85942441e64790304b6e1fc4266065cc2d58d3138a00b7e405fa06184f2c587fb5b75af8f7b4dd42421d4b3d743ad50364c09c505fcbecd331348fcb4217f3 SHA512 f68e70872e5f53190c5325f8eb0fa1a32e12ed06f4953a0ea9238c2d5844c23a4147bb504c4b3261fc066975128da58beea06a51423993abbedb47c6c6d37f8b
+EBUILD hstr-2.0.ebuild 645 BLAKE2B d7ba8cf429e90e51958e0ecb090ceb4c0f7d4d134c6329c54bf3481cc66c1e1ebd171a974ff21bf643a3d5589ecbfda046bfa4d66e5d3d12d6d795acf398b07a SHA512 90c3ee1690c60cdd76de5a51ffa0e8863f107ade1450c2a3eb1fc66581cb581fe6f0592e2ec6653d2ded7fd2a9e7b95664b719f799431af4aae615c8af5448a5
 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
index 85a4743c0e94..fd4eb414b12b 100644
--- a/app-shells/hstr/files/hstr-1.23-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.23-tinfo.patch
@@ -5,7 +5,7 @@
  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(keypad, tinfo, [], [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 69a54df0bce8..887a5f6d55af 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 KEYWORDS="amd64 x86 ~amd64-fbsd"
 
 RDEPEND="
-	sys-libs/ncurses:0="
+	sys-libs/ncurses:0=[unicode]"
 
 DEPEND="
 	${RDEPEND}
diff --git a/app-shells/rust-zshcomp/Manifest b/app-shells/rust-zshcomp/Manifest
deleted file mode 100644
index 810c51d3e311..000000000000
--- a/app-shells/rust-zshcomp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rust-zshcomp-1_beta20150411.tar.gz 4738 BLAKE2B 40b3f89d56df2924484ef6809c349a96221837effe8f8755d9dbe9be05189bf5c7865c72c64c45f0e943c61817a20be45211ad9dc286b46b5a1d4a3f2eee61c7 SHA512 84231fba6abdc1117f05be16b32a641e2a2334873be28185f4b748bdc1cf664f70e3e5a761d9cc25a879bd7df4fb8f8fddb3114be355d8b91e3c2a0f49739f3c
-EBUILD rust-zshcomp-1_beta20150411.ebuild 480 BLAKE2B ea9aa2d8ef2f759c40a1c80bf8c1b0e6968ef6b289ae7799ea0feeb4d84631a06c39807caf65174a8b5887243b4f8372e49fb07dd35834dfde7f0ed2cfe0d500 SHA512 1637066417e0142ecd1098ee251bd7ff57da3284d8dd7985c4939bf7c8a12f02e88e493c4ca76d3d1bbbfe22ddae49b613fb6cef62c80c257ceaaed22c362120
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-shells/rust-zshcomp/metadata.xml b/app-shells/rust-zshcomp/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-shells/rust-zshcomp/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-shells/rust-zshcomp/rust-zshcomp-1_beta20150411.ebuild b/app-shells/rust-zshcomp/rust-zshcomp-1_beta20150411.ebuild
deleted file mode 100644
index 0df592ce2541..000000000000
--- a/app-shells/rust-zshcomp/rust-zshcomp-1_beta20150411.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Rust zsh completions"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-shells/zsh"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins _rust
-}