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

2024-05-05 Thread Julien Roy 
commit: cdf00568364f9700a9e03155494af7b57cbd9f82
Author: Michael Yang  gmail  com>
AuthorDate: Sun May  5 08:19:41 2024 +
Commit: Julien Roy  jroy  ca>
CommitDate: Sun May  5 08:22:47 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cdf00568

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

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/Manifest|   2 +-
 app-misc/clifm/clifm-1.17.ebuild   | 114 -
 .../clifm/{clifm-.ebuild => clifm-1.18.ebuild} |   0
 app-misc/clifm/clifm-.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..00
--- 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} == "" ]]; 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"
-

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/

2024-02-19 Thread David Roman 
commit: c362af23885cedcef1d99ee332584547cf070d04
Author: Michael Yang  gmail  com>
AuthorDate: Mon Feb 19 06:19:07 2024 +
Commit: David Roman  gmail  com>
CommitDate: Mon Feb 19 06:23:28 2024 +
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  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-.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

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

2024-01-07 Thread David Roman 
commit: 7a2b3769adbe9c759ef472f1ac30823ae963ae5d
Author: Michael Yang  gmail  com>
AuthorDate: Sun Jan  7 08:26:25 2024 +
Commit: David Roman  gmail  com>
CommitDate: Sun Jan  7 08:29:08 2024 +
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  gmail.com>

 app-misc/clifm/Manifest | 2 +-
 app-misc/clifm/{clifm-1.14.ebuild => clifm-1.15.ebuild} | 3 ++-
 app-misc/clifm/clifm-.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-.ebuild b/app-misc/clifm/clifm-.ebuild
index c4e206521b..3b93cd45a1 100644
--- a/app-misc/clifm/clifm-.ebuild
+++ b/app-misc/clifm/clifm-.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 @@

FreeDesktop compliant trash system support

+   
+   Use a home-made implementation of du(1) instead
+   


leo-arch/clifm

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

2023-09-18 Thread Florian Schmaus 
commit: 36dc55be0f94a254c3b9388f17d336d4fbae67b0
Author: Michael Yang  gmail  com>
AuthorDate: Sat Sep 16 08:23:09 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Sep 16 08:24:09 2023 +
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  gmail.com>

 app-misc/clifm/Manifest|  2 +-
 .../clifm/{clifm-1.12.ebuild => clifm-1.14.ebuild} | 25 +++---
 app-misc/clifm/clifm-.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

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/files/, app-misc/clifm/

2023-07-24 Thread Viorel Munteanu 
commit: cbfcf8a92802d65e62688a2b74fdf221cdb31943
Author: Michael Yang  gmail  com>
AuthorDate: Mon Jul 24 01:12:15 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Jul 24 01:13:25 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cbfcf8a9

app-misc/clifm: add 1.13, drop 1.10

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/Manifest   |  2 +-
 .../clifm/{clifm-1.10.ebuild => clifm-1.13.ebuild}| 19 ++-
 app-misc/clifm/clifm-.ebuild  |  8 ++--
 ... clifm-1.13-gentoo-skip-manpage-compression.patch} |  6 +++---
 app-misc/clifm/metadata.xml   |  8 +++-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index d37bb516f..9acace736 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.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.8.tar.gz 1302830 BLAKE2B 
87e7dc41053af6ccbd819ec0403ca14aeb40865ea49ab87e8601765be771b5e447f593ffb9f94674dbc2afbdb67849a5a8a1d2b26ab524479c4edbfb2c4c79a6
 SHA512 
4b534f4c33462dd6571d69a5b0405295580d980f7c5c43f0893828c7ab624eb366f7e617a97b0357a26663df3c25b1cb2c175ee372f8c18e9b3f061186b76827

diff --git a/app-misc/clifm/clifm-1.10.ebuild b/app-misc/clifm/clifm-1.13.ebuild
similarity index 84%
rename from app-misc/clifm/clifm-1.10.ebuild
rename to app-misc/clifm/clifm-1.13.ebuild
index fd5924273..2ea68d061 100644
--- a/app-misc/clifm/clifm-1.10.ebuild
+++ b/app-misc/clifm/clifm-1.13.ebuild
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji +highlight icons +lira +magic nerdfonts nls
-   posix qsort +suggestions +tags"
+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"
@@ -44,6 +44,7 @@ RDEPEND="
app-arch/atool
sys-fs/archivemount
)
+   fzf? ( app-shells/fzf )
nls? ( virtual/libintl )
 "
 BDEPEND=""
@@ -55,22 +56,25 @@ src_compile() {
append-cflags "-D_NERD"
elif use icons; then
append-cflags "-D_ICONS_IN_TERMINAL"
+   else
+   append-cflags "-D_NO_ICONS"
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 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"
-   # -D_NO_TRASH causes compile error
+   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"
 
# makefile defaults to /usr/local
emake PREFIX="/usr"
@@ -89,13 +93,10 @@ pkg_postinst() {
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, \
-

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/

2023-06-11 Thread Viorel Munteanu 
commit: cd81f48e2fb5bd713ea807066801551de3e26064
Author: Michael Yang  gmail  com>
AuthorDate: Sun Jun 11 01:18:56 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jun 11 01:20:34 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd81f48e

app-misc/clifm: add 1.12, drop 1.9

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/Manifest   |  2 +-
 .../clifm/{clifm-1.9.ebuild => clifm-1.12.ebuild} | 19 +--
 ... clifm-1.12-gentoo-skip-manpage-compression.patch} |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index 654ecf0d1..d37bb516f 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.11.tar.gz 1378500 BLAKE2B 
ea1cb37bb61538c1b64bbafdce5adee977bf14fb2deb7b4b54ae1a4e39824543dbd23e9c63563228e30ae35ce9d22d7c11b0b18e370310a5e5c9a60f1b425275
 SHA512 
5075dab38000f0eb026cacc1d31b8f3e20157d4ec19e84f5f271ffae9a4f99aa03411d6d47470eb37879bbe497c7747db90a7f4ac7760439f67f1a3537cb77e2
+DIST clifm-1.12.tar.gz 1448233 BLAKE2B 
82c2a7502cd2955a6c89adc273129f88e660ab263f7718605f8bb0f533c79a1aa1ea2c4c0b203362f4a368bad9adcead02e6eb2f0f1bb9a8d09d9f1e9a8cf9c2
 SHA512 
4593a934bf07c186caad160d2a77b458177b9c38f58d720600ebfa4b7ad95238b1e58616b9b4d94435b736e7b55fc5f1981abce83ea4d6c5350e5f035823f9dd
 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.9.ebuild b/app-misc/clifm/clifm-1.12.ebuild
similarity index 82%
rename from app-misc/clifm/clifm-1.9.ebuild
rename to app-misc/clifm/clifm-1.12.ebuild
index fd5924273..976a8eef4 100644
--- a/app-misc/clifm/clifm-1.9.ebuild
+++ b/app-misc/clifm/clifm-1.12.ebuild
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="archive +bleach emoji +highlight icons +lira +magic nerdfonts nls
-   posix qsort +suggestions +tags"
+IUSE="archive +bleach emoji fzf +highlight icons +lira +magic nerdfonts nls
+   posix +profiles qsort +tags +trash"
 
 PATCHES=(
"${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
@@ -44,6 +44,7 @@ RDEPEND="
app-arch/atool
sys-fs/archivemount
)
+   fzf? ( app-shells/fzf )
nls? ( virtual/libintl )
 "
 BDEPEND=""
@@ -55,21 +56,23 @@ src_compile() {
append-cflags "-D_NERD"
elif use icons; then
append-cflags "-D_ICONS_IN_TERMINAL"
+   else
+   append-cflags "-D_NO_ICONS"
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 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"
+   # -D_NO_SUGGESTIONS causes compile error
use tags || append-cflags "-D_NO_TAGS"
-   # -D_NO_TRASH causes compile error
+   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
@@ -89,13 +92,9 @@ pkg_postinst() {
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

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/files/, app-misc/clifm/

2023-06-07 Thread Viorel Munteanu 
commit: 947dc7fb3404c47e396b9fbb705cda0274e5a9cc
Author: Michael Yang  gmail  com>
AuthorDate: Tue Jun  6 04:49:58 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Tue Jun  6 04:57:35 2023 +
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  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-.ebuild   | 72 +-
 ...lifm--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} == "" ]]; 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

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/

2023-04-04 Thread Florian Schmaus 
commit: 2af9fe3718bc68511b047ad33815d22380a8cc7f
Author: Michael Yang  gmail  com>
AuthorDate: Sun Apr  2 22:13:52 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Apr  2 22:13:52 2023 +
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  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

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/

2023-03-13 Thread Viorel Munteanu 
commit: e2dad95f64fcccf52958929e567e6b385c7c8718
Author: Michael Yang  gmail  com>
AuthorDate: Sun Mar 12 23:38:45 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Mar 12 23:38:45 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e2dad95f

app-misc/clifm: add 1.10, drop 1.6

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/Manifest|  2 +-
 app-misc/clifm/{clifm-1.6.ebuild => clifm-1.10.ebuild} |  0
 patch => clifm-1.10-gentoo-skip-manpage-compression.patch} |  0
 .../files/clifm-1.6-gentoo-skip-manpage-compression.patch  | 10 --
 .../files/clifm--gentoo-skip-manpage-compression.patch |  2 +-
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app-misc/clifm/Manifest b/app-misc/clifm/Manifest
index 12627bdee..dcc3817a5 100644
--- a/app-misc/clifm/Manifest
+++ b/app-misc/clifm/Manifest
@@ -1,4 +1,4 @@
-DIST clifm-1.6.tar.gz 1268633 BLAKE2B 
de36f0d3bc1c6584471d313f346a9db77f659b4fde41775e45c78066db12aff8bf33a58b3c5d0f9cd43800cf823f0508c2abb5c88ff50a28147aec5c7e7178df
 SHA512 
a8f6b73070779d0d49b41109bee1b418cb6eb4fb1ac8e684cf859e1137336df2655ddfb5107b50674a5380364f572fe47cc72f58c25c4ff6439593b411a5f69e
+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.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.6.ebuild b/app-misc/clifm/clifm-1.10.ebuild
similarity index 100%
rename from app-misc/clifm/clifm-1.6.ebuild
rename to app-misc/clifm/clifm-1.10.ebuild

diff --git 
a/app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch 
b/app-misc/clifm/files/clifm-1.10-gentoo-skip-manpage-compression.patch
similarity index 100%
copy from app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch
copy to app-misc/clifm/files/clifm-1.10-gentoo-skip-manpage-compression.patch

diff --git 
a/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch 
b/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch
deleted file mode 100644
index f15172e66..0
--- a/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -49,7 +49,6 @@ install: build
-   $(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)

diff --git 
a/app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch 
b/app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch
index 20406d986..365df14c7 100644
--- a/app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch
+++ b/app-misc/clifm/files/clifm--gentoo-skip-manpage-compression.patch
@@ -2,7 +2,7 @@ Skip manpage compression in makefile.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -53,7 +53,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

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/files/, app-misc/clifm/

2023-01-08 Thread Florian Schmaus 
commit: 69f6e24cd3f59d0aff9029f1c9cba07c9ff9a800
Author: Michael Yang  gmail  com>
AuthorDate: Sun Jan  8 07:04:56 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan  8 07:04:56 2023 +
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  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--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 0..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} == "" ]]; 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 0..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} == "" ]]; 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 ->

[gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/

2022-09-05 Thread Ronny Gutbrod 
commit: 21085e8339a90938539e9ef6d6e9bae75c3177f9
Author: Michael Yang  gmail  com>
AuthorDate: Sat Sep  3 05:18:46 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Sat Sep  3 05:22:41 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21085e83

app-misc/clifm: Skip Makefile manpage compression via patches instead

also remove unnecessary "die"s

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/clifm-1.6.ebuild|  9 ++---
 app-misc/clifm/clifm-1.7.ebuild|  9 ++---
 app-misc/clifm/clifm-.ebuild   |  9 ++---
 .../files/clifm-1.6-gentoo-skip-manpage-compression.patch  | 10 ++
 .../files/clifm-1.7-gentoo-skip-manpage-compression.patch  | 10 ++
 .../files/clifm--gentoo-skip-manpage-compression.patch | 10 ++
 6 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
index 826248a0c..d13334589 100644
--- a/app-misc/clifm/clifm-1.6.ebuild
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -22,6 +22,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
+PATCHES=(
+   "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+)
+
 DEPEND="
sys-libs/libcap
sys-libs/readline:=
@@ -33,13 +37,12 @@ BDEPEND=""
 
 src_compile() {
# makefile defaults to /usr/local
-   emake PREFIX="/usr" || die "make failed"
+   emake PREFIX="/usr"
 }
 
 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"
+   emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install
einstalldocs
 }
 

diff --git a/app-misc/clifm/clifm-1.7.ebuild b/app-misc/clifm/clifm-1.7.ebuild
index 826248a0c..d13334589 100644
--- a/app-misc/clifm/clifm-1.7.ebuild
+++ b/app-misc/clifm/clifm-1.7.ebuild
@@ -22,6 +22,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
+PATCHES=(
+   "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+)
+
 DEPEND="
sys-libs/libcap
sys-libs/readline:=
@@ -33,13 +37,12 @@ BDEPEND=""
 
 src_compile() {
# makefile defaults to /usr/local
-   emake PREFIX="/usr" || die "make failed"
+   emake PREFIX="/usr"
 }
 
 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"
+   emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install
einstalldocs
 }
 

diff --git a/app-misc/clifm/clifm-.ebuild b/app-misc/clifm/clifm-.ebuild
index 826248a0c..d13334589 100644
--- a/app-misc/clifm/clifm-.ebuild
+++ b/app-misc/clifm/clifm-.ebuild
@@ -22,6 +22,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
+PATCHES=(
+   "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch"
+)
+
 DEPEND="
sys-libs/libcap
sys-libs/readline:=
@@ -33,13 +37,12 @@ BDEPEND=""
 
 src_compile() {
# makefile defaults to /usr/local
-   emake PREFIX="/usr" || die "make failed"
+   emake PREFIX="/usr"
 }
 
 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"
+   emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install
einstalldocs
 }
 

diff --git 
a/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch 
b/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch
new file mode 100644
index 0..f15172e66
--- /dev/null
+++ b/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
 b/Makefile
+@@ -49,7 +49,6 @@ install: build
+   $(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)

diff --git 
a/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch 
b/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch
new file mode 100644
index 0..9201488ff
--- /dev/null
+++ b/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
 b/Makefile
+@@

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

2022-08-11 Thread Andrew Ammerlaan 
commit: 71e7fa21cb16b536c21ea187c91d75123e144b8a
Author: Michael Yang  gmail  com>
AuthorDate: Mon Aug  8 21:00:01 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Aug  8 21:00:01 2022 +
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  gmail.com>

 app-misc/clifm/clifm-1.6.ebuild  | 1 +
 app-misc/clifm/clifm-.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-.ebuild b/app-misc/clifm/clifm-.ebuild
index a17478751..826248a0c 100644
--- a/app-misc/clifm/clifm-.ebuild
+++ b/app-misc/clifm/clifm-.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
 }

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

2022-08-02 Thread Haelwenn Monnier 
commit: 466cac6577a2673168bb7d1e106aab47a453e420
Author: Michael Yang  gmail  com>
AuthorDate: Fri Jul 29 22:24:30 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Fri Jul 29 22:24:30 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=466cac65

app-misc/clifm: Remove unnecessary use flags

Signed-off-by: Michael Yang  gmail.com>

 app-misc/clifm/clifm-1.6.ebuild  | 37 +++--
 app-misc/clifm/clifm-.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} == "" ]]; 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-.ebuild b/app-misc/clifm/clifm-.ebuild
index fbffa78e3..3bf60250b 100644
--- a/app-misc/clifm/clifm-.ebuild
+++ b/app-misc/clifm/clifm-.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} == "" ]]; 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 ||