Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
Date: Thu, 22 Nov 2018 21:48:56
Message-Id: 1542923316.3b2f93ad16204f009ef5b2688fac86bd762cf425.asturm@gentoo
1 commit: 3b2f93ad16204f009ef5b2688fac86bd762cf425
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 22 01:08:15 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 22 21:48:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2f93ad
7
8 app-office/libreoffice: QA: Don't install compressed manpages
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/libreoffice-6.1-nomancompress.patch | 29 ++++++++++++++++++++++
14 app-office/libreoffice/libreoffice-6.1.9999.ebuild | 1 +
15 app-office/libreoffice/libreoffice-9999.ebuild | 1 +
16 3 files changed, 31 insertions(+)
17
18 diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
19 new file mode 100644
20 index 00000000000..ea6eb8b816f
21 --- /dev/null
22 +++ b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
23 @@ -0,0 +1,29 @@
24 +--- a/bin/distro-install-desktop-integration 2018-10-29 20:55:29.000000000 +0100
25 ++++ b/bin/distro-install-desktop-integration 2018-11-22 02:03:36.464866894 +0100
26 +@@ -39,22 +39,20 @@
27 +
28 + create_man_link()
29 + {
30 +- echo "Install $MANDIR/man1/$1.1.gz"
31 ++ echo "Install $MANDIR/man1/$1.1"
32 +
33 + mkdir -p $DESTDIR$MANDIR/man1
34 + echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
35 +- gzip -f $DESTDIR$MANDIR/man1/$1.1
36 +- test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
37 ++ test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
38 + }
39 +
40 + install_man()
41 + {
42 +- echo "Install $MANDIR/man1/$1.1.gz"
43 ++ echo "Install $MANDIR/man1/$1.1"
44 +
45 + mkdir -p $DESTDIR$MANDIR/man1
46 + cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
47 +- gzip -f $DESTDIR$MANDIR/man1/$1.1
48 +- test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
49 ++ test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
50 + }
51 +
52 +
53
54 diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
55 index 437ac1b2f00..3c7a646b955 100644
56 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
57 +++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
58 @@ -247,6 +247,7 @@ PATCHES=(
59 # not upstreamable stuff
60 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
61 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
62 + "${FILESDIR}/${PN}-6.1-nomancompress.patch"
63 )
64
65 S="${WORKDIR}/${PN}-${MY_PV}"
66
67 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
68 index d2235c0033d..c7399b1a5ac 100644
69 --- a/app-office/libreoffice/libreoffice-9999.ebuild
70 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
71 @@ -250,6 +250,7 @@ PATCHES=(
72 # not upstreamable stuff
73 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
74 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
75 + "${FILESDIR}/${PN}-6.1-nomancompress.patch"
76 )
77
78 S="${WORKDIR}/${PN}-${MY_PV}"