app-office/libreoffice: Use xdg-utils.eclass to cleanup XDG_* env

...causing sandbox violation.

Gentoo-bug: 588158

Package-Manager: portage-2.2.28

diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index ac6f331a6731af5c1e9ebcf00b87fb4d044a593b..49088e7326944a45836ea9a0778c663f28cbaec6 100644 (file)
--- 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 86c4a854a4a1a9f2dce6d6640ccbbc44841c4d10..5151dab35c7914b2ff7c4c66e046ae13c274dd34 100644 (file)
--- 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 1cea5062c9a49af57b1ad67d8eb5e319210b6492..2259e149ee7d5b5dff9997cec642dbaadd611de4 100644 (file)
--- 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
 }