diff options
Diffstat (limited to 'app-misc/nnn')
| -rw-r--r-- | app-misc/nnn/Manifest | 7 | ||||
| -rw-r--r-- | app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch | 12 | ||||
| -rw-r--r-- | app-misc/nnn/metadata.xml | 1 | ||||
| -rw-r--r-- | app-misc/nnn/nnn-5.0.ebuild (renamed from app-misc/nnn/nnn-4.8.ebuild) | 18 |
4 files changed, 24 insertions, 14 deletions
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest index 59fe9f4cee2d..b5f07e3ef6e7 100644 --- a/app-misc/nnn/Manifest +++ b/app-misc/nnn/Manifest @@ -1,6 +1,7 @@ AUX nnn-4.9_fix_colemak_patch.patch 1054 BLAKE2B 276dc125dcab2050c5376e8710565effa2a3a738d84b63d2ab53ae0f85d0044bd4b25105d81a45bc6937d1cc71b0fed30ea694a9482057e6043deaeac41d530c SHA512 90337b80babbedfd16a8e4d03d0747c43faa8a8c92e2c1dbc04d1672d7edcb4dff39a08edb049a3677312747bddf80d46d0aaf23795df295b0d8d24090368310 -DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd +AUX nnn-5.0_fix_strcasecmp.patch 274 BLAKE2B df58f4e41fa1605d7e33680a57f2bacc97d6a424138f611c72b022263d2ef54192341c40b08f16eb09a00906884bed4eca1e5f8ade351a649d16d42ec6bd2345 SHA512 c09af696635b92f6a3b75fa43bf6b31973e435a63ef64b812d817f31478f3c1d3b1365f48f7e5cf92aa207cc4b45847e93a1a269dd029b92ad6bc14676d29702 DIST nnn-4.9.tar.gz 255144 BLAKE2B 3ad257f931dee7803c44f9f4db478a8de0c898a2d8e818457aeb00dcc7936a0a1f51ce3c199a1421a014d197c7f9d2f17bccccbc985b93d78e5994b9cc707c94 SHA512 3c16ed1cbc5466b05306e38c6f5d8eb7ade9cf5ad766f9ff3bf7d20d5bfb9bdf1564527e27191e2cd85542c25245f338e1236630de3d1c8e5fbd10d54d628a14 -EBUILD nnn-4.8.ebuild 3172 BLAKE2B e08054dfbf5d37ef5f5f2893a7ff1a19a5bc85361d3355e520ccdd02b616b73effb61cc828e87fd27897eecb1e91990c78aa22beb7deed0c1aa48a77de928937 SHA512 cc5f215d7d099b03227dca7951cd23d06f6c143d01bbf02e395fc12cb978b250d83a0e43cad993a6c409f1d3dc76dddac8e5d977ccb5724faa695187aa3aa3df +DIST nnn-5.0.tar.gz 258474 BLAKE2B d8d5ca626c163ae3adbce9260f48b7c09673ffa70c3f9707ed85a077477f0cf1ce46ca1c91811539863f0a25a1289cb5f136180e10b872ce854744a507d79740 SHA512 648889de4e636882bf92d45a9fe273288858d76a28e34c6fcb27fc3d1e1b576eaec7e611f55a7f809a067ebf5a09c3a209ad84f44e2da528cfce71ed98a7a999 EBUILD nnn-4.9.ebuild 2910 BLAKE2B ba09e093e78dfd29afd1c6efd23a0fa7e75969902fc6cd9ce6b2a08df40ba2c108dd0f18714d9de6e61a8f8da8e41881ac70c1ae3863cf15c47d8594b441cd6a SHA512 690ed2e57b1d069bce3cda632e7e25f1762f798a1949f112e22350ba5c81d577ea6f137145a056ee399078db5fd1ab5e61dcf90fe5c729587cc33cdb60af1bc8 -MISC metadata.xml 1236 BLAKE2B 9afb37cabe29313f3b7203be1583fab01e067c798d5a9bb0ab5a4d5bf172d016feae30f2bf02577d390378d3292bb1f51aa4ffeeaf34c738c330bea020bbe80d SHA512 05ada5daf33b0fa8df18bca4432dea9a1dd9bfb0e74ecb4ae6d4b0860437aaf5f3850ef67283a28a4edb49fe747fb65ef9a27b829529992ed6826436530d07df +EBUILD nnn-5.0.ebuild 2908 BLAKE2B a44d58c2307d2f5cd89bcf876a5bdeb78f9af51314f772daadc4d6349053051e564691516fc3f89c1b9c9bb1e5fa5b61f85de498d411fb0db1fe68824f72aac9 SHA512 798de098bb18601c7302be8d82a7f1fe5c47ebc19300100282f01b71e894d3d5e646d9f3f25abc2b96095488a07d7c70b030943c8a62902d909aff08588b4bd4 +MISC metadata.xml 1159 BLAKE2B b4f7d5bac9e6aac166c1e7d9cd834f0efe99137e13dca959c5dac8f9b88de25756c9e260dedca4dbacabfab020ffa23552a195db137ddae650a8028e9fa64c61 SHA512 f4c4443351f8a82c493017756df5ca9e9d238b698b9e5b6598145a154e64f630c76b31f5e046c808c21d698dd1c8f95ffd1d2c67a1ba0f5cb889fc9f1806359d diff --git a/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch b/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch new file mode 100644 index 000000000000..15fcdaca3c64 --- /dev/null +++ b/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch @@ -0,0 +1,12 @@ +diff --git a/src/icons-hash.c b/src/icons-hash.c +index f0f2b0947..699af33b5 100644 +--- a/src/icons-hash.c ++++ b/src/icons-hash.c +@@ -23,6 +23,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <strings.h> + #include <stdlib.h> + #include <limits.h> + #include "icons.h" diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml index 74ffd32d3078..474677649a8b 100644 --- a/app-misc/nnn/metadata.xml +++ b/app-misc/nnn/metadata.xml @@ -15,7 +15,6 @@ <use> <flag name="8contexts">Enable 8 contexts (instead of 4)</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="gitstatus">Add git status column to the detail view</flag> <flag name="icons">Display icons using icons-in-terminal</flag> diff --git a/app-misc/nnn/nnn-4.8.ebuild b/app-misc/nnn/nnn-5.0.ebuild index c4e9d82febc1..934a1b8efc83 100644 --- a/app-misc/nnn/nnn-4.8.ebuild +++ b/app-misc/nnn/nnn-5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ 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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="8contexts colemak emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview" DEPEND="sys-libs/ncurses:= pcre? ( dev-libs/libpcre ) @@ -20,8 +20,11 @@ DEPEND="sys-libs/ncurses:= elibc_musl? ( sys-libs/fts-standalone )" BDEPEND="virtual/pkgconfig" RDEPEND="${DEPEND}" -REQUIRED_USE="?? ( icons nerdfonts emoji ) - ?? ( colemak colemak-dh )" +REQUIRED_USE="?? ( icons nerdfonts emoji )" + +PATCHES=( + "${FILESDIR}/nnn-5.0_fix_strcasecmp.patch" +) src_prepare() { default @@ -30,10 +33,6 @@ src_prepare() { # 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() { @@ -47,7 +46,6 @@ src_compile() { 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) |