From fb45cae322309e3f41cba413be2923136b8c5bab Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 13 Aug 2016 10:48:08 +0200 Subject: [PATCH] app-office/libreoffice: Use xdg-utils.eclass to cleanup XDG_* env ...causing sandbox violation. Gentoo-bug: 588158 Package-Manager: portage-2.2.28 --- app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 3 ++- app-office/libreoffice/libreoffice-5.2.9999.ebuild | 3 ++- app-office/libreoffice/libreoffice-9999.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild index ac6f331a6731..49088e732694 100644 --- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild @@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} +inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="A full office productivity suite" @@ -290,6 +290,7 @@ pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 86c4a854a4a1..5151dab35c79 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} +inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="A full office productivity suite" @@ -284,6 +284,7 @@ pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1cea5062c9a4..2259e149ee7d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} +inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="A full office productivity suite" @@ -284,6 +284,7 @@ pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } -- 2.26.2