gentoo resync : 16.01.2020

7 files changed, 47 insertions, 9 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d55b71512a14..7b2a0534f7be 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index ec6fcbb6526f..a2de6fb7342a 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -2,7 +2,7 @@ AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.1.1.ebuild 1105 BLAKE2B 810f421a527e168f2e5d7a1ad38ea2d346be92cdfb8e46915abf985eab5cd819c49c1907bc773e712c0c3c2276247dd4b09b6ed966079b514c82bf420bffd627 SHA512 86910ce3c0ba3d84115c4cac71ff30278363f154acafb853f8a287a9f4984d1b19abbb4893ed1cd2cb9f31b6124a8ec027595befb5ccf776050cee477ed331c4
-EBUILD binwalk-2.2.0.ebuild 1152 BLAKE2B 4b327f6a372cc90b57562c158f0cd008b0add282f59ce5c2101ae0740ffdb70a477a3b099fec7b1b08547e8da925ed337a05c78ca4396743ce5a5c9645ff9923 SHA512 851a849fabe3a6c9630516e5a8bbf2944f9ed053ce8d5f7f57b5af15e3329d23c91ce6a07b7d3fa4ba5e3550617dbf747f20b509c00f56dc63734e9aee4fb129
-EBUILD binwalk-9999.ebuild 1145 BLAKE2B be219cb66e1a38eecea0cb03af5d0053467a27e4ba46d23a4f4f5235cd7793c030f262a5955b06f5de0ed0fe03a4681b636c794af84a46ea9e5bf8f8d79e0b3c SHA512 dbb2411fae6747456b7268948f599ab2bf8edbbdbc1a6587816980df49746a3f2bdcb3729fd0342af0c8134cbc12a800ac0d1c53feabfde2356337acb0c71bba
+EBUILD binwalk-2.1.1.ebuild 1019 BLAKE2B fa9d822762dcabdda9ec271a7b040f546e6f85aada1ac743117a36236a513a0882e46c85fb0a79b5b1dae044ff4121ccfd07749d00ca0f93fcfc6cf935beecbc SHA512 62f213c19d46e87edc08f5e2814ca920751205e3c2a5f53ea47968e734ab9db7670ebeb2d390ec698c89112007f02831c32d0665fdaed59821751b098241f252
+EBUILD binwalk-2.2.0.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
+EBUILD binwalk-9999.ebuild 1052 BLAKE2B b1ec86c554fbd7c1689962798d1f3747723eafa62c36a2ecb5e62ae658bac6c482997591339ac9e2ddd1d91876f48adc30fc36f2d0814e9136c9d6f422fa39d1 SHA512 213abf5c656c664c1974bfa4ba5abda13b96b06be9993f78e97c97db8bb776395a451910a3a10916874b7e501726db73218620c69f16ba0b9455fa1b041cc9c9
 MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 1f95a18eceae..c69739d3e4da 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="graph"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)
 	graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
 "
 
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index 6d9a4b269905..a32600fbb9e8 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)"
 BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index c05abc9b71dc..3c01a2964970 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)"
 BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index a5de05a65205..e43419dd61a8 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -8,6 +8,7 @@ DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb5408
 DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
 DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
 DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
+DIST nnn-2.9.tar.gz 97998 BLAKE2B 4affc609e2fa6c21547c6f9b97778a4c5d6f9dcfac3d3eb8c08c76362dd18c163aec1d2a72c4450bbdab26abf9a4dd1da7e0a74bd6be8cdab87e21046270ed6b SHA512 7bc64901a317de79cb9e29502cda70b59ca681ddde53385521a08e49cbc32fa10bb76ceef2e911838c0bb7be4f5018dce4a1906e77c0ca9f1ec8164c82da7bb2
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -18,4 +19,5 @@ EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f
 EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf859db76865d07a485b57a873630dd2808c3f4185b09de196da72cde083b1a55f1992529c8aa158a04158 SHA512 52ab6fb05dc13ea1379cc75319e2fe7ca35554bb9dd0136305ac7dc3eb2c5a446563bdb054a79838601c169e3b3fc0f46b52b965d7ca5e3e82c355e36e59ed02
 EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 EBUILD nnn-2.8.1.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
+EBUILD nnn-2.9.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.9.ebuild b/app-misc/nnn/nnn-2.9.ebuild
new file mode 100644
index 000000000000..88ef20531476
--- /dev/null
+++ b/app-misc/nnn/nnn-2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}