commit: 4c6e73df9d616d5c472c276dd5bef70efea02907 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Aug 6 17:58:09 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Aug 6 17:58:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6e73df
sys-fs/btrfs-progs: install uncompressed man pages Closes: https://bugs.gentoo.org/662920 Package-Manager: Portage-2.3.44_p5_p421668, Repoman-2.3.10_p20_p421668 ...rogs-4.17.ebuild => btrfs-progs-4.17-r1.ebuild} | 4 ++ .../btrfs-progs/files/btrfs-progs-man-no-gz.patch | 64 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild similarity index 98% rename from sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild rename to sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild index 0936ade7591..b11eba1014a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild @@ -72,6 +72,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/btrfs-progs-man-no-gz.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch new file mode 100644 index 00000000000..aeb187baaf4 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch @@ -0,0 +1,64 @@ +From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Mon, 6 Aug 2018 11:26:54 -0400 +Subject: [PATCH] Install uncompressed man pages + +Bug: https://bugs.gentoo.org/662920 +--- + Documentation/Makefile.in | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in +index 184647c4..c4c843cb 100644 +--- a/Documentation/Makefile.in ++++ b/Documentation/Makefile.in +@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc + MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT) + MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT)) + MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT)) +-GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT)) +-GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT)) +-GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT)) ++MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT)) ++MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT)) ++MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT)) + + mandir ?= $(prefix)/share/man + man3dir = $(mandir)/man3 +@@ -86,9 +86,9 @@ endif + + all: man + man: man3 man5 man8 +-man3: $(GZ_MAN3) +-man5: $(GZ_MAN5) +-man8: $(GZ_MAN8) ++man3: $(MAN3) ++man5: $(MAN5) ++man8: $(MAN8) + html: $(MAN_HTML) + + install: install-man +@@ -96,15 +96,15 @@ install: install-man + install-man: man + $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) + $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) +- $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir) ++ $(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir) + # the source file name of btrfs.5 clashes with section 8 page, but we + # want to keep the code generic +- $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz +- $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) +- $(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz ++ $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5 ++ $(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir) ++ $(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8 + + uninstall: +- cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8) ++ cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8) + $(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir) + + clean: +-- +2.18.0 +
