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/
Date: Wed, 01 Feb 2017 02:30:52
Message-Id: 1485916133.4bdbda7475a375679eeae7074a401f6b4d1e0f95.asturm@gentoo
1 commit: 4bdbda7475a375679eeae7074a401f6b4d1e0f95
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 02:28:53 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 02:28:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdbda74
7
8 app-office/libreoffice: Fix libreoffice-draw.desktop if ! use pdfimport
9
10 Gentoo-bug: 605464
11
12 Package-Manager: portage-2.3.3
13
14 app-office/libreoffice/libreoffice-5.2.9999.ebuild | 10 +++++++++-
15 app-office/libreoffice/libreoffice-5.3.9999.ebuild | 10 +++++++++-
16 app-office/libreoffice/libreoffice-9999.ebuild | 10 +++++++++-
17 3 files changed, 27 insertions(+), 3 deletions(-)
18
19 diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
20 index 76e383a..d104014 100644
21 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
22 +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2016 Gentoo Foundation
25 +# Copyright 1999-2017 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 # $Id$
28
29 @@ -357,6 +357,14 @@ src_prepare() {
30 # hack...
31 mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
32 fi
33 +
34 + # Don't list pdfimport support in desktop when built with none, bug # 605464
35 + if ! use pdfimport; then
36 + sed -i \
37 + -e ":MimeType: s:application/pdf;::" \
38 + -e ":Keywords: s:pdf;::" \
39 + sysui/desktop/menus/draw.desktop || die
40 + fi
41 }
42
43 src_configure() {
44
45 diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
46 index f1761be..b8cd07d 100644
47 --- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
48 +++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
49 @@ -1,4 +1,4 @@
50 -# Copyright 1999-2016 Gentoo Foundation
51 +# Copyright 1999-2017 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Id$
54
55 @@ -356,6 +356,14 @@ src_prepare() {
56 # hack...
57 mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
58 fi
59 +
60 + # Don't list pdfimport support in desktop when built with none, bug # 605464
61 + if ! use pdfimport; then
62 + sed -i \
63 + -e ":MimeType: s:application/pdf;::" \
64 + -e ":Keywords: s:pdf;::" \
65 + sysui/desktop/menus/draw.desktop || die
66 + fi
67 }
68
69 src_configure() {
70
71 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
72 index af0a7dc..cc07983 100644
73 --- a/app-office/libreoffice/libreoffice-9999.ebuild
74 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
75 @@ -1,4 +1,4 @@
76 -# Copyright 1999-2016 Gentoo Foundation
77 +# Copyright 1999-2017 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 # $Id$
80
81 @@ -356,6 +356,14 @@ src_prepare() {
82 # hack...
83 mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
84 fi
85 +
86 + # Don't list pdfimport support in desktop when built with none, bug # 605464
87 + if ! use pdfimport; then
88 + sed -i \
89 + -e ":MimeType: s:application/pdf;::" \
90 + -e ":Keywords: s:pdf;::" \
91 + sysui/desktop/menus/draw.desktop || die
92 + fi
93 }
94
95 src_configure() {