[gentoo-commits] repo/gentoo:master commit in: app-misc/nnn/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/nnn/
Date: Sun,  7 May 2023 07:05:06 +0000 (UTC)	[thread overview]
Message-ID: <1683443101.aa59b76d630b32cfba3a15249f59dfaa162f7ab9.juippis@gentoo> (raw)

commit:     aa59b76d630b32cfba3a15249f59dfaa162f7ab9
Author:     Sebastian Hamann <code <AT> ares-macrotechnology <DOT> com>
AuthorDate: Sat Apr 15 07:57:38 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May  7 07:05:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa59b76d

app-misc/nnn: add 4.8

Due to upstream changes (https://github.com/jarun/nnn/issues/1584), the
USE flag colemak was renamed to colemak-dh and a new USE flag colemak
was introduced. These USE flags follow upstream patch/option naming.
colemak and colemak-dh are mutually exclusive USE flags, since both
patch the key bindings of nnn in (slightly) different ways.

Signed-off-by: Sebastian Hamann <code <AT> ares-macrotechnology.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-misc/nnn/Manifest       |  1 +
 app-misc/nnn/metadata.xml   |  3 +-
 app-misc/nnn/nnn-4.8.ebuild | 97 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 4679837bc719..36b518d334bd 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -2,3 +2,4 @@ DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e370
 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
+DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd

diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
index 780adc28a98f..af3b28f22e09 100644
--- a/app-misc/nnn/metadata.xml
+++ b/app-misc/nnn/metadata.xml
@@ -18,7 +18,8 @@
 		<flag name="icons">Display icons using icons-in-terminal</flag>
 		<flag name="nerdfonts">Display icons using nerdfonts icons</flag>
 		<flag name="emoji">Display icons using emoji</flag>
-		<flag name="colemak">Key bindings for Colemak-DH keyboard layout</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="gitstatus">Add git status column to the detail view</flag>
 		<flag name="namefirst">Print filenames first in the detail view</flag>
 		<flag name="restorepreview">Add pipe to close and restore preview-tui for internal undetached edits</flag>

diff --git a/app-misc/nnn/nnn-4.8.ebuild b/app-misc/nnn/nnn-4.8.ebuild
new file mode 100644
index 000000000000..7ce3a7c08a36
--- /dev/null
+++ b/app-misc/nnn/nnn-4.8.ebuild
@@ -0,0 +1,97 @@
+# 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="+readline pcre 8contexts icons nerdfonts emoji qsort colemak colemak-dh gitstatus namefirst 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
+}

next             reply	other threads:[~2023-05-07  7:05 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-07  7:05 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-03 21:20 [gentoo-commits] repo/gentoo:master commit in: app-misc/nnn/ Sam James
2024-12-01 17:35 Jakov Smolić
2024-10-17  7:30 Joonas Niilola
2024-04-02  5:55 Arthur Zamarin
2024-04-01 13:50 Arthur Zamarin
2024-04-01 13:50 Arthur Zamarin
2023-08-25 17:11 Arthur Zamarin
2023-08-01  6:46 Sam James
2023-05-07  7:05 Joonas Niilola
2023-05-07  7:05 Joonas Niilola
2023-05-07  7:05 Joonas Niilola
2023-02-25  9:11 Joonas Niilola
2023-02-05  8:30 Joonas Niilola
2023-02-05  8:30 Joonas Niilola
2023-02-01  6:16 Joonas Niilola
2023-02-01  6:16 Joonas Niilola
2022-06-24  3:43 Sam James
2022-06-24  3:43 Sam James
2022-05-06 19:02 Mikle Kolyada
2021-11-20 14:12 Mikle Kolyada
2021-04-22 21:15 Sam James
2021-04-15 19:18 Mikle Kolyada
2021-04-15 19:14 Mikle Kolyada
2021-03-18 10:20 Mikle Kolyada
2020-11-19  7:51 Mikle Kolyada
2020-10-03  5:21 Georgy Yakovlev
2020-08-20  7:36 Mikle Kolyada
2020-07-24 13:59 Mikle Kolyada
2020-05-28 15:45 Mikle Kolyada
2020-04-15 16:01 Mikle Kolyada
2020-02-23 11:53 Mikle Kolyada
2020-01-16  9:31 Mikle Kolyada
2019-12-13  8:38 Mikle Kolyada
2019-10-12  7:04 Mikle Kolyada
2019-08-07  8:34 Mikle Kolyada
2019-07-25 10:31 Mikle Kolyada
2019-03-28  6:48 Mikle Kolyada
2019-02-22  9:03 Mikle Kolyada
2019-01-05 12:30 Mikle Kolyada
2018-11-24  8:41 Mikle Kolyada
2018-11-24  8:41 Mikle Kolyada
2018-10-25 17:45 Mikle Kolyada
2018-08-15  5:49 Mikle Kolyada
2018-05-09 13:32 Mikle Kolyada
2018-01-29 23:14 Mikle Kolyada

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4679837bc71 dfblob:36b518d334b dfblob:780adc28a98
dfblob:af3b28f22e0 dfblob:7ce3a7c08a3 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-misc/nnn/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1683443101.aa59b76d630b32cfba3a15249f59dfaa162f7ab9.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox