--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild @@ -259,8 +259,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then + if tc-is-gcc && [[ $(gcc-version) < 4.7 ]]; then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." fi @@ -338,6 +337,11 @@ src_prepare() { -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ Makefile.in || die + sed -i \ + -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ + -e "s,\$INSTALLDIRNAME.sh,${PN}," \ + bin/distro-install-desktop-integration || die + if use branding; then # hack... mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die @@ -355,7 +359,7 @@ src_configure() { local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" + export GMAKE_OPTIONS="${MAKEOPTS} gb_COLOR=" # System python enablement: export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) @@ -519,7 +523,6 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # Fix bash completion placement - newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN} bashcomp_alias \ libreoffice \ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice