gentoo resync : 28.04.2018

8 files changed, 54 insertions, 8 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 809a0b0e267c..71ff3378c89f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4d532411cf4a..e49699840b90 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,5 @@
 DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
-EBUILD fish-2.6.0.ebuild 2101 BLAKE2B 58ffb1a0240f07c7b84cdd09aafcde2fd5315bc089c6b0408e741e2ff692181910580c6d35b6ed7116eca4715d8908ea9283b1721b1ea6144ef397eb063e6a40 SHA512 300260bdc26e6e17ba5aa0ec8e1cb96b9669e43e83d92b98903ed79299ce6a350eb12b626ba5e6882138f2374107a2e7b9360a1012ccaf11578664f1270ced61
-EBUILD fish-2.7.1.ebuild 2168 BLAKE2B b1a3c6ab6b4a00214a09c6f5540a94c086e10faa48de4159698324450bb8caade898f6f50cad00adc476ffc9a8f0d8ac05a162728bc1fd43bd6312103f609e59 SHA512 17724fdf4d0f765d0656de5b800b7ff369cb4f3f88f173a32a503f60b3bac343bf2bb088dd4c22b78d2e10ecfe0c01056306e0220ca3ede1f6b4149690132ac7
+EBUILD fish-2.6.0.ebuild 2089 BLAKE2B 93e47993b0fbf6efad4f3a3e8bd961e9975285c7fe4b46d54d9d65646f92a3f3079cb220150b930675863a334bcb0c096c5a860d45d7de7e1d0a4ef95a9f31f8 SHA512 f4aa8a54f89a8d5bb0a41dba319f75a713ce52681ca1631b06d96e39f4b52f5f5c441ea7420a3e3ea4049e82aef7dc562bfe45955d51644b8abc6c668633fd88
+EBUILD fish-2.7.1.ebuild 2156 BLAKE2B 56438cf7613d8ce7a12d1388874c8ff5885017006e3e7224d9113b6c570ec3870e641e058e4f47514bb07f03d10b2b87e3a6fe1cf1427cf3915d1b5fa89b5fe5 SHA512 8796b05552790f937a9b62beb436bf59fd587e9f70138bba72f2fc7fb1d9890f5acf62a86c57274910e0edc1749df70c141a8b94cc5c32ed1c9902f7c8570028
 MISC metadata.xml 733 BLAKE2B 5397b2e1714a6089ff4c263025499d5231a179946a913db582309b52aff118a3a853399107da99f2469ad3fa80b1b9129a4eeaa5293b4430b0f08abbe1f48f75 SHA512 92cba131da5b8684008868f6fcecc62b91ede3ea2271ae2af5e501728b90c63a0227743d59e255ba16dc0d4ef2d8ac70b702be184db6f91ba4b335ce04be3be6
diff --git a/app-shells/fish/fish-2.6.0.ebuild b/app-shells/fish/fish-2.6.0.ebuild
index fd71035af530..2d5bbce6f54d 100644
--- a/app-shells/fish/fish-2.6.0.ebuild
+++ b/app-shells/fish/fish-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="fish is the Friendly Interactive SHell"
+DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
 SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${PV}/${P}.tar.gz"
 
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index 3c3119fb6510..d69c93f70246 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="fish is the Friendly Interactive SHell"
+DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
 SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index ef08f34e62fc..962eec434b27 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
-EBUILD quoter-3.0_p2-r1.ebuild 750 BLAKE2B c0626de44e256bc8d4814d642f2def8dd78dedede6934891cdcec5c67afc7adf2b231e731e2c1c0d6d516232bb95716e3e342d0e58b71d4b7bdacd0828e80736 SHA512 7691af51c67639c67fbde25b3f1d1771b6447429478c14f76a9d495c165ae5701efb00d9c89e0a380f1b50a2b1b4ff28bcee49d958a0cab2d42a3ae9325b07bf
+EBUILD quoter-3.0_p2-r1.ebuild 793 BLAKE2B 00cf5370c37448172e8c4ae0b1eb9850a906577ffffb6286b5697646648ce2d77d9b4d9688524d0b137e311858ce4df071dadae5dc5c7ba7be9023c81b62c15c SHA512 bc255d51e52f564a5d325d590da492c7f1bb3c154f99ca592386902adddb67b5cf2e5169300b3ea57e6fef52e0c5ed6bb4dcb543af2cb432b3cb53d871196f66
 MISC metadata.xml 696 BLAKE2B dd6a68084f8a93ba5cd9d358c260bbf93bc8515c6610ae8d73004b53b7173e47103d9189123515e607826f1b8226fe909a17442ae3c89832a21f2686ed13c8c0 SHA512 30cfae6f7af84bdde697740d3d03d27ddaaed81cd631a9fb8e2b12f11e8acb0de2680437b5679def2c8e3bb09bd69c26651e89d4f67e46b2e72e6e8274cee358
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index a5b0ed2d6f58..4c1901dae04b 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit vcs-snapshot
+inherit toolchain-funcs vcs-snapshot
 
 DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
 HOMEPAGE="https://github.com/vaeth/quoter/"
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
+
+src_configure() {
+	tc-export CC
+}
 
 src_install() {
 	emake DESTDIR="${ED}" install
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 6904180f5c62..3999d77c4f4f 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,5 +1,7 @@
 DIST thefuck-3.24.tar.gz 1360450 BLAKE2B 38a4a0484220eb92e75d164958f7a1db9d3828268a352da7a99ea79487869a39c88cdb65a315a49f71cd70a8d3ce488b1b692c241dff7329fc27c16ba33ce81f SHA512 d4949ea723cf3b080f2fbe269d0cafe3d0266089fa8cc515b3b9376b2004c045be82716cd219741a60a0e99c20575adb92339a879467f709f7ca03dcc71a5c2d
 DIST thefuck-3.25.tar.gz 1362279 BLAKE2B 52b3f1c8756b6981c0528fd77c18256957dd5d628ea37801b9c9abf6114e1cef8af53d9d1dd50fc7c88fad7bd628dc8373aa70dbc6933c07c63b7da31eb5d95a SHA512 c7b215358c09e1fa5e6aae519e7d6c3fd50027b4c72bb1c128786cd2cff707196f2b9b2a23dfed34d841874caab9463791e82c9083f6aac9c90f26d12a4d4598
+DIST thefuck-3.26.tar.gz 1365778 BLAKE2B 3266fc5a1e351df1ccd13bfb6def6254194a05a94c7bf2bdcafb9c75414fce23b479eb1ac866333e8aef7d51bc609fc00aad8508e4cf0f0d959632744330e734 SHA512 2dbcc7ba0adb24b3f7d80d0c575a4ed515508e0ab5bc2fc4eb9ba82ad36325af1784eb9c241794ce0e038ed8e99042eb21cc3b29eeaa273517aebc7205ab787f
 EBUILD thefuck-3.24.ebuild 933 BLAKE2B 64618609cb8d25f97c5b71405095930c70e60ea3294f2242a1e9a08e23a921e97df858b516fe4aa9f3c033e9559272a9e5a0310e040d51ae4eb81f72b05b582d SHA512 5c8c06a1ddc030a158a8234f4434c23748255ce8573d99e77ffe40489ed43d9a16a78aab0aa97c1cb0f4699ab4e7adaec14a361b120ca3e665e28a06ba992e65
 EBUILD thefuck-3.25.ebuild 956 BLAKE2B ff08de5123ca03f5bc19ac1e064a142d889a6f4879737dd2df8e1b30e16ab171421a94072c72d9842a0b4007c3f113d7df179af2bc2ea97c3bda95fb64852749 SHA512 0bfa52d5e7177176708a7435c3fb701022b9acefca1a72a211436748e55f2127d7613bffdc167c9083223ce47e175cfd7970bc1febb5a1fd6e74f03ec2461d34
+EBUILD thefuck-3.26.ebuild 956 BLAKE2B 6e48c054c7c811cb41f13b3504b09aae95ca1a99767d586432c31a3b55afbffdd7d23614e47656c760ebd8aa844f907244beb4dd1ee543513f5dd565d4aa4ce1 SHA512 f6fb58aa9d7fb25e16049eb6659079a2c6d786d62d381aa7b63807eebe778d1125ee0aab7bf676c722ec2fc9ced932d2f84d26d930cc79bd89afae0af5c4d911
 MISC metadata.xml 443 BLAKE2B e698b6282592adbd65ea14725b58f32ac24ae0549e6b937b26084d043bcb74204c89f409ae32af0078ac073765a69e5f585e4ad1225a01d39defc1a54ff86798 SHA512 809474eff24118e6ae74bcefac2cd653cb9aa04a06fbe59e430bc291e2fc7ee87d0463967d1c1382ea8b69853c455f680a858d837b68ea8206a66739903b1452
diff --git a/app-shells/thefuck/thefuck-3.26.ebuild b/app-shells/thefuck/thefuck-3.26.ebuild
new file mode 100644
index 000000000000..09a7b70b6e7e
--- /dev/null
+++ b/app-shells/thefuck/thefuck-3.26.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Magnificent app which corrects your previous console command"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/pyte[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die
+}