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"
