public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/
@ 2023-01-08  7:09 Michael Yang
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Yang @ 2023-01-08  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     69f6e24cd3f59d0aff9029f1c9cba07c9ff9a800
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 07:04:56 2023 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sun Jan  8 07:04:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69f6e24c

app-misc/clifm: add 1.8, 1.9

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

 app-misc/clifm/Manifest                            |  2 +
 app-misc/clifm/clifm-1.8.ebuild                    | 60 ++++++++++++++++++++++
 app-misc/clifm/clifm-1.9.ebuild                    | 60 ++++++++++++++++++++++
 ...lifm-1.8-gentoo-skip-manpage-compression.patch} |  4 +-
 ...lifm-1.9-gentoo-skip-manpage-compression.patch} |  4 +-
 ...lifm-9999-gentoo-skip-manpage-compression.patch |  4 +-
 6 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index 6ff4bc8c7..12627bdee 100644
--- a/app-misc/clifm/Manifest
+++ b/app-misc/clifm/Manifest
@@ -1,2 +1,4 @@
 DIST clifm-1.6.tar.gz 1268633 BLAKE2B de36f0d3bc1c6584471d313f346a9db77f659b4fde41775e45c78066db12aff8bf33a58b3c5d0f9cd43800cf823f0508c2abb5c88ff50a28147aec5c7e7178df SHA512 a8f6b73070779d0d49b41109bee1b418cb6eb4fb1ac8e684cf859e1137336df2655ddfb5107b50674a5380364f572fe47cc72f58c25c4ff6439593b411a5f69e
 DIST clifm-1.7.tar.gz 1310379 BLAKE2B d37e5f4d013c7a7c8427993aa0ff187bac33cb8a89b75b368ce77eb11cbb3275f5cfabec1037e0b3052471633e763d22a7debe019c75ae6098f44cda0e9f7d70 SHA512 30bdc33090846b82edb2cf6372ca3515806f85261405476518d9b5cb1f9dc22e513263cac70f7d93bb85e6489b1486868964b1719637c1b317ce491b5734c453
+DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827
+DIST clifm-1.9.tar.gz 1331325 BLAKE2B 221f7e3f5a9904a24af6bf31c7ea433e70688ba0cf23e9b6b50478b15f3f16c3b0119e673dfe3991e34ee359d1c6dafeba12c4f9cb1de12255094d1226a6e584 SHA512 03406e2b58accc525bce957a8e27d276503ab63e426cea8023a2835ed4592dabe1f160dcb1502a87851e1afabedb985e634a2c3a0cafa84acdfd29a04f4c3b86

diff --git a/app-misc/clifm/clifm-1.8.ebuild b/app-misc/clifm/clifm-1.8.ebuild
new file mode 100644
index 000000000..d13334589
--- /dev/null
+++ b/app-misc/clifm/clifm-1.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The command line file manager"
+HOMEPAGE="https://github.com/leo-arch/clifm"
+
+inherit optfeature xdg
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	# also on sourceforge but the unpacked name is irregular
+	# SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+)
+
+DEPEND="
+	sys-libs/libcap
+	sys-libs/readline:=
+	sys-apps/acl
+	sys-apps/file
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	# makefile defaults to /usr/local
+	emake PREFIX="/usr"
+}
+
+src_install() {
+	# makefile defaults to /usr/local, and manpages to /usr/man
+	emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install
+	einstalldocs
+}
+
+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 (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
+	xdg_pkg_postinst
+}

diff --git a/app-misc/clifm/clifm-1.9.ebuild b/app-misc/clifm/clifm-1.9.ebuild
new file mode 100644
index 000000000..d13334589
--- /dev/null
+++ b/app-misc/clifm/clifm-1.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The command line file manager"
+HOMEPAGE="https://github.com/leo-arch/clifm"
+
+inherit optfeature xdg
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	# also on sourceforge but the unpacked name is irregular
+	# SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+)
+
+DEPEND="
+	sys-libs/libcap
+	sys-libs/readline:=
+	sys-apps/acl
+	sys-apps/file
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	# makefile defaults to /usr/local
+	emake PREFIX="/usr"
+}
+
+src_install() {
+	# makefile defaults to /usr/local, and manpages to /usr/man
+	emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install
+	einstalldocs
+}
+
+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 (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
+	xdg_pkg_postinst
+}

diff --git a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
similarity index 87%
copy from app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
copy to app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
index 9201488ff..931001ad8 100644
--- a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
@@ -1,6 +1,8 @@
+Skip manpage compression in makefile.
+
 --- a/Makefile
 +++ b/Makefile
-@@ -51,7 +51,6 @@ install: $(BIN)
+@@ -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

diff --git a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch
similarity index 87%
copy from app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
copy to app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch
index 9201488ff..20406d986 100644
--- a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch
@@ -1,6 +1,8 @@
+Skip manpage compression in makefile.
+
 --- a/Makefile
 +++ b/Makefile
-@@ -51,7 +51,6 @@ install: $(BIN)
+@@ -53,7 +53,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

diff --git a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
index 9201488ff..20406d986 100644
--- a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
@@ -1,6 +1,8 @@
+Skip manpage compression in makefile.
+
 --- a/Makefile
 +++ b/Makefile
-@@ -51,7 +51,6 @@ install: $(BIN)
+@@ -53,7 +53,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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/
@ 2023-04-02 22:15 Michael Yang
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Yang @ 2023-04-02 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2af9fe3718bc68511b047ad33815d22380a8cc7f
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sun Apr  2 22:13:52 2023 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sun Apr  2 22:13:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2af9fe37

app-misc/clifm: add 1.11, drop 1.7

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

 app-misc/clifm/Manifest                                               | 2 +-
 app-misc/clifm/{clifm-1.7.ebuild => clifm-1.11.ebuild}                | 0
 ...ression.patch => clifm-1.11-gentoo-skip-manpage-compression.patch} | 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index dcc3817a5..654ecf0d1 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.7.tar.gz 1310379 BLAKE2B d37e5f4d013c7a7c8427993aa0ff187bac33cb8a89b75b368ce77eb11cbb3275f5cfabec1037e0b3052471633e763d22a7debe019c75ae6098f44cda0e9f7d70 SHA512 30bdc33090846b82edb2cf6372ca3515806f85261405476518d9b5cb1f9dc22e513263cac70f7d93bb85e6489b1486868964b1719637c1b317ce491b5734c453
+DIST clifm-1.11.tar.gz 1378500 BLAKE2B ea1cb37bb61538c1b64bbafdce5adee977bf14fb2deb7b4b54ae1a4e39824543dbd23e9c63563228e30ae35ce9d22d7c11b0b18e370310a5e5c9a60f1b425275 SHA512 5075dab38000f0eb026cacc1d31b8f3e20157d4ec19e84f5f271ffae9a4f99aa03411d6d47470eb37879bbe497c7747db90a7f4ac7760439f67f1a3537cb77e2
 DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827
 DIST clifm-1.9.tar.gz 1331325 BLAKE2B 221f7e3f5a9904a24af6bf31c7ea433e70688ba0cf23e9b6b50478b15f3f16c3b0119e673dfe3991e34ee359d1c6dafeba12c4f9cb1de12255094d1226a6e584 SHA512 03406e2b58accc525bce957a8e27d276503ab63e426cea8023a2835ed4592dabe1f160dcb1502a87851e1afabedb985e634a2c3a0cafa84acdfd29a04f4c3b86

diff --git a/app-misc/clifm/clifm-1.7.ebuild b/app-misc/clifm/clifm-1.11.ebuild
similarity index 100%
rename from app-misc/clifm/clifm-1.7.ebuild
rename to app-misc/clifm/clifm-1.11.ebuild

diff --git a/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.11-gentoo-skip-manpage-compression.patch
similarity index 87%
rename from app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch
rename to app-misc/clifm/files/clifm-1.11-gentoo-skip-manpage-compression.patch
index 9201488ff..365df14c7 100644
--- a/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-1.11-gentoo-skip-manpage-compression.patch
@@ -1,6 +1,8 @@
+Skip manpage compression in makefile.
+
 --- a/Makefile
 +++ b/Makefile
-@@ -51,7 +51,6 @@ install: $(BIN)
+@@ -54,7 +54,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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/
@ 2023-06-06  4:58 Michael Yang
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Yang @ 2023-06-06  4:58 UTC (permalink / raw
  To: gentoo-commits

commit:     947dc7fb3404c47e396b9fbb705cda0274e5a9cc
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Tue Jun  6 04:49:58 2023 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Tue Jun  6 04:57:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=947dc7fb

app-misc/clifm: Add back USE flags for various compiled features

Note clifm-1.9 and clifm-1.10 don't have the 'fzf' or 'trash' USE flags;
their associated compile options cause compilation errors. In that case
the features are enabled by default, and, 'app-shells/fzf' becomes an
optional dependency.

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

 app-misc/clifm/clifm-1.10.ebuild                   | 71 +++++++++++++++++----
 app-misc/clifm/clifm-1.11.ebuild                   | 72 +++++++++++++++++-----
 app-misc/clifm/clifm-1.8.ebuild                    | 71 ++++++++++++++++-----
 app-misc/clifm/clifm-1.9.ebuild                    | 71 +++++++++++++++++----
 app-misc/clifm/clifm-9999.ebuild                   | 72 +++++++++++++++++-----
 ...lifm-9999-gentoo-skip-manpage-compression.patch |  6 +-
 app-misc/clifm/metadata.xml                        | 52 +++++++++++++++-
 7 files changed, 343 insertions(+), 72 deletions(-)

diff --git a/app-misc/clifm/clifm-1.10.ebuild b/app-misc/clifm/clifm-1.10.ebuild
index d13334589..fd5924273 100644
--- a/app-misc/clifm/clifm-1.10.ebuild
+++ b/app-misc/clifm/clifm-1.10.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit optfeature xdg
+inherit flag-o-matic optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,22 +20,58 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="archive +bleach emoji +highlight icons +lira +magic nerdfonts nls
+		posix qsort +suggestions +tags"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
 )
 
-DEPEND="
+LIB="
 	sys-libs/libcap
 	sys-libs/readline:=
 	sys-apps/acl
-	sys-apps/file
+	magic? ( sys-apps/file )
+"
+
+DEPEND="
+	${LIB}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${LIB}
+	archive? (
+		app-arch/atool
+		sys-fs/archivemount
+	)
+	nls? ( virtual/libintl )
 "
-RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
+	# emoji > nerdfonts > icons
+	if ! use emoji; then # support for emoji-icons is default
+		if use nerdfonts; then
+			append-cflags "-D_NERD"
+		elif use icons; then
+			append-cflags "-D_ICONS_IN_TERMINAL"
+		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 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 qsort && append-cflags "-D_TOURBIN_QSORT"
+
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
 }
@@ -47,14 +83,23 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+	if use emoji; then
+		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji'"
+		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
 	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
-	optfeature "mounting/unmounting support" sys-fs/udisks sys-apps/udevil
-	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
-	xdg_pkg_postinst
+	if use archive; then
+		optfeature_header "Install additional archive support:"
+		optfeature "zstd support" app-arch/zstd
+		optfeature "extracting .iso files" app-arch/p7zip
+		optfeature "creating .iso files" app-cdr/cdrtools
+	fi
 }

diff --git a/app-misc/clifm/clifm-1.11.ebuild b/app-misc/clifm/clifm-1.11.ebuild
index d13334589..c1b074b8e 100644
--- a/app-misc/clifm/clifm-1.11.ebuild
+++ b/app-misc/clifm/clifm-1.11.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit optfeature xdg
+inherit flag-o-matic optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,22 +20,61 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
+		posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
 )
 
-DEPEND="
+LIB="
 	sys-libs/libcap
 	sys-libs/readline:=
 	sys-apps/acl
-	sys-apps/file
+	magic? ( sys-apps/file )
+"
+
+DEPEND="
+	${LIB}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${LIB}
+	archive? (
+		app-arch/atool
+		sys-fs/archivemount
+	)
+	fzf? ( app-shells/fzf )
+	nls? ( virtual/libintl )
 "
-RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
+	# emoji > nerdfonts > icons
+	if ! use emoji; then # support for emoji-icons is default
+		if use nerdfonts; then
+			append-cflags "-D_NERD"
+		elif use icons; then
+			append-cflags "-D_ICONS_IN_TERMINAL"
+		else
+			append-cflags "-D_NO_ICONS"
+		fi
+	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"
+	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"
+	use profiles || append-cflags "-D_NO_PROFILES"
+	use trash || append-cflags "-D_NO_TRASH"
+	use qsort && append-cflags "-D_TOURBIN_QSORT"
+
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
 }
@@ -47,14 +86,19 @@ src_install() {
 }
 
 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 (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
 	xdg_pkg_postinst
+	if use emoji; then
+		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji'"
+		use icons && ewarn "Warning: Use flag 'icons' overridden by 'emoji'"
+	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
+	if use archive; then
+		optfeature_header "Install additional archive support:"
+		optfeature "zstd support" app-arch/zstd
+		optfeature "extracting .iso files" app-arch/p7zip
+		optfeature "creating .iso files" app-cdr/cdrtools
+	fi
 }

diff --git a/app-misc/clifm/clifm-1.8.ebuild b/app-misc/clifm/clifm-1.8.ebuild
index d13334589..81235aa9d 100644
--- a/app-misc/clifm/clifm-1.8.ebuild
+++ b/app-misc/clifm/clifm-1.8.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit optfeature xdg
+inherit flag-o-matic optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,22 +20,60 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
+		posix qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
 )
 
-DEPEND="
+LIB="
 	sys-libs/libcap
 	sys-libs/readline:=
 	sys-apps/acl
-	sys-apps/file
+	magic? ( sys-apps/file )
+"
+
+DEPEND="
+	${LIB}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${LIB}
+	archive? (
+		app-arch/atool
+		sys-fs/archivemount
+	)
+	fzf? ( app-shells/fzf )
+	nls? ( virtual/libintl )
 "
-RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
+	# emoji > nerdfonts > icons
+	if ! use emoji; then # support for emoji-icons is default
+		if use nerdfonts; then
+			append-cflags "-D_NERD"
+		elif use icons; then
+			append-cflags "-D_ICONS_IN_TERMINAL"
+		else
+			append-cflags "-D_NO_ICONS"
+		fi
+	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"
+	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"
+	use trash || append-cflags "-D_NO_TRASH"
+	use qsort && append-cflags "-D_TOURBIN_QSORT"
+
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
 }
@@ -47,14 +85,19 @@ src_install() {
 }
 
 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 (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
 	xdg_pkg_postinst
+	if use emoji; then
+		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji'"
+		use icons && ewarn "Warning: Use flag 'icons' overridden by 'emoji'"
+	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
+	if use archive; then
+		optfeature_header "Install additional archive support:"
+		optfeature "zstd support" app-arch/zstd
+		optfeature "extracting .iso files" app-arch/p7zip
+		optfeature "creating .iso files" app-cdr/cdrtools
+	fi
 }

diff --git a/app-misc/clifm/clifm-1.9.ebuild b/app-misc/clifm/clifm-1.9.ebuild
index d13334589..fd5924273 100644
--- a/app-misc/clifm/clifm-1.9.ebuild
+++ b/app-misc/clifm/clifm-1.9.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="The command line file manager"
 HOMEPAGE="https://github.com/leo-arch/clifm"
 
-inherit optfeature xdg
+inherit flag-o-matic optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,22 +20,58 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="archive +bleach emoji +highlight icons +lira +magic nerdfonts nls
+		posix qsort +suggestions +tags"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
 )
 
-DEPEND="
+LIB="
 	sys-libs/libcap
 	sys-libs/readline:=
 	sys-apps/acl
-	sys-apps/file
+	magic? ( sys-apps/file )
+"
+
+DEPEND="
+	${LIB}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${LIB}
+	archive? (
+		app-arch/atool
+		sys-fs/archivemount
+	)
+	nls? ( virtual/libintl )
 "
-RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
+	# emoji > nerdfonts > icons
+	if ! use emoji; then # support for emoji-icons is default
+		if use nerdfonts; then
+			append-cflags "-D_NERD"
+		elif use icons; then
+			append-cflags "-D_ICONS_IN_TERMINAL"
+		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 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 qsort && append-cflags "-D_TOURBIN_QSORT"
+
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
 }
@@ -47,14 +83,23 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+	if use emoji; then
+		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji'"
+		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
 	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
-	optfeature "mounting/unmounting support" sys-fs/udisks sys-apps/udevil
-	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
-	xdg_pkg_postinst
+	if use archive; then
+		optfeature_header "Install additional archive support:"
+		optfeature "zstd support" app-arch/zstd
+		optfeature "extracting .iso files" app-arch/p7zip
+		optfeature "creating .iso files" app-cdr/cdrtools
+	fi
 }

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index d13334589..c1b074b8e 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 optfeature xdg
+inherit flag-o-matic optfeature xdg
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
@@ -20,22 +20,61 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
+		posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
 )
 
-DEPEND="
+LIB="
 	sys-libs/libcap
 	sys-libs/readline:=
 	sys-apps/acl
-	sys-apps/file
+	magic? ( sys-apps/file )
+"
+
+DEPEND="
+	${LIB}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${LIB}
+	archive? (
+		app-arch/atool
+		sys-fs/archivemount
+	)
+	fzf? ( app-shells/fzf )
+	nls? ( virtual/libintl )
 "
-RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
+	# emoji > nerdfonts > icons
+	if ! use emoji; then # support for emoji-icons is default
+		if use nerdfonts; then
+			append-cflags "-D_NERD"
+		elif use icons; then
+			append-cflags "-D_ICONS_IN_TERMINAL"
+		else
+			append-cflags "-D_NO_ICONS"
+		fi
+	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"
+	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"
+	use profiles || append-cflags "-D_NO_PROFILES"
+	use trash || append-cflags "-D_NO_TRASH"
+	use qsort && append-cflags "-D_TOURBIN_QSORT"
+
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
 }
@@ -47,14 +86,19 @@ src_install() {
 }
 
 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 (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
 	xdg_pkg_postinst
+	if use emoji; then
+		use nerdfonts && ewarn "Warning: Use flag 'nerdfonts' overridden by 'emoji'"
+		use icons && ewarn "Warning: Use flag 'icons' overridden by 'emoji'"
+	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
+	if use archive; then
+		optfeature_header "Install additional archive support:"
+		optfeature "zstd support" app-arch/zstd
+		optfeature "extracting .iso files" app-arch/p7zip
+		optfeature "creating .iso files" app-cdr/cdrtools
+	fi
 }

diff --git a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
index 365df14c7..81dd76bba 100644
--- a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
@@ -2,11 +2,11 @@ Skip manpage compression in makefile.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -54,7 +54,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 ae399b1f4..1f6b584da 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -3,13 +3,63 @@
 <pkgmetadata>
 	<longdescription>
 		The command line file manager.
-		By default most features are enabled, customizing this requires adding CFLAGS:
+		More information about the use flags can be found here:
 		https://github.com/leo-arch/clifm/blob/master/src/README.md#compiling-features-inout
 	</longdescription>
 	<maintainer type="person">
 		<email>michaelzcyang@gmail.com</email>
 		<name>Michael Yang</name>
 	</maintainer>
+	<use>
+		<flag name="archive">
+			Archive manipulation support (extraction/decompression, listing, repacking, mounting)
+		</flag>
+		<flag name="bleach">
+			Support for Bleach, the built-in file names cleaner
+		</flag>
+		<flag name="emoji">
+			Enable icons and set them to use the noto-emoji font (see <pkg>media-fonts/noto-emoji</pkg>)
+		</flag>
+		<flag name="fzf">
+			Enable support for tab completion via <pkg>app-shells/fzf</pkg>
+		</flag>
+		<flag name="highlight">
+			Syntax highlighting support
+		</flag>
+		<flag name="icons">
+			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="magic">
+			Use libmagic from <pkg>sys-apps/file</pkg> to query file MIME types (instead of using the output of the file command)
+		</flag>
+		<flag name="nerdfonts">
+			Enable icons and set them to use NerdFonts
+		</flag>
+		<flag name="nls">
+			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
+		</flag>
+		<flag name="profiles">
+			Enable support for creating, switching, renaming, and deleting of user profiles
+		</flag>
+		<flag name="qsort">
+			Use Alexey Tourbin's faster qsort implementation
+		</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>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/
@ 2023-07-24  8:20 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-07-24  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     9943af6d0350f28c91e0d4ab4b5bbdf453eec51d
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 08:19:46 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 08:19:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9943af6d

app-misc/clifm: remove duplicate identical files

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/clifm/clifm-1.13.ebuild                             |  2 +-
 app-misc/clifm/clifm-9999.ebuild                             |  2 +-
 .../files/clifm-1.13-gentoo-skip-manpage-compression.patch   | 12 ------------
 .../files/clifm-9999-gentoo-skip-manpage-compression.patch   | 12 ------------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/app-misc/clifm/clifm-1.13.ebuild b/app-misc/clifm/clifm-1.13.ebuild
index 2ea68d061..84c0a6294 100644
--- a/app-misc/clifm/clifm-1.13.ebuild
+++ b/app-misc/clifm/clifm-1.13.ebuild
@@ -24,7 +24,7 @@ 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"
+	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
 )
 
 LIB="

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index c309e5adc..ad6ef8581 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magi
 		nerdfonts nls posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
 )
 
 LIB="

diff --git a/app-misc/clifm/files/clifm-1.13-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.13-gentoo-skip-manpage-compression.patch
deleted file mode 100644
index 81dd76bba..000000000
--- a/app-misc/clifm/files/clifm-1.13-gentoo-skip-manpage-compression.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Skip manpage compression in makefile.
-
---- a/Makefile
-+++ b/Makefile
-@@ -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/completions.fish $(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(BIN).fish

diff --git a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
deleted file mode 100644
index 81dd76bba..000000000
--- a/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Skip manpage compression in makefile.
-
---- a/Makefile
-+++ b/Makefile
-@@ -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/completions.fish $(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(BIN).fish


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/
@ 2024-02-19  6:23 Michael Yang
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Yang @ 2024-02-19  6:23 UTC (permalink / raw
  To: gentoo-commits

commit:     c362af23885cedcef1d99ee332584547cf070d04
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 06:19:07 2024 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Mon Feb 19 06:23:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c362af23

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

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

 app-misc/clifm/Manifest                            |  4 ++--
 .../clifm/{clifm-1.15.ebuild => clifm-1.16.ebuild} | 10 ++++----
 .../clifm/{clifm-1.8.ebuild => clifm-1.17.ebuild}  | 28 +++++++++++++++-------
 app-misc/clifm/clifm-9999.ebuild                   |  6 ++---
 ...clifm-1.8-gentoo-skip-manpage-compression.patch | 12 ----------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index e2fede64a8..1a714d4985 100644
--- 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

diff --git a/app-misc/clifm/clifm-1.15.ebuild b/app-misc/clifm/clifm-1.16.ebuild
similarity index 89%
rename from app-misc/clifm/clifm-1.15.ebuild
rename to app-misc/clifm/clifm-1.16.ebuild
index b40de3f5ac..71dbe39437 100644
--- a/app-misc/clifm/clifm-1.15.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

diff --git a/app-misc/clifm/clifm-1.8.ebuild b/app-misc/clifm/clifm-1.17.ebuild
similarity index 73%
rename from app-misc/clifm/clifm-1.8.ebuild
rename to app-misc/clifm/clifm-1.17.ebuild
index 81235aa9d7..3c1fbf59b8 100644
--- a/app-misc/clifm/clifm-1.8.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

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index 3b93cd45a1..71dbe39437 100644
--- 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

diff --git 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
deleted file mode 100644
index 931001ad81..0000000000
--- a/app-misc/clifm/files/clifm-1.8-gentoo-skip-manpage-compression.patch
+++ /dev/null
@@ -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)


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-19  6:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-02 22:15 [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/, app-misc/clifm/files/ Michael Yang
  -- strict thread matches above, loose matches on Subject: below --
2024-02-19  6:23 Michael Yang
2023-07-24  8:20 Viorel Munteanu
2023-06-06  4:58 Michael Yang
2023-01-08  7:09 Michael Yang

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