[gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/

[Michael Yang]

commit:     466cac6577a2673168bb7d1e106aab47a453e420
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 22:24:30 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 22:24:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=466cac65

app-misc/clifm: Remove unnecessary use flags

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

 app-misc/clifm/clifm-1.6.ebuild  | 37 +++----------------------------------
 app-misc/clifm/clifm-9999.ebuild | 37 +++----------------------------------
 app-misc/clifm/metadata.xml      | 34 +---------------------------------
 3 files changed, 7 insertions(+), 101 deletions(-)

diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
index fbffa78e3..3bf60250b 100644
--- a/app-misc/clifm/clifm-1.6.ebuild
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit flag-o-matic optfeature xdg
+inherit optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,8 +20,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+archives +bleach emoji-icons +highlight icons-in-terminal +lira
-		nerdfonts +suggestions +tags +trash"
+IUSE=""
 
 DEPEND="
 	sys-libs/libcap
@@ -33,30 +32,6 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
-	use archives || append-cflags "-D_NO_ARCHIVING"
-	use bleach || append-cflags "-D_NO_BLEACH"
-
-	# emoji-icons > nerdfonts > icons-in-terminal
-	if ! use emoji-icons; then # support for emoji-icons is default
-		if use nerdfonts; then
-			append-cflags "-D_NERD"
-		elif use icons-in-terminal; then
-			append-cflags "-D_ICONS_IN_TERMINAL"
-		else
-			append-cflags "-D_NO_ICONS"
-		fi
-	fi
-
-	use highlight || append-cflags "-D_NO_HIGHLIGHT"
-	use lira || append-cflags "-D_NO_LIRA"
-	use suggestions || append-cflags "-D_NO_SUGGESTIONS"
-	use tags || append-cflags "-D_NO_TAGS"
-	use trash || append-cflags "-D_NO_TRASH"
-	# there is no reason to use -D_NO_MAGIC since we already depend on sys-apps/file
-
-	# basically free faster qsort implementation
-	append-cflags "-D_TOURBIN_QSORT"
-
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr" || die "make failed"
 }
@@ -72,16 +47,10 @@ pkg_postinst() {
 	optfeature_header "Install additional optional functionality:"
 	optfeature "fzf tab completion and more" app-shells/fzf
 	optfeature "mounting/unmounting support" sys-fs/udisks sys-apps/udevil
-	optfeature_header "Install optional archiving support:"
+	optfeature_header "Install optional archiving support (if you didn't use -D_NO_ARCHIVING):"
 	optfeature "zstd operations" app-arch/zstd
 	optfeature "archive extraction/unpacking" app-arch/atool
 	optfeature "mounting archives" sys-fs/archivemount
 	optfeature "extracting .iso files" app-arch/p7zip
 	optfeature "creating .iso files" app-cdr/cdrtools
-	if use emoji-icons; then
-		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji-icons'"
-		use icons-in-terminal && ewarn "Warning: Use flag 'icons-in-terminal' overridden by 'emoji-icons'"
-	elif use nerdfonts; then
-		use icons-in-terminal && ewarn "Warning: Use flag 'icons-in-terminal' overridden by 'nerdfonts'"
-	fi
 }

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index fbffa78e3..3bf60250b 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit flag-o-matic optfeature xdg
+inherit optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,8 +20,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+archives +bleach emoji-icons +highlight icons-in-terminal +lira
-		nerdfonts +suggestions +tags +trash"
+IUSE=""
 
 DEPEND="
 	sys-libs/libcap
@@ -33,30 +32,6 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
-	use archives || append-cflags "-D_NO_ARCHIVING"
-	use bleach || append-cflags "-D_NO_BLEACH"
-
-	# emoji-icons > nerdfonts > icons-in-terminal
-	if ! use emoji-icons; then # support for emoji-icons is default
-		if use nerdfonts; then
-			append-cflags "-D_NERD"
-		elif use icons-in-terminal; then
-			append-cflags "-D_ICONS_IN_TERMINAL"
-		else
-			append-cflags "-D_NO_ICONS"
-		fi
-	fi
-
-	use highlight || append-cflags "-D_NO_HIGHLIGHT"
-	use lira || append-cflags "-D_NO_LIRA"
-	use suggestions || append-cflags "-D_NO_SUGGESTIONS"
-	use tags || append-cflags "-D_NO_TAGS"
-	use trash || append-cflags "-D_NO_TRASH"
-	# there is no reason to use -D_NO_MAGIC since we already depend on sys-apps/file
-
-	# basically free faster qsort implementation
-	append-cflags "-D_TOURBIN_QSORT"
-
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr" || die "make failed"
 }
@@ -72,16 +47,10 @@ pkg_postinst() {
 	optfeature_header "Install additional optional functionality:"
 	optfeature "fzf tab completion and more" app-shells/fzf
 	optfeature "mounting/unmounting support" sys-fs/udisks sys-apps/udevil
-	optfeature_header "Install optional archiving support:"
+	optfeature_header "Install optional archiving support (if you didn't use -D_NO_ARCHIVING):"
 	optfeature "zstd operations" app-arch/zstd
 	optfeature "archive extraction/unpacking" app-arch/atool
 	optfeature "mounting archives" sys-fs/archivemount
 	optfeature "extracting .iso files" app-arch/p7zip
 	optfeature "creating .iso files" app-cdr/cdrtools
-	if use emoji-icons; then
-		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji-icons'"
-		use icons-in-terminal && ewarn "Warning: Use flag 'icons-in-terminal' overridden by 'emoji-icons'"
-	elif use nerdfonts; then
-		use icons-in-terminal && ewarn "Warning: Use flag 'icons-in-terminal' overridden by 'nerdfonts'"
-	fi
 }

diff --git a/app-misc/clifm/metadata.xml b/app-misc/clifm/metadata.xml
index afd332feb..ae399b1f4 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -3,45 +3,13 @@
 <pkgmetadata>
 	<longdescription>
 		The command line file manager.
-		More information about the use flags can be found here:
+		By default most features are enabled, customizing this requires adding CFLAGS:
 		https://github.com/leo-arch/clifm/blob/master/src/README.md#compiling-features-inout
 	</longdescription>
 	<maintainer type="person">
 		<email>michaelzcyang@×××××.com</email>
 		<name>Michael Yang</name>
 	</maintainer>
-	<use>
-		<flag name="archives">
-			Archive manipulation support
-		</flag>
-		<flag name="bleach">
-			Support for Bleach, the built-in file names cleaner
-		</flag>
-		<flag name="emoji-icons">
-			Enable icons and set them to use the noto-emoji font (see <pkg>media-fonts/noto-emoji</pkg>)
-		</flag>
-		<flag name="highlight">
-			Syntax highlighting support
-		</flag>
-		<flag name="icons-in-terminal">
-			Enable icons and set them to use icons-in-terminal (see https://github.com/sebastiencs/icons-in-terminal)
-		</flag>
-		<flag name="lira">
-			Add Lira as the default built-in resource opener
-		</flag>
-		<flag name="nerdfonts">
-			Enable icons and set them to use NerdFonts
-		</flag>
-		<flag name="suggestions">
-			Autosuggestion support
-		</flag>
-		<flag name="tags">
-			Built-in file tagging system support
-		</flag>
-		<flag name="trash">
-			FreeDesktop compliant trash system support
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">leo-arch/clifm</remote-id>
 	</upstream>