app-misc/clifm: add 1.16 1.17, drop 1.8 1.15

Signed-off-by: Michael Yang <michaelzcyang@gmail.com>
2026-04-07 03:10:15 -04:00 · 2024-02-18 22:19:07 -08:00
parent 5257d1b49a
commit c362af2388
5 changed files with 30 additions and 30 deletions
--- a/app-misc/clifm/Manifest
+++ b/app-misc/clifm/Manifest
@@ -1,4 +1,4 @@
 DIST clifm-1.11.tar.gz 1378500 BLAKE2B ea1cb37bb61538c1b64bbafdce5adee977bf14fb2deb7b4b54ae1a4e39824543dbd23e9c63563228e30ae35ce9d22d7c11b0b18e370310a5e5c9a60f1b425275 SHA512 5075dab38000f0eb026cacc1d31b8f3e20157d4ec19e84f5f271ffae9a4f99aa03411d6d47470eb37879bbe497c7747db90a7f4ac7760439f67f1a3537cb77e2
 DIST clifm-1.13.tar.gz 1467612 BLAKE2B 06e6a986c1504ae2cbaa6e38daaf26c44d477102bdb0e67d529b35a066dbf6695841eb6fa69ed0379aca2028dfa327f98a8060c80f57c5f2653285ff4ed4a116 SHA512 3a1936b5517c6f8babb59a32af03e2408b9e3bd59fceb88c6101785f38175e71026128df07c46b05aa34ad4519063b6e80e22e29f0b277106a3b7d7e3341d584
-DIST clifm-1.15.tar.gz 1511851 BLAKE2B 2329717f234400159045654e521e6ae510b6d8cdca2b72e715a814e5642dba2760869a6035baca844a3717ef8cc4e0af1b0967d7f3b16b20dfceb6cdca72a2c0 SHA512 812d1ebb0d8b157e60bc55102e74738e611dd609294eb65da5b1aac4ee3cff947558dde658037c9558113266e92525582aac22a3ed084797367166b4d41ce9c1
-DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827
+DIST clifm-1.16.tar.gz 1518525 BLAKE2B 976e5ca80d29b11467d18375ac7f897cd14ed7f629bb20108b1bcd1f74d81fbdabf6a21ea21ada786a8ff7ae3bdf720e189466cf48cbe5e6c635965e8eb659db SHA512 4c715d8d5be9d93cf83574cfd2c5ad99e3da4af19c201194c923031b9c432cbb281b520e1fac6e5d42a52114c8af4d993fed918554002489adb613cf21277283
+DIST clifm-1.17.tar.gz 1525172 BLAKE2B 96b303b4d07d83de915c3c05d28c6de26ded4bee5799153e6876bb778401e33983d993ce300297f52468cd7884e1e33c2206dc99476f43dd74e1444967d65502 SHA512 e5ef5c61e2201bcb925e960c86387254bace7f5d4f9c5f76a66540394d5d30453a780c6e967c6fc2b86550e30afe2079776fd2dfaaa116209d0fc8644fba529f
--- a/app-misc/clifm/clifm-1.16.ebuild
+++ b/app-misc/clifm/clifm-1.16.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
-		+media nerdfonts nls posix +profiles qsort +tags +trash xdu"
+		+media nerdfonts nls posix +profiles qsort +suggestions +tags +trash xdu"

 PATCHES=(
 	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
@@ -68,21 +68,21 @@ src_compile() {
 	fi

 	use posix && append-cflags "-DPOSIX_STRICT"
-	use archive && append-cflags "-DALLOW_ARCHIVING" || append-cflags "-D_NO_ARCHIVING"
+	use archive || append-cflags "-D_NO_ARCHIVING"
 	use arc4random || append-cflags "-D_NO_ARC4RANDOM"
 	use bleach || append-cflags "-D_NO_BLEACH"
 	use nls || append-cflags "-D_NO_GETTEXT"
 	use fzf || append-cflags "-D_NO_FZF"
 	use highlight || append-cflags "-D_NO_HIGHLIGHT"
-	use lira && append-cflags "-DALLOW_LIRA" || append-cflags "-D_NO_LIRA"
+	use lira || append-cflags "-D_NO_LIRA"
 	use magic || append-cflags "-D_NO_MAGIC"
-	# -D_NO_SUGGESTIONS causes compile error
+	use suggestions || append-cflags "-D_NO_SUGGESTIONS"
 	use tags || append-cflags "-D_NO_TAGS"
 	use profiles || append-cflags "-D_NO_PROFILES"
 	use trash || append-cflags "-D_NO_TRASH"
 	use qsort && append-cflags "-D_TOURBIN_QSORT"
 	use inotify || append-cflags "-DUSE_GENERIC_FS_MONITOR"
-	use media && append-cflags "-DALLOW_MEDIA" || append-cflags "-DNO_MEDIA_FUNC"
+	use media || append-cflags "-DNO_MEDIA_FUNC"
 	use xdu && append-cflags "-DUSE_XDU"

 	# makefile defaults to /usr/local
--- a/app-misc/clifm/clifm-1.17.ebuild
+++ b/app-misc/clifm/clifm-1.17.ebuild
@@ -20,11 +20,11 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
-		posix qsort +suggestions +tags +trash"
+IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
+		+media nerdfonts nls posix +profiles qsort +suggestions +tags +trash xdu"

 PATCHES=(
-	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
 )

 LIB="
@@ -44,6 +44,12 @@ RDEPEND="
 		app-arch/atool
 		sys-fs/archivemount
 	)
+	media? (
+		|| (
+			sys-apps/udevil
+			sys-fs/udisks
+		)
+	)
 	fzf? ( app-shells/fzf )
 	nls? ( virtual/libintl )
 "
@@ -56,13 +62,15 @@ src_compile() {
 			append-cflags "-D_NERD"
 		elif use icons; then
 			append-cflags "-D_ICONS_IN_TERMINAL"
-		else
-			append-cflags "-D_NO_ICONS"
+		# else
+			# the following line is desired but would cause a compile error
+			# append-cflags "-D_NO_ICONS"
 		fi
 	fi

-	use posix && append-cflags "-D_BE_POSIX"
+	use posix && append-cflags "-DPOSIX_STRICT"
 	use archive || append-cflags "-D_NO_ARCHIVING"
+	use arc4random || append-cflags "-D_NO_ARC4RANDOM"
 	use bleach || append-cflags "-D_NO_BLEACH"
 	use nls || append-cflags "-D_NO_GETTEXT"
 	use fzf || append-cflags "-D_NO_FZF"
@@ -71,8 +79,12 @@ src_compile() {
 	use magic || append-cflags "-D_NO_MAGIC"
 	use suggestions || append-cflags "-D_NO_SUGGESTIONS"
 	use tags || append-cflags "-D_NO_TAGS"
+	use profiles || append-cflags "-D_NO_PROFILES"
 	use trash || append-cflags "-D_NO_TRASH"
 	use qsort && append-cflags "-D_TOURBIN_QSORT"
+	use inotify || append-cflags "-DUSE_GENERIC_FS_MONITOR"
+	use media || append-cflags "-DNO_MEDIA_FUNC"
+	use xdu && append-cflags "-DUSE_XDU"

 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
@@ -92,8 +104,8 @@ pkg_postinst() {
 	elif use nerdfonts; then
 		use icons && ewarn "Warning: Use flag 'icons' overridden by 'nerdfonts'"
 	fi
-	optfeature_header "Install additional optional functionality:"
-	optfeature "mounting/unmounting support" sys-apps/udevil sys-fs/udisks
+	use inotify && use posix && ewarn "Warning: Use flag 'inotify' overriden by 'posix'"
+	use arc4random && use posix && ewarn "Warning: Use flag 'arc4random' overriden by 'posix'"
 	if use archive; then
 		optfeature_header "Install additional archive support:"
 		optfeature "zstd support" app-arch/zstd
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -68,13 +68,13 @@ src_compile() {
 	fi

 	use posix && append-cflags "-DPOSIX_STRICT"
-	use archive && append-cflags "-DALLOW_ARCHIVING" || append-cflags "-D_NO_ARCHIVING"
+	use archive || append-cflags "-D_NO_ARCHIVING"
 	use arc4random || append-cflags "-D_NO_ARC4RANDOM"
 	use bleach || append-cflags "-D_NO_BLEACH"
 	use nls || append-cflags "-D_NO_GETTEXT"
 	use fzf || append-cflags "-D_NO_FZF"
 	use highlight || append-cflags "-D_NO_HIGHLIGHT"
-	use lira && append-cflags "-DALLOW_LIRA" || append-cflags "-D_NO_LIRA"
+	use lira || append-cflags "-D_NO_LIRA"
 	use magic || append-cflags "-D_NO_MAGIC"
 	use suggestions || append-cflags "-D_NO_SUGGESTIONS"
 	use tags || append-cflags "-D_NO_TAGS"
@@ -82,7 +82,7 @@ src_compile() {
 	use trash || append-cflags "-D_NO_TRASH"
 	use qsort && append-cflags "-D_TOURBIN_QSORT"
 	use inotify || append-cflags "-DUSE_GENERIC_FS_MONITOR"
-	use media && append-cflags "-DALLOW_MEDIA" || append-cflags "-DNO_MEDIA_FUNC"
+	use media || append-cflags "-DNO_MEDIA_FUNC"
 	use xdu && append-cflags "-DUSE_XDU"

 	# makefile defaults to /usr/local
--- a/app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
@@ -1,12 +0,0 @@
-Skip manpage compression in makefile.
-
--- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,6 @@ install: $(BIN)
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps
- 	$(INSTALL) -m 0644 misc/manpage $(DESTDIR)$(MANDIR)/man1/$(BIN).1
-	gzip -f -- $(DESTDIR)$(MANDIR)/man1/$(BIN).1
- 	$(INSTALL) -m 0644 misc/completions.bash $(DESTDIR)$(DATADIR)/bash-completion/completions/$(BIN)
- 	$(INSTALL) -m 0644 misc/completions.zsh $(DESTDIR)$(DATADIR)/zsh/site-functions/_$(BIN)
- 	$(INSTALL) -m 0644 misc/$(BIN).desktop $(DESTDIR)$(DESKTOPPREFIX)