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

[Gilles Dartiguelongue]

commit:     428f398d3d1a7825bf2ac6d8f15db57227bcd4e9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 18:45:59 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 21:57:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428f398d

xdg.eclass: drop unneeded old EAPI support

Should not have been there to start with since it is a new eclass.

 eclass/xdg.eclass | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index e804d18..2ad0ada 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -15,7 +15,7 @@
 inherit xdg-utils
 
 case "${EAPI:-0}" in
-       0|1|2|3|4|5|6)
+       4|5|6)
                EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
                ;;
        *) die "EAPI=${EAPI} is not supported" ;;
@@ -41,22 +41,19 @@ xdg_src_prepare() {
 # Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES
 # respectively.
 xdg_pkg_preinst() {
-       has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-       pushd "${ED}" > /dev/null || die
-
        local f
+
        XDG_ECLASS_DESKTOPFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_DESKTOPFILES+=( ${f} )
-       done < <(find 'usr/share/applications' -type f -print0 2>/dev/null)
+       done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 
2>/dev/null)
 
        XDG_ECLASS_MIMEINFOFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-       done < <(find 'usr/share/mime' -type f -print0 2>/dev/null)
+       done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
 
        export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES
-       popd > /dev/null || die
 }
 
 # @FUNCTION: xdg_pkg_postinst