commit:     fb45cae322309e3f41cba413be2923136b8c5bab
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 08:48:08 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb45cae3

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 ac6f331..49088e73 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 86c4a85..5151dab 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 1cea506..2259e14 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
 }

Reply via email to