Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
Date: Sun, 03 Jul 2016 18:45:58
Message-Id: 1467571546.9da5ff70bba24428a31bfe7f4b42fbebde15ca83.dilfridge@gentoo
1 commit: 9da5ff70bba24428a31bfe7f4b42fbebde15ca83
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 18:45:22 2016 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 18:45:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da5ff70
7
8 app-office/libreoffice: Optionally enable the system tray quickstarter, bug 561842
9
10 Package-Manager: portage-2.3.0
11
12 app-office/libreoffice/libreoffice-5.1.9999.ebuild | 6 ++----
13 app-office/libreoffice/libreoffice-5.2.9999.ebuild | 6 ++----
14 app-office/libreoffice/libreoffice-9999.ebuild | 6 ++----
15 app-office/libreoffice/metadata.xml | 1 +
16 4 files changed, 7 insertions(+), 12 deletions(-)
17
18 diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
19 index 22da8a7..164ac1e 100644
20 --- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
21 +++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
22 @@ -79,7 +79,7 @@ unset ADDONS_SRC
23 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
24
25 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
26 -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
27 +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
28 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
29
30 LICENSE="|| ( LGPL-3 MPL-1.1 )"
31 @@ -411,8 +411,6 @@ src_configure() {
32 # --enable-*-link: link to the library rather than just dlopen on runtime
33 # --enable-release-build: build the libreoffice as release
34 # --disable-fetch-external: prevent dowloading during compile phase
35 - # --disable-systray: quickstarter does not actually work at all so do not
36 - # promote it
37 # --enable-extension-integration: enable any extension integration support
38 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
39 # --disable-report-builder: too much java packages pulled in without pkgs
40 @@ -440,7 +438,6 @@ src_configure() {
41 --disable-gstreamer-0-10 \
42 --disable-report-builder \
43 --disable-online-update \
44 - --disable-systray \
45 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
46 --with-build-version="Gentoo official package" \
47 --enable-extension-integration \
48 @@ -476,6 +473,7 @@ src_configure() {
49 $(use_enable mysql ext-mariadb-connector) \
50 $(use_enable odk) \
51 $(use_enable postgres postgresql-sdbc) \
52 + $(use_enable quickstarter systray) \
53 $(use_enable telepathy) \
54 $(use_enable vlc) \
55 $(use_with coinmp system-coinmp) \
56
57 diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
58 index 8f34304..7c0b3e4 100644
59 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
60 +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
61 @@ -78,7 +78,7 @@ unset ADDONS_SRC
62 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
63
64 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
65 -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
66 +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
67 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
68
69 LICENSE="|| ( LGPL-3 MPL-1.1 )"
70 @@ -398,8 +398,6 @@ src_configure() {
71 # --enable-*-link: link to the library rather than just dlopen on runtime
72 # --enable-release-build: build the libreoffice as release
73 # --disable-fetch-external: prevent dowloading during compile phase
74 - # --disable-systray: quickstarter does not actually work at all so do not
75 - # promote it
76 # --enable-extension-integration: enable any extension integration support
77 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
78 # --disable-report-builder: too much java packages pulled in without pkgs
79 @@ -428,7 +426,6 @@ src_configure() {
80 --disable-hardlink-deliver \
81 --disable-online-update \
82 --disable-report-builder \
83 - --disable-systray \
84 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
85 --with-build-version="Gentoo official package" \
86 --enable-extension-integration \
87 @@ -465,6 +462,7 @@ src_configure() {
88 $(use_enable mysql ext-mariadb-connector) \
89 $(use_enable odk) \
90 $(use_enable postgres postgresql-sdbc) \
91 + $(use_enable quickstarter systray) \
92 $(use_enable telepathy) \
93 $(use_enable vlc) \
94 $(use_with coinmp system-coinmp) \
95
96 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
97 index dd67838..94771b7 100644
98 --- a/app-office/libreoffice/libreoffice-9999.ebuild
99 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
100 @@ -78,7 +78,7 @@ unset ADDONS_SRC
101 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
102
103 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
104 -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
105 +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
106 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
107
108 LICENSE="|| ( LGPL-3 MPL-1.1 )"
109 @@ -399,8 +399,6 @@ src_configure() {
110 # --enable-*-link: link to the library rather than just dlopen on runtime
111 # --enable-release-build: build the libreoffice as release
112 # --disable-fetch-external: prevent dowloading during compile phase
113 - # --disable-systray: quickstarter does not actually work at all so do not
114 - # promote it
115 # --enable-extension-integration: enable any extension integration support
116 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
117 # --disable-report-builder: too much java packages pulled in without pkgs
118 @@ -429,7 +427,6 @@ src_configure() {
119 --disable-hardlink-deliver \
120 --disable-online-update \
121 --disable-report-builder \
122 - --disable-systray \
123 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
124 --with-build-version="Gentoo official package" \
125 --enable-extension-integration \
126 @@ -466,6 +463,7 @@ src_configure() {
127 $(use_enable mysql ext-mariadb-connector) \
128 $(use_enable odk) \
129 $(use_enable postgres postgresql-sdbc) \
130 + $(use_enable quickstarter systray) \
131 $(use_enable telepathy) \
132 $(use_enable vlc) \
133 $(use_with coinmp system-coinmp) \
134
135 diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
136 index f2a30d6..e1f2f47 100644
137 --- a/app-office/libreoffice/metadata.xml
138 +++ b/app-office/libreoffice/metadata.xml
139 @@ -18,6 +18,7 @@ version</longdescription>
140 <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
141 <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
142 <flag name="odk">Build the Office Development Kit</flag>
143 + <flag name="quickstarter">Build the system tray quickstarter</flag>
144 <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
145 <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
146 </use>