gentoo auto-resync : 07:05:2023 - 11:36:18

6 files changed, 106 insertions, 157 deletions

diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index be8c1e0db456..e0b5a81c9860 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,9 +1,5 @@
-DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e3705e0aa45d103c151274934dc0cff66731f7b157007a81b9dbb5d9f3edb6a17daddcfb265f73b6faa400e SHA512 fde552a31674c9bf50a2e98de4456621bdc97aee36cd5efd7ad0cc33959965d01469fb20b12868ebffd4c8da79990b502e26895cb5b047ac8821e2ca09b0a234
-DIST nnn-4.3.tar.gz 236606 BLAKE2B cec0a73a40fae76e478c3299e2ae8a613c2e1b16e009d4f69cc3c9c9f6ea5df4048fc7f941ae6369293cf56df9b91a496531f4b34bf05f1dbbf8fab9120ffe78 SHA512 588af174d86db14acf5d1e2ac42f88ca5c6f0e105996a58771e7e0f989f224616e7a12d74fecc96540a9782db0cf8857c21bf0f50df4ee3b4b5c641291c64575
-DIST nnn-4.5.tar.gz 242191 BLAKE2B 2a1564520222bc51df64c495ffa7a22fc3200f4572281e4b4e998e999b41c171f4b832502a054741040fa9d87d0da0d0d23949c0d867fc4c2830722045654c3d SHA512 ab64f0e6211b14e90a4632bb0da9a1214635c9a06718c7c434d344d69d1087b4d5d978d44f38c1b03bb555e3055ca5033bcbca40927135757a468e6f1b99046e
 DIST nnn-4.7.tar.gz 250038 BLAKE2B b63da6ac8a0ac6b8b2bce0ed45c43c9e707f11f99e6b456131728d7fde5f638162d8e3bbf1b3a0fadba315d38d9cc1b38c0d4a644ee800fbea00ffe1c92beef0 SHA512 28ec9b9ab93f979d77e80957df2a70ec687e56ada6d5e8555c121f2454b5c049466120e5eb3570174411a61e3855c869f96d306a43516cceff8c4cb7f1075875
-EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
-EBUILD nnn-4.3.ebuild 1050 BLAKE2B f4c3accb8482ebec73a9af0768c20208866f527d4262e8a9127d03b1be42175dfb542ffdb1fc7e67908a57c700912532912029f332562cdc676bb1554d401a4d SHA512 db2c9a11d2a7e6d1fcdbf30e1aa948f180ab48b61d68cfc76f2ae6841b5c44953083fed8dfed7f53fb5c1a709e7f28ec732f7ce4e2b228480c16151c7ca8ac1b
-EBUILD nnn-4.5.ebuild 1142 BLAKE2B dcb84476bba7d2a15e85ecde4b8690c8044c6166f5d492c2a735994fba8a345f6ad8bcbce0cc666139e9ab89655bf5a131f50b4ff74410c58dcf98e1fc50c60b SHA512 7fe598b02ee9188472aecfc3ff8ff896d9354cc57c563f17a7f8b77244d65ed7886d334a63c81c3c5ff22334eafdc3dc515d789d365e5cc7d386d7331a4f83b7
+DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd
 EBUILD nnn-4.7-r1.ebuild 2839 BLAKE2B e91f853480152bccc19d53d9fad6f50ada4f19e16f9c5f5fa823dd90a2bc68ec030a8ce414f1f4a94d3e3db51f7ba25f0f02a967ce89affe9e21cf4d88893977 SHA512 cadf7e87fa3eadb497f608eb29c6d746a956bffc8858091b0212edaf1195ff77df214e5e529c67ce46b12c2273cd4f44cc097b10f17330311d8a6161a68cca82
-MISC metadata.xml 1162 BLAKE2B e3130bf6de99cf4df56a94ce0c0ab6461e256ad06ff0a46aedd44ee5c6bd00f34cb6b38436d07cf43cc4220e11e9542471e8b0bdbf07c3070cebfa7b01ab44e5 SHA512 c9523bc04ced90d835c4e38a6e8991bd4b34a5e379ee9f0f76ead714231e39c6ed7c41c7d81a2f55c4f4308dead7ba72267baffa80d0da0f43c3f081d727d1f5
+EBUILD nnn-4.8.ebuild 3173 BLAKE2B 907ee9f572cc43695c7e238fbd2872090e6e162f796dfad366537f8f95aefae909bb07876d4e2f3ba5e2eeb22a86a6ccc0ec07ff3d9c1f14d929c6089d4e844d SHA512 0e64c01eed43245ea98cf762d97d08da848f361bd7b38c49f026cdfd4ebc4157159e4e14d36c2ed0c2002b26961f50ef08c95ec7c7e9037e841e52376e23b42a
+MISC metadata.xml 1236 BLAKE2B 9afb37cabe29313f3b7203be1583fab01e067c798d5a9bb0ab5a4d5bf172d016feae30f2bf02577d390378d3292bb1f51aa4ffeeaf34c738c330bea020bbe80d SHA512 05ada5daf33b0fa8df18bca4432dea9a1dd9bfb0e74ecb4ae6d4b0860437aaf5f3850ef67283a28a4edb49fe747fb65ef9a27b829529992ed6826436530d07df
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
index 780adc28a98f..74ffd32d3078 100644
--- a/app-misc/nnn/metadata.xml
+++ b/app-misc/nnn/metadata.xml
@@ -14,13 +14,14 @@
 	</upstream>
 	<use>
 		<flag name="8contexts">Enable 8 contexts (instead of 4)</flag>
-		<flag name="qsort">Use Alexey Tourbin's quick sort implementation</flag>
-		<flag name="icons">Display icons using icons-in-terminal</flag>
-		<flag name="nerdfonts">Display icons using nerdfonts icons</flag>
+		<flag name="colemak">Key bindings for Colemak keyboard layout</flag>
+		<flag name="colemak-dh">Key bindings for Colemak-DH keyboard layout</flag>
 		<flag name="emoji">Display icons using emoji</flag>
-		<flag name="colemak">Key bindings for Colemak-DH keyboard layout</flag>
 		<flag name="gitstatus">Add git status column to the detail view</flag>
+		<flag name="icons">Display icons using icons-in-terminal</flag>
 		<flag name="namefirst">Print filenames first in the detail view</flag>
+		<flag name="nerdfonts">Display icons using nerdfonts icons</flag>
+		<flag name="qsort">Use Alexey Tourbin's quick sort implementation</flag>
 		<flag name="restorepreview">Add pipe to close and restore preview-tui for internal undetached edits</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/nnn/nnn-4.0.ebuild b/app-misc/nnn/nnn-4.0.ebuild
deleted file mode 100644
index 0bd65a6f5bf1..000000000000
--- a/app-misc/nnn/nnn-4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs xdg-utils
-
-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 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
-
-	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
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-misc/nnn/nnn-4.3.ebuild b/app-misc/nnn/nnn-4.3.ebuild
deleted file mode 100644
index 866305d8ebab..000000000000
--- a/app-misc/nnn/nnn-4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs xdg-utils
-
-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 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
-
-	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
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-misc/nnn/nnn-4.5.ebuild b/app-misc/nnn/nnn-4.5.ebuild
deleted file mode 100644
index dbb2eb13d5a1..000000000000
--- a/app-misc/nnn/nnn-4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 flag-o-matic toolchain-funcs xdg-utils
-
-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 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:=
-	sys-libs/readline:=
-	elibc_musl? ( sys-libs/fts-standalone )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	use elibc_musl && append-flags "-lfts"
-	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
-
-	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
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-misc/nnn/nnn-4.8.ebuild b/app-misc/nnn/nnn-4.8.ebuild
new file mode 100644
index 000000000000..3666ef82e251
--- /dev/null
+++ b/app-misc/nnn/nnn-4.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs xdg
+
+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 ~ppc64 ~x86"
+IUSE="8contexts colemak colemak-dh emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview"
+
+DEPEND="sys-libs/ncurses:=
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	elibc_musl? ( sys-libs/fts-standalone )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="?? ( icons nerdfonts emoji )
+	?? ( colemak colemak-dh )"
+
+src_prepare() {
+	default
+	tc-export CC
+	use elibc_musl && append-flags "-lfts"
+	# When using nnn's bundled patches, the 'install' target should not depend
+	# on 'all'. See: https://github.com/jarun/nnn/issues/1493
+	sed -i -e 's/install: all/install:/' Makefile || die "sed failed"
+	# The Makefile uses O_COLEMAK-DH to control the Colemak-DH patch, but that
+	# does not work with the array approach to make options below. Hence, we
+	# simply rename it to O_COLEMAK_DH.
+	sed -i -e 's/O_COLEMAK-DH/O_COLEMAK_DH/' Makefile || die "sed failed"
+}
+
+src_compile() {
+	nnn_opts=(
+		O_NORL=$(usex readline 0 1)
+		O_PCRE=$(usex pcre 1 0)
+		O_CTX8=$(usex 8contexts 1 0)
+		O_ICONS=$(usex icons 1 0)
+		O_NERD=$(usex nerdfonts 1 0)
+		O_EMOJI=$(usex emoji 1 0)
+		O_QSORT=$(usex qsort 1 0)
+		# nnn's user-submitted patches
+		O_COLEMAK=$(usex colemak 1 0)
+		O_COLEMAK_DH=$(usex colemak-dh 1 0)
+		O_GITSTATUS=$(usex gitstatus 1 0)
+		O_NAMEFIRST=$(usex namefirst 1 0)
+		O_RESTOREPREVIEW=$(usex restorepreview 1 0)
+	)
+	emake "${nnn_opts[@]}"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
+
+	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
+
+	insinto /usr/share/nnn
+	insopts -m0755
+	doins -r plugins
+	fperms 0644 /usr/share/nnn/plugins/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "nnn plugins are installed to /usr/share/nnn/plugins/, but nnn does not"
+	elog "load them fom this directory. You will need to copy/symlink them to"
+	elog "~/.config/nnn/plugins/ if you want to use them."
+	elog "Note that some plugins have runtime dependencies that may need to be installed."
+	elog "Refer to the individual plugin's in-file documentation for more information."
+
+	if use icons; then
+		elog "In order for file icons to work, your terminal needs to use icons-in-terminal."
+		elog "See https://github.com/sebastiencs/icons-in-terminal"
+	elif use nerdfonts; then
+		elog "In order for file icons to work, your terminal needs to use a patched nerdfont."
+		elog "See https://www.nerdfonts.com/"
+	elif use emoji; then
+		elog "In order for file icons to work, your terminal needs to use a font that"
+		elog "includes standard unicode emoji."
+	fi
+}