app-misc/clifm: add 1.13, drop 1.10

Signed-off-by: Michael Yang <michaelzcyang@gmail.com>

5 files changed, 27 insertions, 16 deletions

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index d37bb516f..9acace736 100644
--- a/app-misc/clifm/Manifest
+++ b/app-misc/clifm/Manifest
@@ -1,4 +1,4 @@
-DIST clifm-1.10.tar.gz 1355974 BLAKE2B d5c3ad1b8617471156f8759ebda4e2d62bb7b9db57f61287eb6b1a99f72cac04cea9a9f02bc82d8188a62b18b72e207d017b9bb2c910aa44560691506d50a0aa SHA512 9d59f0258fd44b02eefc0f0eb1ef9f18c90395e440b6ac775211345c64d97dbecef32f746f081a0ab602ab0a58a314be9e873baa538e42939c52eb57d2464d75
 DIST clifm-1.11.tar.gz 1378500 BLAKE2B ea1cb37bb61538c1b64bbafdce5adee977bf14fb2deb7b4b54ae1a4e39824543dbd23e9c63563228e30ae35ce9d22d7c11b0b18e370310a5e5c9a60f1b425275 SHA512 5075dab38000f0eb026cacc1d31b8f3e20157d4ec19e84f5f271ffae9a4f99aa03411d6d47470eb37879bbe497c7747db90a7f4ac7760439f67f1a3537cb77e2
 DIST clifm-1.12.tar.gz 1448233 BLAKE2B 82c2a7502cd2955a6c89adc273129f88e660ab263f7718605f8bb0f533c79a1aa1ea2c4c0b203362f4a368bad9adcead02e6eb2f0f1bb9a8d09d9f1e9a8cf9c2 SHA512 4593a934bf07c186caad160d2a77b458177b9c38f58d720600ebfa4b7ad95238b1e58616b9b4d94435b736e7b55fc5f1981abce83ea4d6c5350e5f035823f9dd
+DIST clifm-1.13.tar.gz 1467612 BLAKE2B 06e6a986c1504ae2cbaa6e38daaf26c44d477102bdb0e67d529b35a066dbf6695841eb6fa69ed0379aca2028dfa327f98a8060c80f57c5f2653285ff4ed4a116 SHA512 3a1936b5517c6f8babb59a32af03e2408b9e3bd59fceb88c6101785f38175e71026128df07c46b05aa34ad4519063b6e80e22e29f0b277106a3b7d7e3341d584
 DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827
diff --git a/app-misc/clifm/clifm-1.10.ebuild b/app-misc/clifm/clifm-1.13.ebuild
index fd5924273..2ea68d061 100644
--- a/app-misc/clifm/clifm-1.10.ebuild
+++ b/app-misc/clifm/clifm-1.13.ebuild
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji +highlight icons +lira +magic nerdfonts nls
-		posix qsort +suggestions +tags"
+IUSE="archive +bleach emoji fzf +highlight icons +inotify +lira +magic
+		nerdfonts nls posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
@@ -44,6 +44,7 @@ RDEPEND="
 		app-arch/atool
 		sys-fs/archivemount
 	)
+	fzf? ( app-shells/fzf )
 	nls? ( virtual/libintl )
 "
 BDEPEND=""
@@ -55,22 +56,25 @@ src_compile() {
 			append-cflags "-D_NERD"
 		elif use icons; then
 			append-cflags "-D_ICONS_IN_TERMINAL"
+		else
+			append-cflags "-D_NO_ICONS"
 		fi
-		# do not append -D_NO_ICONS here, causes compilation error
 	fi
 
 	use posix && append-cflags "-D_BE_POSIX"
 	use archive || append-cflags "-D_NO_ARCHIVING"
 	use bleach || append-cflags "-D_NO_BLEACH"
 	use nls || append-cflags "-D_NO_GETTEXT"
-	# -D_NO_FZF causes compile error
+	use fzf || append-cflags "-D_NO_FZF"
 	use highlight || append-cflags "-D_NO_HIGHLIGHT"
 	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"
-	# -D_NO_TRASH causes compile error
+	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"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
@@ -89,13 +93,10 @@ pkg_postinst() {
 		use icons && ewarn "Warning: Use flag 'icons' overridden by 'emoji'"
 	elif use nerdfonts; then
 		use icons && ewarn "Warning: Use flag 'icons' overridden by 'nerdfonts'"
-	else
-		use icons || ewarn "Warning: as none of 'emoji', 'nerdfonts', or 'icons' were selected, \
-			'emoji' was implicitly enabled to prevent compilation error"
 	fi
+	use inotify && use posix && ewarn "Warning: Use flag 'inotify' overriden by 'posix'"
 	optfeature_header "Install additional optional functionality:"
 	optfeature "mounting/unmounting support" sys-apps/udevil sys-fs/udisks
-	optfeature "fzf tab completion and more" app-shells/fzf
 	if use archive; then
 		optfeature_header "Install additional archive support:"
 		optfeature "zstd support" app-arch/zstd
diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index c1b074b8e..c309e5adc 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
-		posix +profiles qsort +suggestions +tags +trash"
+IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
+		nerdfonts nls posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
@@ -63,6 +63,7 @@ src_compile() {
 
 	use posix && append-cflags "-D_BE_POSIX"
 	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"
@@ -74,6 +75,7 @@ src_compile() {
 	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"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
@@ -93,6 +95,8 @@ pkg_postinst() {
 	elif use nerdfonts; then
 		use icons && ewarn "Warning: Use flag 'icons' overridden by 'nerdfonts'"
 	fi
+	use inotify && use posix && ewarn "Warning: Use flag 'inotify' overriden by 'posix'"
+	use arc4random && use posix && ewarn "Warning: Use flag 'arc4random' overriden by 'posix'"
 	optfeature_header "Install additional optional functionality:"
 	optfeature "mounting/unmounting support" sys-apps/udevil sys-fs/udisks
 	if use archive; then
diff --git a/app-misc/clifm/files/clifm-1.10-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.13-gentoo-skip-manpage-compression.patch
index 20406d986..81dd76bba 100644
--- a/app-misc/clifm/files/clifm-1.10-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-1.13-gentoo-skip-manpage-compression.patch
@@ -2,11 +2,11 @@ Skip manpage compression in makefile.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -53,7 +53,6 @@ install: $(BIN)
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions
+@@ -55,7 +55,6 @@ install: $(BIN)
+ 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPPREFIX)
  	$(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)
+ 	$(INSTALL) -m 0644 misc/completions.fish $(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(BIN).fish
diff --git a/app-misc/clifm/metadata.xml b/app-misc/clifm/metadata.xml
index 1f6b584da..34bf84a53 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -11,6 +11,9 @@
 		<name>Michael Yang</name>
 	</maintainer>
 	<use>
+		<flag name="arc4random">
+			Use arc4random instead of random, requires 'posix' to be unset
+		</flag>
 		<flag name="archive">
 			Archive manipulation support (extraction/decompression, listing, repacking, mounting)
 		</flag>
@@ -29,6 +32,9 @@
 		<flag name="icons">
 			Enable icons and set them to use icons-in-terminal (see https://github.com/sebastiencs/icons-in-terminal)
 		</flag>
+		<flag name="inotify">
+			Use the inotify API for filesystem monitoring instead of a generic check, requires 'posix' to be unset
+		</flag>
 		<flag name="lira">
 			Add Lira as the default built-in resource opener
 		</flag>
@@ -42,7 +48,7 @@
 			Add translations support (via <pkg>sys-devel/gettext</pkg>)
 		</flag>
 		<flag name="posix">
-			Force POSIX.1-2008 compliance, removing support for Linux-specific "file birth time" information
+			Force POSIX.1-2008 compliance, removing support for Linux-specific "file birth time" information, inotify, and arc4random
 		</flag>
 		<flag name="profiles">
 			Enable support for creating, switching, renaming, and deleting of user profiles