gentoo auto-resync : 08:10:2023 - 18:03:40

3 files changed, 128 insertions, 0 deletions

diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 9793b4360f2a..9f82e5373ff7 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,3 +1,6 @@
+AUX nnn-4.9_fix_colemak_patch.patch 1054 BLAKE2B 276dc125dcab2050c5376e8710565effa2a3a738d84b63d2ab53ae0f85d0044bd4b25105d81a45bc6937d1cc71b0fed30ea694a9482057e6043deaeac41d530c SHA512 90337b80babbedfd16a8e4d03d0747c43faa8a8c92e2c1dbc04d1672d7edcb4dff39a08edb049a3677312747bddf80d46d0aaf23795df295b0d8d24090368310
 DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd
+DIST nnn-4.9.tar.gz 255144 BLAKE2B 3ad257f931dee7803c44f9f4db478a8de0c898a2d8e818457aeb00dcc7936a0a1f51ce3c199a1421a014d197c7f9d2f17bccccbc985b93d78e5994b9cc707c94 SHA512 3c16ed1cbc5466b05306e38c6f5d8eb7ade9cf5ad766f9ff3bf7d20d5bfb9bdf1564527e27191e2cd85542c25245f338e1236630de3d1c8e5fbd10d54d628a14
 EBUILD nnn-4.8.ebuild 3172 BLAKE2B e08054dfbf5d37ef5f5f2893a7ff1a19a5bc85361d3355e520ccdd02b616b73effb61cc828e87fd27897eecb1e91990c78aa22beb7deed0c1aa48a77de928937 SHA512 cc5f215d7d099b03227dca7951cd23d06f6c143d01bbf02e395fc12cb978b250d83a0e43cad993a6c409f1d3dc76dddac8e5d977ccb5724faa695187aa3aa3df
+EBUILD nnn-4.9.ebuild 2899 BLAKE2B 8bfe0d8640a70681d927a531e956a228eb02148ba1b24d3794ed5203c89b26c0f7ba9e3b7a22a9fb4d9be63ba13ca80cb96edbe6b859f3db8d574b7783c28836 SHA512 29c1d723e8f0e99f2d3eccfe3d933f5c7fac036ef6f8a5987d4593fc9b65469feea4ed2633e1d4e9ff32626068786bc85693f2d9eec07043c70376a430cf1a0a
 MISC metadata.xml 1236 BLAKE2B 9afb37cabe29313f3b7203be1583fab01e067c798d5a9bb0ab5a4d5bf172d016feae30f2bf02577d390378d3292bb1f51aa4ffeeaf34c738c330bea020bbe80d SHA512 05ada5daf33b0fa8df18bca4432dea9a1dd9bfb0e74ecb4ae6d4b0860437aaf5f3850ef67283a28a4edb49fe747fb65ef9a27b829529992ed6826436530d07df
diff --git a/app-misc/nnn/files/nnn-4.9_fix_colemak_patch.patch b/app-misc/nnn/files/nnn-4.9_fix_colemak_patch.patch
new file mode 100644
index 000000000000..b4078c945753
--- /dev/null
+++ b/app-misc/nnn/files/nnn-4.9_fix_colemak_patch.patch
@@ -0,0 +1,29 @@
+diff --git a/patches/colemak/mainline.diff b/patches/colemak/mainline.diff
+index 09cdfe61..387fde0c 100644
+--- a/patches/colemak/mainline.diff
++++ b/patches/colemak/mainline.diff
+@@ -3,10 +3,10 @@
+ #
+ # Author: github.com/jacmoe
+ diff --git a/src/nnn.c b/src/nnn.c
+-index ecedee43..fdf5a80e 100644
++index 21a7370b..2ddb4053 100644
+ --- a/src/nnn.c
+ +++ b/src/nnn.c
+-@@ -5098,32 +5098,32 @@ static void show_help(const char *path)
++@@ -5109,12 +5109,12 @@ static void show_help(const char *path)
+  	"2(___n))\n"
+  	"0\n"
+  	"1NAVIGATION\n"
+@@ -23,8 +23,9 @@ index ecedee43..fdf5a80e 100644
+ +	       "9G ^N  End%20^J  Toggle auto-advance on open\n"
+  	      "8B (,)  Book(mark)%11b ^/  Select bookmark\n"
+  		"a1-4  Context%11(Sh)Tab  Cycle/new context\n"
+- 	    "62Esc ^Q  Quit%20q  Quit context\n"
+- 		 "b^G  QuitCD%18Q  Pick/err, quit\n"
++ 	    "62Esc ^Q  Quit%19^y  Next young\n"
++@@ -5122,20 +5122,20 @@ static void show_help(const char *path)
++ 		  "cq  Quit context\n"
+  	"0\n"
+  	"1FILTER & PROMPT\n"
+ -		  "c/  Filter%17^N  Toggle type-to-nav\n"
diff --git a/app-misc/nnn/nnn-4.9.ebuild b/app-misc/nnn/nnn-4.9.ebuild
new file mode 100644
index 000000000000..4819666da402
--- /dev/null
+++ b/app-misc/nnn/nnn-4.9.ebuild
@@ -0,0 +1,96 @@
+# 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 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 )"
+
+PATCHES=(
+	"${FILESDIR}/nnn-4.9_fix_colemak_patch.patch"
+)
+
+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"
+}
+
+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_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
+}