commit: 36dc55be0f94a254c3b9388f17d336d4fbae67b0
Author: Michael Yang <michaelzcyang <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 08:23:09 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
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
