diff options
author | Michael Yang <michaelzcyang@gmail.com> | 2022-09-02 22:18:46 -0700 |
---|---|---|
committer | Michael Yang <michaelzcyang@gmail.com> | 2022-09-02 22:22:41 -0700 |
commit | 21085e8339a90938539e9ef6d6e9bae75c3177f9 (patch) | |
tree | 76c652957f112979ea3cc144f34f776ef1b079fd | |
parent | net-libs/picotls: new package, add 0_pre20220721, 9999 (diff) | |
download | guru-21085e83.tar.gz guru-21085e83.tar.bz2 guru-21085e83.zip |
app-misc/clifm: Skip Makefile manpage compression via patches instead
also remove unnecessary "die"s
Signed-off-by: Michael Yang <michaelzcyang@gmail.com>
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-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild index 826248a0c..d13334589 100644 --- a/app-misc/clifm/clifm-9999.ebuild +++ b/app-misc/clifm/clifm-9999.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 000000000..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 000000000..9201488ff --- /dev/null +++ b/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch @@ -0,0 +1,10 @@ +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,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 +- 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-9999-gentoo-skip-manpage-compression.patch b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch new file mode 100644 index 000000000..9201488ff --- /dev/null +++ b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch @@ -0,0 +1,10 @@ +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,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 +- 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) |