gentoo resync : 24.12.2018

4 files changed, 10 insertions, 70 deletions

diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 9827568f7186..0b66878b9354 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,9 +1,7 @@
-DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
-DIST nnn-1.8.tar.gz 42534 BLAKE2B acf1f9e211ddf688da96c77364f8eb2d12c853fa528774f2a3f8fa146203b155df089f6a3c995f0415d5349e9bb0c519cd0776c77094a83c23ecfe45561c846d SHA512 dfa3fc20cc9d77dc6a998913d79c1f98467f9e0f475d43317fe5b3b7c85f04a8aa1508305307873115ff810f5e212272e8348af9d8bd5283f48ad76ed34cad55
 DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338bea82b64841918f41560a0b53ed49be0cf8eaec852eb1575d050197ece197fd655c2a3ba1c6cf20d57 SHA512 44eb3d569429ee27e35c0a1299e7cb248072b470b462a361eec3364163f03f577a1b28819cddfc9a85002d6ae90c61cc0633f0548c58cb154dfd8e6491c73369
 DIST nnn-2.0.tar.gz 45791 BLAKE2B dd6eb88302d39b1d5f321b3fa3a19f97c70477178f7c5678433be47fb8091ba6fa5b78f99dc2e15fb8d2c46fc012bab86b3b3ae1dd162357589e0926ed126d55 SHA512 73d6c0747461648e01b8145451a14a531002e0d005c59a3bef9d6d1a6cfc4ba7210a15879e92037af2c0e1d4c728b9c30894d7b029dedb2925634b4925ce2d72
-EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
-EBUILD nnn-1.8.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c4ca4c2b960b2bab8833b9f8f1bfafb6d2cc2257730ebe1b3a80e0a253d81f154580888517fbfc50341 SHA512 4ce20944df613706545cffb70896b9c494ed0304a591b1ffdae4886ac3783c2c1ab321b336b9873bd8b1382bc9c6ae8e0226f7abb98fb461ed64b28e1302d8f2
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
-MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
+EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
index a919cc815a67..203fa55c746f 100644
--- a/app-misc/nnn/metadata.xml
+++ b/app-misc/nnn/metadata.xml
@@ -5,7 +5,4 @@
 	<email>zlogene@gentoo.org</email>
 	<name>Mikle Kolyada</name>
 </maintainer>
-<use>
-	<flag name="fish-completion">Enable fish completion support</flag>
-</use>
 </pkgmetadata>
diff --git a/app-misc/nnn/nnn-1.8.ebuild b/app-misc/nnn/nnn-1.8.ebuild
deleted file mode 100644
index b1965355b427..000000000000
--- a/app-misc/nnn/nnn-1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-IUSE="bash-completion fish-completion zsh-completion"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-		fish-completion? ( app-shells/fish )
-		zsh-completion? ( app-shells/zsh )"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	use bash-completion &&
-		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	if use fish-completion; then
-		insinto /usr/share/fish/completions
-		doins scripts/auto-completion/fish/nnn.fish
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/auto-completion/zsh/_nnn
-	fi
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-1.6.ebuild b/app-misc/nnn/nnn-2.1.ebuild
index b1965355b427..4d054798eaa7 100644
--- a/app-misc/nnn/nnn-1.6.ebuild
+++ b/app-misc/nnn/nnn-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,10 @@ SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion fish-completion zsh-completion"
 
 DEPEND="sys-libs/ncurses:0=
 	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-		fish-completion? ( app-shells/fish )
-		zsh-completion? ( app-shells/zsh )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -30,18 +27,13 @@ src_prepare() {
 src_install() {
 	emake PREFIX="/usr" DESTDIR="${D}" install
 
-	use bash-completion &&
-		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
 
-	if use fish-completion; then
-		insinto /usr/share/fish/completions
-		doins scripts/auto-completion/fish/nnn.fish
-	fi
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/auto-completion/zsh/_nnn
-	fi
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
 
 	einstalldocs
 }