From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5D97158137 for ; Sun, 11 Jun 2023 11:47:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFC1AE08FC; Sun, 11 Jun 2023 11:47:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D8B9E08FB for ; Sun, 11 Jun 2023 11:47:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C6CE3412C0 for ; Sun, 11 Jun 2023 11:47:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 108EFA93 for ; Sun, 11 Jun 2023 11:47:26 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1686446434.cd81f48e2fb5bd713ea807066801551de3e26064.ceamac@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-misc/clifm/, app-misc/clifm/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/clifm/Manifest app-misc/clifm/clifm-1.12.ebuild app-misc/clifm/clifm-1.9.ebuild app-misc/clifm/files/clifm-1.12-gentoo-skip-manpage-compression.patch app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch X-VCS-Directories: app-misc/clifm/ app-misc/clifm/files/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: cd81f48e2fb5bd713ea807066801551de3e26064 X-VCS-Branch: master Date: Sun, 11 Jun 2023 11:47:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3cbb0bc7-c99b-494f-bfd6-70f48f8854d7 X-Archives-Hash: 536943f255897f4afba0b84f89c0148f commit: cd81f48e2fb5bd713ea807066801551de3e26064 Author: Michael Yang gmail com> AuthorDate: Sun Jun 11 01:18:56 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sun Jun 11 01:20:34 2023 +0000 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 support" sys-apps/udevil sys-fs/udisks - optfeature "fzf tab completion and more" app-shells/fzf if use archive; then optfeature_header "Install additional archive support:" optfeature "zstd support" app-arch/zstd diff --git a/app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-1.12-gentoo-skip-manpage-compression.patch similarity index 70% rename from app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch rename to app-misc/clifm/files/clifm-1.12-gentoo-skip-manpage-compression.patch index 20406d986..81dd76bba 100644 --- a/app-misc/clifm/files/clifm-1.9-gentoo-skip-manpage-compression.patch +++ b/app-misc/clifm/files/clifm-1.12-gentoo-skip-manpage-compression.patch @@ -2,11 +2,11 @@ Skip manpage compression in makefile. --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ install: $(BIN) - $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions +@@ -55,7 +55,6 @@ install: $(BIN) + $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPPREFIX) $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps $(INSTALL) -m 0644 misc/manpage $(DESTDIR)$(MANDIR)/man1/$(BIN).1 - gzip -f -- $(DESTDIR)$(MANDIR)/man1/$(BIN).1 $(INSTALL) -m 0644 misc/completions.bash $(DESTDIR)$(DATADIR)/bash-completion/completions/$(BIN) $(INSTALL) -m 0644 misc/completions.zsh $(DESTDIR)$(DATADIR)/zsh/site-functions/_$(BIN) - $(INSTALL) -m 0644 misc/$(BIN).desktop $(DESTDIR)$(DESKTOPPREFIX) + $(INSTALL) -m 0644 misc/completions.fish $(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(BIN).fish