Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 595926
Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +8 lines)
Line  Link Here
0
-- a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
0
++ b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
Lines 259-266 pkg_pretend() { Link Here
259
	if [[ ${MERGE_TYPE} != binary ]]; then
259
	if [[ ${MERGE_TYPE} != binary ]]; then
260
		check-reqs_pkg_pretend
260
		check-reqs_pkg_pretend
261
261
262
		if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
262
		if tc-is-gcc && [[ $(gcc-version) < 4.7 ]]; then
263
				[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
264
			eerror "Compilation with gcc older than 4.7 is not supported"
263
			eerror "Compilation with gcc older than 4.7 is not supported"
265
			die "Too old gcc found."
264
			die "Too old gcc found."
266
		fi
265
		fi
Lines 338-343 src_prepare() { Link Here
338
		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
337
		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
339
		Makefile.in || die
338
		Makefile.in || die
340
339
340
	sed -i \
341
		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
342
		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
343
		bin/distro-install-desktop-integration || die
344
341
	if use branding; then
345
	if use branding; then
342
		# hack...
346
		# hack...
343
		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
347
		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
Lines 355-361 src_configure() { Link Here
355
	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
359
	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
356
360
357
	# optimization flags
361
	# optimization flags
358
	export GMAKE_OPTIONS="${MAKEOPTS}"
362
	export GMAKE_OPTIONS="${MAKEOPTS} gb_COLOR="
359
	# System python enablement:
363
	# System python enablement:
360
	export PYTHON_CFLAGS=$(python_get_CFLAGS)
364
	export PYTHON_CFLAGS=$(python_get_CFLAGS)
361
	export PYTHON_LIBS=$(python_get_LIBS)
365
	export PYTHON_LIBS=$(python_get_LIBS)
Lines 519-525 src_install() { Link Here
519
	make DESTDIR="${D}" distro-pack-install -o build -o check || die
523
	make DESTDIR="${D}" distro-pack-install -o build -o check || die
520
524
521
	# Fix bash completion placement
525
	# Fix bash completion placement
522
	newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
523
	bashcomp_alias \
526
	bashcomp_alias \
524
		libreoffice \
527
		libreoffice \
525
		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
528
		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice

Return to bug 595926