| 1 |
commit: 21085e8339a90938539e9ef6d6e9bae75c3177f9 |
| 2 |
Author: Michael Yang <michaelzcyang <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Sep 3 05:18:46 2022 +0000 |
| 4 |
Commit: Michael Yang <michaelzcyang <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Sep 3 05:22:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21085e83 |
| 7 |
|
| 8 |
app-misc/clifm: Skip Makefile manpage compression via patches instead |
| 9 |
|
| 10 |
also remove unnecessary "die"s |
| 11 |
|
| 12 |
Signed-off-by: Michael Yang <michaelzcyang <AT> gmail.com> |
| 13 |
|
| 14 |
app-misc/clifm/clifm-1.6.ebuild | 9 ++++++--- |
| 15 |
app-misc/clifm/clifm-1.7.ebuild | 9 ++++++--- |
| 16 |
app-misc/clifm/clifm-9999.ebuild | 9 ++++++--- |
| 17 |
.../files/clifm-1.6-gentoo-skip-manpage-compression.patch | 10 ++++++++++ |
| 18 |
.../files/clifm-1.7-gentoo-skip-manpage-compression.patch | 10 ++++++++++ |
| 19 |
.../files/clifm-9999-gentoo-skip-manpage-compression.patch | 10 ++++++++++ |
| 20 |
6 files changed, 48 insertions(+), 9 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild |
| 23 |
index 826248a0c..d13334589 100644 |
| 24 |
--- a/app-misc/clifm/clifm-1.6.ebuild |
| 25 |
+++ b/app-misc/clifm/clifm-1.6.ebuild |
| 26 |
@@ -22,6 +22,10 @@ LICENSE="GPL-2" |
| 27 |
SLOT="0" |
| 28 |
IUSE="" |
| 29 |
|
| 30 |
+PATCHES=( |
| 31 |
+ "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch" |
| 32 |
+) |
| 33 |
+ |
| 34 |
DEPEND=" |
| 35 |
sys-libs/libcap |
| 36 |
sys-libs/readline:= |
| 37 |
@@ -33,13 +37,12 @@ BDEPEND="" |
| 38 |
|
| 39 |
src_compile() { |
| 40 |
# makefile defaults to /usr/local |
| 41 |
- emake PREFIX="/usr" || die "make failed" |
| 42 |
+ emake PREFIX="/usr" |
| 43 |
} |
| 44 |
|
| 45 |
src_install() { |
| 46 |
- docompress -x /usr/share/man # makefile compresses man page |
| 47 |
# makefile defaults to /usr/local, and manpages to /usr/man |
| 48 |
- emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed" |
| 49 |
+ emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install |
| 50 |
einstalldocs |
| 51 |
} |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/app-misc/clifm/clifm-1.7.ebuild b/app-misc/clifm/clifm-1.7.ebuild |
| 55 |
index 826248a0c..d13334589 100644 |
| 56 |
--- a/app-misc/clifm/clifm-1.7.ebuild |
| 57 |
+++ b/app-misc/clifm/clifm-1.7.ebuild |
| 58 |
@@ -22,6 +22,10 @@ LICENSE="GPL-2" |
| 59 |
SLOT="0" |
| 60 |
IUSE="" |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch" |
| 64 |
+) |
| 65 |
+ |
| 66 |
DEPEND=" |
| 67 |
sys-libs/libcap |
| 68 |
sys-libs/readline:= |
| 69 |
@@ -33,13 +37,12 @@ BDEPEND="" |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
# makefile defaults to /usr/local |
| 73 |
- emake PREFIX="/usr" || die "make failed" |
| 74 |
+ emake PREFIX="/usr" |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
- docompress -x /usr/share/man # makefile compresses man page |
| 79 |
# makefile defaults to /usr/local, and manpages to /usr/man |
| 80 |
- emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed" |
| 81 |
+ emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install |
| 82 |
einstalldocs |
| 83 |
} |
| 84 |
|
| 85 |
|
| 86 |
diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild |
| 87 |
index 826248a0c..d13334589 100644 |
| 88 |
--- a/app-misc/clifm/clifm-9999.ebuild |
| 89 |
+++ b/app-misc/clifm/clifm-9999.ebuild |
| 90 |
@@ -22,6 +22,10 @@ LICENSE="GPL-2" |
| 91 |
SLOT="0" |
| 92 |
IUSE="" |
| 93 |
|
| 94 |
+PATCHES=( |
| 95 |
+ "${FILESDIR}/${P}-gentoo-skip-manpage-compression.patch" |
| 96 |
+) |
| 97 |
+ |
| 98 |
DEPEND=" |
| 99 |
sys-libs/libcap |
| 100 |
sys-libs/readline:= |
| 101 |
@@ -33,13 +37,12 @@ BDEPEND="" |
| 102 |
|
| 103 |
src_compile() { |
| 104 |
# makefile defaults to /usr/local |
| 105 |
- emake PREFIX="/usr" || die "make failed" |
| 106 |
+ emake PREFIX="/usr" |
| 107 |
} |
| 108 |
|
| 109 |
src_install() { |
| 110 |
- docompress -x /usr/share/man # makefile compresses man page |
| 111 |
# makefile defaults to /usr/local, and manpages to /usr/man |
| 112 |
- emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install || die "install failed" |
| 113 |
+ emake DESTDIR="${D}" PREFIX="/usr" MANDIR="/usr/share/man" install |
| 114 |
einstalldocs |
| 115 |
} |
| 116 |
|
| 117 |
|
| 118 |
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 |
| 119 |
new file mode 100644 |
| 120 |
index 000000000..f15172e66 |
| 121 |
--- /dev/null |
| 122 |
+++ b/app-misc/clifm/files/clifm-1.6-gentoo-skip-manpage-compression.patch |
| 123 |
@@ -0,0 +1,10 @@ |
| 124 |
+--- a/Makefile |
| 125 |
++++ b/Makefile |
| 126 |
+@@ -49,7 +49,6 @@ install: build |
| 127 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions |
| 128 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps |
| 129 |
+ $(INSTALL) -m 0644 misc/manpage $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 130 |
+- gzip -f -- $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 131 |
+ $(INSTALL) -m 0644 misc/completions.bash $(DESTDIR)$(DATADIR)/bash-completion/completions/$(BIN) |
| 132 |
+ $(INSTALL) -m 0644 misc/completions.zsh $(DESTDIR)$(DATADIR)/zsh/site-functions/_$(BIN) |
| 133 |
+ $(INSTALL) -m 0644 misc/$(BIN).desktop $(DESTDIR)$(DESKTOPPREFIX) |
| 134 |
|
| 135 |
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 |
| 136 |
new file mode 100644 |
| 137 |
index 000000000..9201488ff |
| 138 |
--- /dev/null |
| 139 |
+++ b/app-misc/clifm/files/clifm-1.7-gentoo-skip-manpage-compression.patch |
| 140 |
@@ -0,0 +1,10 @@ |
| 141 |
+--- a/Makefile |
| 142 |
++++ b/Makefile |
| 143 |
+@@ -51,7 +51,6 @@ install: $(BIN) |
| 144 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions |
| 145 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps |
| 146 |
+ $(INSTALL) -m 0644 misc/manpage $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 147 |
+- gzip -f -- $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 148 |
+ $(INSTALL) -m 0644 misc/completions.bash $(DESTDIR)$(DATADIR)/bash-completion/completions/$(BIN) |
| 149 |
+ $(INSTALL) -m 0644 misc/completions.zsh $(DESTDIR)$(DATADIR)/zsh/site-functions/_$(BIN) |
| 150 |
+ $(INSTALL) -m 0644 misc/$(BIN).desktop $(DESTDIR)$(DESKTOPPREFIX) |
| 151 |
|
| 152 |
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 |
| 153 |
new file mode 100644 |
| 154 |
index 000000000..9201488ff |
| 155 |
--- /dev/null |
| 156 |
+++ b/app-misc/clifm/files/clifm-9999-gentoo-skip-manpage-compression.patch |
| 157 |
@@ -0,0 +1,10 @@ |
| 158 |
+--- a/Makefile |
| 159 |
++++ b/Makefile |
| 160 |
+@@ -51,7 +51,6 @@ install: $(BIN) |
| 161 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/zsh/site-functions |
| 162 |
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps |
| 163 |
+ $(INSTALL) -m 0644 misc/manpage $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 164 |
+- gzip -f -- $(DESTDIR)$(MANDIR)/man1/$(BIN).1 |
| 165 |
+ $(INSTALL) -m 0644 misc/completions.bash $(DESTDIR)$(DATADIR)/bash-completion/completions/$(BIN) |
| 166 |
+ $(INSTALL) -m 0644 misc/completions.zsh $(DESTDIR)$(DATADIR)/zsh/site-functions/_$(BIN) |
| 167 |
+ $(INSTALL) -m 0644 misc/$(BIN).desktop $(DESTDIR)$(DESKTOPPREFIX) |
Archives