diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-28 18:57:19 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-28 18:57:19 +0000 |
| commit | 661d83ed21fdcd0e700e28cd2149ef9a85b2d9fb (patch) | |
| tree | 5a641bde8de6801d01fcb77a762b393d381869aa /app-office | |
| parent | Version bump, bug #494942 (diff) | |
| download | gentoo-2-661d83ed21fdcd0e700e28cd2149ef9a85b2d9fb.tar.gz gentoo-2-661d83ed21fdcd0e700e28cd2149ef9a85b2d9fb.tar.bz2 gentoo-2-661d83ed21fdcd0e700e28cd2149ef9a85b2d9fb.zip | |
Backport fixes for bug 488846 and bug 406295 to stable
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 103f6bc0049d..0716d0cf42a4 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.533 2013/12/27 18:15:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.534 2013/12/28 18:57:19 dilfridge Exp $ + + 28 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> + libreoffice-4.1.3.2-r2.ebuild: + Backport fixes for bug 488846 and bug 406295 to stable 27 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> libreoffice-4.1.4.2.ebuild, libreoffice-4.1.9999.ebuild, diff --git a/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild b/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild index 2eb3d9c9e0cb..4e44acafd1e8 100644 --- a/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild,v 1.4 2013/12/17 17:22:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild,v 1.5 2013/12/28 18:57:19 dilfridge Exp $ EAPI=5 @@ -446,7 +446,7 @@ src_configure() { --enable-randr \ --enable-randr-link \ --enable-release-build \ - --enable-hardlink-deliver \ + --disable-hardlink-deliver \ --disable-ccache \ --disable-crashdump \ --disable-dependency-tracking \ @@ -547,6 +547,7 @@ src_install() { if use branding; then insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} fi # symlink the nsplugin to proper location |