diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 18:43:05 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-08-09 18:43:05 +0000 |
| commit | 7cca9507f424a763ef4125522a5b69d8822c3df0 (patch) | |
| tree | 5b30496b519ff53b9d66379ad9faa7c7f4d1c495 /eclass | |
| parent | Version bump with libpng15 compability patch wrt #378469 by Diego Elio Pettenò (diff) | |
| download | gentoo-2-7cca9507f424a763ef4125522a5b69d8822c3df0.tar.gz gentoo-2-7cca9507f424a763ef4125522a5b69d8822c3df0.tar.bz2 gentoo-2-7cca9507f424a763ef4125522a5b69d8822c3df0.zip | |
migrate Gentoo Prefix changes
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/fdo-mime.eclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass index e37699979ac4..eae5c1f5b89a 100644 --- a/eclass/fdo-mime.eclass +++ b/eclass/fdo-mime.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fdo-mime.eclass,v 1.10 2011/04/21 21:21:26 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fdo-mime.eclass,v 1.11 2011/08/09 18:43:05 darkside Exp $ # @ECLASS: fdo-mime.eclass # @MAINTAINER: freedesktop-bugs@gentoo.org @@ -15,10 +15,11 @@ # Updates the desktop database. # Generates a list of mimetypes linked to applications that can handle them fdo-mime_desktop_database_update() { - if [ -x "/usr/bin/update-desktop-database" ] + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ] then einfo "Updating desktop mime database ..." - "/usr/bin/update-desktop-database" -q "${ROOT}/usr/share/applications" + "${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}/usr/share/applications" fi } @@ -27,9 +28,10 @@ fdo-mime_desktop_database_update() { # Update the mime database. # Creates a general list of mime types from several sources fdo-mime_mime_database_update() { - if [ -x "/usr/bin/update-mime-database" ] + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + if [ -x "${EPREFIX}/usr/bin/update-mime-database" ] then einfo "Updating shared mime info database ..." - "/usr/bin/update-mime-database" "${ROOT}/usr/share/mime" + "${EPREFIX}/usr/bin/update-mime-database" "${EROOT%/}/usr/share/mime" fi } |