Diff libreoffice-6.0.3.2 with a libreoffice-6.0.6.2

/usr/portage/app-office/libreoffice/libreoffice-6.0.6.2.ebuild 2018-08-24 08:12:00.000000000 +0000
6 6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
7 7
PYTHON_REQ_USE="threads,xml"
8 8

  
9
MY_PV="${PV/_alpha/.alpha}"
10
MY_PV="${MY_PV/_beta/.beta}"
9 11
# experimental ; release ; old
10
# Usually the tarballs are moved a lot so this should make
11
# everyone happy.
12
# Usually the tarballs are moved a lot so this should make everyone happy.
12 13
DEV_URI="
13 14
	https://dev-builds.libreoffice.org/pre-releases/src
14
	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
15
	https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
15
	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
16
	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
16 17
"
17 18
ADDONS_URI="https://dev-www.libreoffice.org/src/"
18 19

  
19 20
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
20
PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
21
PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
21 22

  
22
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
23
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
23
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
24
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
24 25
unset SCM_ECLASS
25 26

  
26 27
DESCRIPTION="A full office productivity suite"
......
28 29
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
29 30
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
30 31

  
31
# Split modules following git/tarballs
32
# Core MUST be first!
32
# Split modules following git/tarballs; Core MUST be first!
33 33
# Help is used for the image generator
34 34
# Only release has the tarballs
35
if [[ ${PV} != *9999* ]]; then
35
if [[ ${MY_PV} != *9999* ]]; then
36 36
	for i in ${DEV_URI}; do
37
		SRC_URI+=" ${i}/${P}.tar.xz"
38
		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
37
		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
38
		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
39 39
	done
40 40
	unset i
41 41
fi
......
64 64
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
65 65

  
66 66
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
67
gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
67
gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
68 68
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
69 69

  
70
REQUIRED_USE="${PYTHON_REQUIRED_USE}
71
	bluetooth? ( dbus )
72
	kde? ( gtk )
73
	libreoffice_extensions_nlpsolver? ( java )
74
	libreoffice_extensions_scripting-beanshell? ( java )
75
	libreoffice_extensions_scripting-javascript? ( java )
76
	libreoffice_extensions_wiki-publisher? ( java )
77
"
78

  
70 79
LICENSE="|| ( LGPL-3 MPL-1.1 )"
71 80
SLOT="0"
72
[[ ${PV} == *9999* ]] || \
73
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
81
[[ ${MY_PV} == *9999* ]] || \
82
KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
74 83

  
75 84
COMMON_DEPEND="${PYTHON_DEPS}
76 85
	app-arch/unzip
......
104 113
	dev-libs/libgpg-error
105 114
	>=dev-libs/liborcus-0.13.3
106 115
	dev-libs/librevenge
116
	dev-libs/libxml2
117
	dev-libs/libxslt
107 118
	dev-libs/nspr
108 119
	dev-libs/nss
109
	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
110
	libressl? ( dev-libs/libressl )
111 120
	>=dev-libs/redland-1.0.16
112 121
	>=dev-libs/xmlsec-1.2.24[nss]
113 122
	media-gfx/graphite2
......
126 135
	net-misc/curl
127 136
	net-nds/openldap
128 137
	sci-mathematics/lpsolve
138
	sys-libs/zlib:=
129 139
	virtual/glu
130 140
	virtual/jpeg:0
131 141
	virtual/opengl
......
151 161
		dev-libs/glib:2
152 162
		dev-libs/gobject-introspection
153 163
		gnome-base/dconf
164
		media-libs/mesa[egl]
154 165
		x11-libs/gtk+:3
166
		x11-libs/pango
155 167
	)
156 168
	gtk2? (
157 169
		x11-libs/gdk-pixbuf
158 170
		>=x11-libs/gtk+-2.24:2
171
		x11-libs/pango
159 172
	)
173
	jemalloc? ( dev-libs/jemalloc )
160 174
	kde? (
161 175
		dev-qt/qtcore:5
162 176
		dev-qt/qtgui:5
......
168 182
		kde-frameworks/kio:5
169 183
		kde-frameworks/kwindowsystem:5
170 184
	)
171
	jemalloc? ( dev-libs/jemalloc )
172 185
	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
173 186
	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
174 187
	mysql? ( dev-db/mysql-connector-c++ )
......
189 202
	vlc? ( media-video/vlc )
190 203
"
191 204

  
192
if [[ ${PV} != *9999* ]]; then
193
	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
205
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
206
	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
194 207
else
195 208
	# Translations are not reliable on live ebuilds
196 209
	# rather force people to use english only.
......
201 214
#        after everything upstream is under gbuild
202 215
#        as dmake execute tests right away
203 216
DEPEND="${COMMON_DEPEND}
204
	!<sys-devel/make-3.82
205 217
	>=dev-libs/libatomic_ops-7.2d
206
	>=dev-libs/libxml2-2.7.8
207
	dev-libs/libxslt
208 218
	dev-perl/Archive-Zip
209 219
	>=dev-util/cppunit-1.14.0
210 220
	>=dev-util/gperf-3
......
215 225
	sys-devel/flex
216 226
	sys-devel/gettext
217 227
	sys-devel/ucpp
218
	sys-libs/zlib
219 228
	virtual/pkgconfig
220 229
	x11-base/xorg-proto
221 230
	x11-libs/libXt
......
232 241
	)
233 242
"
234 243

  
235
REQUIRED_USE="${PYTHON_REQUIRED_USE}
236
	bluetooth? ( dbus )
237
	kde? ( gtk )
238
	libreoffice_extensions_nlpsolver? ( java )
239
	libreoffice_extensions_scripting-beanshell? ( java )
240
	libreoffice_extensions_scripting-javascript? ( java )
241
	libreoffice_extensions_wiki-publisher? ( java )
242
"
243

  
244 244
PATCHES=(
245 245
	# not upstreamable stuff
246 246
	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
247 247
	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
248
	"${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
249
	# 6.0 branch
250
	"${FILESDIR}/${P}-poppler-0.64.patch"
251
	# 6.1 branch
252
	"${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
248
	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
253 249

  
254 250
	# TODO: upstream
255 251
	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
......
259 255
	"${WORKDIR}"/${PATCHSET/.tar.xz/}
260 256
)
261 257

  
258
S="${WORKDIR}/${PN}-${MY_PV}"
259

  
260
_check_reqs() {
261
	CHECKREQS_MEMORY="512M"
262
	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
263
		CHECKREQS_DISK_BUILD="22G"
264
	else
265
		CHECKREQS_DISK_BUILD="6G"
266
	fi
267
	check-reqs_$1
268
}
269

  
262 270
pkg_pretend() {
263 271
	use java || \
264 272
		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
......
269 277
		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
270 278
	fi
271 279

  
272
	if [[ ${MERGE_TYPE} != binary ]]; then
273
		CHECKREQS_MEMORY="512M"
274
		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
275
			CHECKREQS_DISK_BUILD="22G"
276
		else
277
			CHECKREQS_DISK_BUILD="6G"
278
		fi
279
		check-reqs_pkg_pretend
280
	fi
280
	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
281 281
}
282 282

  
283 283
pkg_setup() {
......
285 285
	python-single-r1_pkg_setup
286 286
	xdg_environment_reset
287 287

  
288
	if [[ ${MERGE_TYPE} != binary ]]; then
289
		CHECKREQS_MEMORY="512M"
290
		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
291
			CHECKREQS_DISK_BUILD="22G"
292
		else
293
			CHECKREQS_DISK_BUILD="6G"
294
		fi
295
		check-reqs_pkg_setup
296
	fi
288
	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
297 289
}
298 290

  
299 291
src_unpack() {
300 292
	default
301 293

  
302
	if [[ ${PV} = *9999* ]]; then
294
	if [[ ${MY_PV} = *9999* ]]; then
303 295
		local base_uri branch mypv
304 296
		base_uri="https://anongit.freedesktop.org/git"
305 297
		branch="master"
306
		mypv=${PV/.9999}
307
		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
298
		mypv=${MY_PV/.9999}
299
		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
308 300
		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
309 301
		git-r3_checkout "${base_uri}/${PN}/core"
310 302

  
......
347 339

  
348 340
	if use branding; then
349 341
		# hack...
350
		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
342
		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
351 343
	fi
352 344

  
353 345
	# Don't list pdfimport support in desktop when built with none, bug # 605464
......
410 402
		--disable-fetch-external
411 403
		--disable-gstreamer-0-10
412 404
		--disable-online-update
405
		--disable-openssl
413 406
		--disable-pdfium
414 407
		--disable-report-builder
415 408
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
......
422 415
		--with-lang=""
423 416
		--with-parallelism=$(makeopts_jobs)
424 417
		--with-system-ucpp
418
		--with-tls=nss
425 419
		--with-vendor="Gentoo Foundation"
426 420
		--with-x
427 421
		--without-fonts
......
561 555
	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
562 556
}
563 557

  
564
pkg_preinst() {
565
	gnome2_icon_savelist
566
}
567

  
568 558
pkg_postinst() {
569 559
	gnome2_icon_cache_update
570 560
	xdg_desktop_database_update
Thank you!