public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/
@ 2022-07-29 19:19 Michael Yang
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Yang @ 2022-07-29 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     051516132e9e2d78d4aa2694d77de1fdd430ee4b
Author:     FluffyJay1 <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 19:17:28 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 19:17:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05151613

app-misc/clifm: new package, add 1.6, 9999

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

 app-misc/clifm/Manifest          |  1 +
 app-misc/clifm/clifm-1.6.ebuild  | 87 ++++++++++++++++++++++++++++++++++++++++
 app-misc/clifm/clifm-9999.ebuild | 87 ++++++++++++++++++++++++++++++++++++++++
 app-misc/clifm/metadata.xml      | 48 ++++++++++++++++++++++
 4 files changed, 223 insertions(+)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
new file mode 100644
index 000000000..a7bb68a4e
--- /dev/null
+++ b/app-misc/clifm/Manifest
@@ -0,0 +1 @@
+DIST clifm-1.6.tar.gz 1268633 BLAKE2B de36f0d3bc1c6584471d313f346a9db77f659b4fde41775e45c78066db12aff8bf33a58b3c5d0f9cd43800cf823f0508c2abb5c88ff50a28147aec5c7e7178df SHA512 a8f6b73070779d0d49b41109bee1b418cb6eb4fb1ac8e684cf859e1137336df2655ddfb5107b50674a5380364f572fe47cc72f58c25c4ff6439593b411a5f69e

diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
new file mode 100644
index 000000000..fbffa78e3
--- /dev/null
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -0,0 +1,87 @@
+# 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 flag-o-matic optfeature xdg
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
+	# also on github but seems like a worse alternative?
+	# SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+archives +bleach emoji-icons +highlight icons-in-terminal +lira
+		nerdfonts +suggestions +tags +trash"
+
+DEPEND="
+	sys-libs/libcap
+	sys-libs/readline
+	sys-apps/acl
+	sys-apps/file
+"
+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"
+}
+
+src_install() {
+	docompress -x /usr/share/man # makefile compresses man page
+	# makefile defaults to /usr/local, and manpages to /usr/man
+	emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed"
+	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:"
+	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
new file mode 100644
index 000000000..fbffa78e3
--- /dev/null
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -0,0 +1,87 @@
+# 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 flag-o-matic optfeature xdg
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
+	# also on github but seems like a worse alternative?
+	# SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+archives +bleach emoji-icons +highlight icons-in-terminal +lira
+		nerdfonts +suggestions +tags +trash"
+
+DEPEND="
+	sys-libs/libcap
+	sys-libs/readline
+	sys-apps/acl
+	sys-apps/file
+"
+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"
+}
+
+src_install() {
+	docompress -x /usr/share/man # makefile compresses man page
+	# makefile defaults to /usr/local, and manpages to /usr/man
+	emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed"
+	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:"
+	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
new file mode 100644
index 000000000..3f64b675d
--- /dev/null
+++ b/app-misc/clifm/metadata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		The command line file manager.
+		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>FluffyJay1</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>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/
@ 2022-07-29 21:43 Michael Yang
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Yang @ 2022-07-29 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     6d03d70e68b885d9d9c4a40855ffbd973fdb55d8
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 21:39:17 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 21:39:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d03d70e

app-misc/clifm: update maintainers

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

 app-misc/clifm/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/clifm/metadata.xml b/app-misc/clifm/metadata.xml
index 3f64b675d..afd332feb 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -8,7 +8,7 @@
 	</longdescription>
 	<maintainer type="person">
 		<email>michaelzcyang@gmail.com</email>
-		<name>FluffyJay1</name>
+		<name>Michael Yang</name>
 	</maintainer>
 	<use>
 		<flag name="archives">


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/
@ 2022-07-29 22:27 Michael Yang
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Yang @ 2022-07-29 22:27 UTC (permalink / raw
  To: gentoo-commits

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@gmail.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>


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

commit:     f4c123bf5881a3bed73e1aad52b82e94225e0359
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 21:58:54 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 22:12:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f4c123bf

app-misc/clifm: Fix filesize mismatch, fix RDEPEND as per qa-vdb

See https://bugs.gentoo.org/863062 for verification failure reason

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

 app-misc/clifm/clifm-1.6.ebuild  | 8 ++++----
 app-misc/clifm/clifm-9999.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
index 3bf60250b..a17478751 100644
--- a/app-misc/clifm/clifm-1.6.ebuild
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
-	# also on github but seems like a worse alternative?
-	# SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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
 
@@ -24,7 +24,7 @@ IUSE=""
 
 DEPEND="
 	sys-libs/libcap
-	sys-libs/readline
+	sys-libs/readline:=
 	sys-apps/acl
 	sys-apps/file
 "

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index 3bf60250b..a17478751 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/leo-arch/clifm.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://sourceforge/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
-	# also on github but seems like a worse alternative?
-	# SRC_URI="https://github.com/leo-arch/clifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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
 
@@ -24,7 +24,7 @@ IUSE=""
 
 DEPEND="
 	sys-libs/libcap
-	sys-libs/readline
+	sys-libs/readline:=
 	sys-apps/acl
 	sys-apps/file
 "


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

commit:     71e7fa21cb16b536c21ea187c91d75123e144b8a
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Mon Aug  8 21:00:01 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Mon Aug  8 21:00:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=71e7fa21

app-misc/clifm: fix update desktop mimeinfo cache

Closes: https://bugs.gentoo.org/864319
Signed-off-by: Michael Yang <michaelzcyang <AT> gmail.com>

 app-misc/clifm/clifm-1.6.ebuild  | 1 +
 app-misc/clifm/clifm-9999.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
index a17478751..826248a0c 100644
--- a/app-misc/clifm/clifm-1.6.ebuild
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -53,4 +53,5 @@ pkg_postinst() {
 	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-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index a17478751..826248a0c 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -53,4 +53,5 @@ pkg_postinst() {
 	optfeature "mounting archives" sys-fs/archivemount
 	optfeature "extracting .iso files" app-arch/p7zip
 	optfeature "creating .iso files" app-cdr/cdrtools
+	xdg_pkg_postinst
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/
@ 2022-08-27 21:34 Michael Yang
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Yang @ 2022-08-27 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     8619a7f7752bb3cc411ca2512cb32fbe3ccdcc23
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sat Aug 27 21:25:07 2022 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sat Aug 27 21:25:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8619a7f7

app-misc/clifm: add 1.7

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

 app-misc/clifm/Manifest         |  1 +
 app-misc/clifm/clifm-1.7.ebuild | 57 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index a7bb68a4e..6ff4bc8c7 100644
--- a/app-misc/clifm/Manifest
+++ b/app-misc/clifm/Manifest
@@ -1 +1,2 @@
 DIST clifm-1.6.tar.gz 1268633 BLAKE2B de36f0d3bc1c6584471d313f346a9db77f659b4fde41775e45c78066db12aff8bf33a58b3c5d0f9cd43800cf823f0508c2abb5c88ff50a28147aec5c7e7178df SHA512 a8f6b73070779d0d49b41109bee1b418cb6eb4fb1ac8e684cf859e1137336df2655ddfb5107b50674a5380364f572fe47cc72f58c25c4ff6439593b411a5f69e
+DIST clifm-1.7.tar.gz 1310379 BLAKE2B d37e5f4d013c7a7c8427993aa0ff187bac33cb8a89b75b368ce77eb11cbb3275f5cfabec1037e0b3052471633e763d22a7debe019c75ae6098f44cda0e9f7d70 SHA512 30bdc33090846b82edb2cf6372ca3515806f85261405476518d9b5cb1f9dc22e513263cac70f7d93bb85e6489b1486868964b1719637c1b317ce491b5734c453

diff --git a/app-misc/clifm/clifm-1.7.ebuild b/app-misc/clifm/clifm-1.7.ebuild
new file mode 100644
index 000000000..826248a0c
--- /dev/null
+++ b/app-misc/clifm/clifm-1.7.ebuild
@@ -0,0 +1,57 @@
+# 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=""
+
+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" || die "make failed"
+}
+
+src_install() {
+	docompress -x /usr/share/man # makefile compresses man page
+	# makefile defaults to /usr/local, and manpages to /usr/man
+	emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed"
+	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
+}


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

commit:     36dc55be0f94a254c3b9388f17d336d4fbae67b0
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 08:23:09 2023 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sat Sep 16 08:24:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36dc55be

app-misc/clifm: add 1.14, drop 1.12

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

 app-misc/clifm/Manifest                            |  2 +-
 .../clifm/{clifm-1.12.ebuild => clifm-1.14.ebuild} | 25 +++++++++++++++-------
 app-misc/clifm/clifm-9999.ebuild                   | 17 +++++++++------
 app-misc/clifm/metadata.xml                        |  5 ++++-
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index 9acace7364..fc594114eb 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.12.tar.gz 1448233 BLAKE2B 82c2a7502cd2955a6c89adc273129f88e660ab263f7718605f8bb0f533c79a1aa1ea2c4c0b203362f4a368bad9adcead02e6eb2f0f1bb9a8d09d9f1e9a8cf9c2 SHA512 4593a934bf07c186caad160d2a77b458177b9c38f58d720600ebfa4b7ad95238b1e58616b9b4d94435b736e7b55fc5f1981abce83ea4d6c5350e5f035823f9dd
 DIST clifm-1.13.tar.gz 1467612 BLAKE2B 06e6a986c1504ae2cbaa6e38daaf26c44d477102bdb0e67d529b35a066dbf6695841eb6fa69ed0379aca2028dfa327f98a8060c80f57c5f2653285ff4ed4a116 SHA512 3a1936b5517c6f8babb59a32af03e2408b9e3bd59fceb88c6101785f38175e71026128df07c46b05aa34ad4519063b6e80e22e29f0b277106a3b7d7e3341d584
+DIST clifm-1.14.tar.gz 1496682 BLAKE2B bcc0d8684bf5ef9e401a6ea3b83664be7faef5d973b20e58bef9ee6da4438d76ede73241d6b37d8cf3c0109ce319be753e3af9db22878bc90f75ce1a80dbb4e2 SHA512 c1ad19a4dd82ecffd45684de33c787df62cab99f704333d0c891c98b6aefabbc47432b4538cba289e7c7340d9d88fee4a6a06e871d2fa32c85fc005a5570cf44
 DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827

diff --git a/app-misc/clifm/clifm-1.12.ebuild b/app-misc/clifm/clifm-1.14.ebuild
similarity index 73%
rename from app-misc/clifm/clifm-1.12.ebuild
rename to app-misc/clifm/clifm-1.14.ebuild
index 976a8eef4d..9be798a4b4 100644
--- a/app-misc/clifm/clifm-1.12.ebuild
+++ b/app-misc/clifm/clifm-1.14.ebuild
@@ -20,11 +20,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
-		posix +profiles qsort +tags +trash"
+IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
+		+media nerdfonts nls posix +profiles qsort +tags +trash"
 
 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 )
 "
@@ -61,19 +67,22 @@ src_compile() {
 		fi
 	fi
 
-	use posix && append-cflags "-D_BE_POSIX"
-	use archive || append-cflags "-D_NO_ARCHIVING"
+	use posix && append-cflags "-DPOSIX_STRICT"
+	use archive && append-cflags "-DALLOW_ARCHIVING" || 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 "-D_NO_LIRA"
+	use lira && append-cflags "-DALLOW_LIRA" || append-cflags "-D_NO_LIRA"
 	use magic || append-cflags "-D_NO_MAGIC"
 	# -D_NO_SUGGESTIONS causes compile error
 	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"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
@@ -93,8 +102,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 ad6ef85817..c4e206521b 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
-		nerdfonts nls posix +profiles qsort +suggestions +tags +trash"
+		+media nerdfonts nls posix +profiles qsort +suggestions +tags +trash"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
@@ -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 )
 "
@@ -61,14 +67,14 @@ src_compile() {
 		fi
 	fi
 
-	use posix && append-cflags "-D_BE_POSIX"
-	use archive || append-cflags "-D_NO_ARCHIVING"
+	use posix && append-cflags "-DPOSIX_STRICT"
+	use archive && append-cflags "-DALLOW_ARCHIVING" || 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 "-D_NO_LIRA"
+	use lira && append-cflags "-DALLOW_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"
@@ -76,6 +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"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"
@@ -97,8 +104,6 @@ pkg_postinst() {
 	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
 		optfeature_header "Install additional archive support:"
 		optfeature "zstd support" app-arch/zstd

diff --git a/app-misc/clifm/metadata.xml b/app-misc/clifm/metadata.xml
index 34bf84a53c..fcc96cd1fa 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -41,6 +41,9 @@
 		<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="media">
+			Enable mounting/unmounting support (via the media and mountpoint commands) using either <pkg>sys-apps/udevil</pkg> or <pkg>sys-fs/udisks</pkg>
+		</flag>
 		<flag name="nerdfonts">
 			Enable icons and set them to use NerdFonts
 		</flag>
@@ -48,7 +51,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, inotify, and arc4random
+			Comply with POSIX.1-2008 as much as possible, removing support for Linux-specific "file birth time" information, inotify, and arc4random. Exceptions: for flags 'archive', 'media', and 'lira', although they require non-compliant functionality, enabling them selectively enables the non-compliant code, even with this flag set. (Hence, if your goal is POSIX compliance, make sure to disable those flags too!)
 		</flag>
 		<flag name="profiles">
 			Enable support for creating, switching, renaming, and deleting of user profiles


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/
@ 2024-01-07  8:29 Michael Yang
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Yang @ 2024-01-07  8:29 UTC (permalink / raw
  To: gentoo-commits

commit:     7a2b3769adbe9c759ef472f1ac30823ae963ae5d
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sun Jan  7 08:26:25 2024 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sun Jan  7 08:29:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a2b3769

app-misc/clifm: drop 1.14, add 1.15

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

 app-misc/clifm/Manifest                                 | 2 +-
 app-misc/clifm/{clifm-1.14.ebuild => clifm-1.15.ebuild} | 3 ++-
 app-misc/clifm/clifm-9999.ebuild                        | 3 ++-
 app-misc/clifm/metadata.xml                             | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index fc594114eb..e2fede64a8 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.14.tar.gz 1496682 BLAKE2B bcc0d8684bf5ef9e401a6ea3b83664be7faef5d973b20e58bef9ee6da4438d76ede73241d6b37d8cf3c0109ce319be753e3af9db22878bc90f75ce1a80dbb4e2 SHA512 c1ad19a4dd82ecffd45684de33c787df62cab99f704333d0c891c98b6aefabbc47432b4538cba289e7c7340d9d88fee4a6a06e871d2fa32c85fc005a5570cf44
+DIST clifm-1.15.tar.gz 1511851 BLAKE2B 2329717f234400159045654e521e6ae510b6d8cdca2b72e715a814e5642dba2760869a6035baca844a3717ef8cc4e0af1b0967d7f3b16b20dfceb6cdca72a2c0 SHA512 812d1ebb0d8b157e60bc55102e74738e611dd609294eb65da5b1aac4ee3cff947558dde658037c9558113266e92525582aac22a3ed084797367166b4d41ce9c1
 DIST clifm-1.8.tar.gz 1302830 BLAKE2B 87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6 SHA512 4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827

diff --git a/app-misc/clifm/clifm-1.14.ebuild b/app-misc/clifm/clifm-1.15.ebuild
similarity index 96%
rename from app-misc/clifm/clifm-1.14.ebuild
rename to app-misc/clifm/clifm-1.15.ebuild
index 9be798a4b4..b40de3f5ac 100644
--- a/app-misc/clifm/clifm-1.14.ebuild
+++ b/app-misc/clifm/clifm-1.15.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"
+		+media nerdfonts nls posix +profiles qsort +tags +trash xdu"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
@@ -83,6 +83,7 @@ src_compile() {
 	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 xdu && append-cflags "-DUSE_XDU"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index c4e206521b..3b93cd45a1 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.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 +suggestions +tags +trash"
+		+media nerdfonts nls posix +profiles qsort +suggestions +tags +trash xdu"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
@@ -83,6 +83,7 @@ src_compile() {
 	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 xdu && append-cflags "-DUSE_XDU"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"

diff --git a/app-misc/clifm/metadata.xml b/app-misc/clifm/metadata.xml
index fcc96cd1fa..0174da84e0 100644
--- a/app-misc/clifm/metadata.xml
+++ b/app-misc/clifm/metadata.xml
@@ -68,6 +68,9 @@
 		<flag name="trash">
 			FreeDesktop compliant trash system support
 		</flag>
+		<flag name="xdu">
+			Use a home-made implementation of du(1) instead
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">leo-arch/clifm</remote-id>


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

commit:     cdf00568364f9700a9e03155494af7b57cbd9f82
Author:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sun May  5 08:19:41 2024 +0000
Commit:     Michael Yang <michaelzcyang <AT> gmail <DOT> com>
CommitDate: Sun May  5 08:22:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cdf00568

app-misc/clifm: Update 9999, add 1.18, drop 1.17

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

 app-misc/clifm/Manifest                            |   2 +-
 app-misc/clifm/clifm-1.17.ebuild                   | 114 ---------------------
 .../clifm/{clifm-9999.ebuild => clifm-1.18.ebuild} |   0
 app-misc/clifm/clifm-9999.ebuild                   |   2 +-
 4 files changed, 2 insertions(+), 116 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index 1a714d4985..a6805d56f6 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.16.tar.gz 1518525 BLAKE2B 976e5ca80d29b11467d18375ac7f897cd14ed7f629bb20108b1bcd1f74d81fbdabf6a21ea21ada786a8ff7ae3bdf720e189466cf48cbe5e6c635965e8eb659db SHA512 4c715d8d5be9d93cf83574cfd2c5ad99e3da4af19c201194c923031b9c432cbb281b520e1fac6e5d42a52114c8af4d993fed918554002489adb613cf21277283
-DIST clifm-1.17.tar.gz 1525172 BLAKE2B 96b303b4d07d83de915c3c05d28c6de26ded4bee5799153e6876bb778401e33983d993ce300297f52468cd7884e1e33c2206dc99476f43dd74e1444967d65502 SHA512 e5ef5c61e2201bcb925e960c86387254bace7f5d4f9c5f76a66540394d5d30453a780c6e967c6fc2b86550e30afe2079776fd2dfaaa116209d0fc8644fba529f
+DIST clifm-1.18.tar.gz 1542813 BLAKE2B 1384d16226cdd6c99c990afe7b249fa91a04afcca3b6557bdb3551a3bbd299ed308fe21f4e0b70aa166e49d390acda05735facffbff20b30a40344bd058511cd SHA512 fe18e164ccee9c4e8474be0d29960cf145fe60678b1c0cd78415ff1c9371fb272c9c78dde85396f488295d4642e9778fa7637add6441788d4bc4fc4da5d7de28

diff --git a/app-misc/clifm/clifm-1.17.ebuild b/app-misc/clifm/clifm-1.17.ebuild
deleted file mode 100644
index 8de178c4de..0000000000
--- a/app-misc/clifm/clifm-1.17.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2022-2024 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 flag-o-matic 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="https://downloads.sourceforge.net/${PN}/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="arc4random archive +bleach emoji fzf +highlight icons +inotify +lira +magic
-		+media nerdfonts nls posix +profiles qsort +suggestions +tags +trash xdu"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12-gentoo-skip-manpage-compression.patch"
-)
-
-LIB="
-	sys-libs/libcap
-	sys-libs/readline:=
-	sys-apps/acl
-	magic? ( sys-apps/file )
-"
-
-DEPEND="
-	${LIB}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${LIB}
-	archive? (
-		app-arch/atool
-		sys-fs/archivemount
-	)
-	media? (
-		|| (
-			sys-apps/udevil
-			sys-fs/udisks
-		)
-	)
-	fzf? ( app-shells/fzf )
-	nls? ( virtual/libintl )
-"
-
-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
-			# the following line is desired but would cause a compile error
-			# append-cflags "-D_NO_ICONS"
-		fi
-	fi
-
-	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"
-	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"
-	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"
-}
-
-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() {
-	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
-	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
-		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-1.18.ebuild
similarity index 100%
copy from app-misc/clifm/clifm-9999.ebuild
copy to app-misc/clifm/clifm-1.18.ebuild

diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index 1f315d9876..93b9ceb1d7 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -82,7 +82,7 @@ src_compile() {
 	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"
+	use xdu || append-cflags "-DUSE_DU1"
 
 	# makefile defaults to /usr/local
 	emake PREFIX="/usr"


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-05-05  8:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-29 19:19 [gentoo-commits] repo/proj/guru:dev commit in: app-misc/clifm/ Michael Yang
  -- strict thread matches above, loose matches on Subject: below --
2022-07-29 21:43 Michael Yang
2022-07-29 22:27 Michael Yang
2022-08-02 22:12 Michael Yang
2022-08-08 21:06 Michael Yang
2022-08-27 21:34 Michael Yang
2023-09-16  8:24 Michael Yang
2024-01-07  8:29 Michael Yang
2024-05-05  8:22 Michael Yang

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