[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mart Raudsepp]

commit:     b604ed0cb3599f50ef0a6354ca28dc7649b511ba
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Jan  1 22:19:27 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 17:14:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b604ed0c

xdg.eclass: use ED and don't export variables

Package-Manager: Portage-2.3.51, Repoman 2.3.11
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 eclass/xdg.eclass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index 5ed4739f86a..967a9fd023f 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -49,19 +49,17 @@ xdg_pkg_preinst() {
        XDG_ECLASS_DESKTOPFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_DESKTOPFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 
2>/dev/null)
+       done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 
2>/dev/null)
 
        XDG_ECLASS_ICONFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_ICONFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/icons' -type f -print0 
2>/dev/null)
+       done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 
2>/dev/null)
 
        XDG_ECLASS_MIMEINFOFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
-
-       export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_ICONFILES 
XDG_ECLASS_MIMEINFOFILES
+       done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 
2>/dev/null)
 }
 
 # @FUNCTION: xdg_pkg_postinst