vapier 14/11/15 09:49:10 Modified: eutils.eclass Log: chop off the subslot from the SLOT #528078 by Mark Wright
Revision Changes Path 1.440 eclass/eutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.440&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.440&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.439&r2=1.440 Index: eutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.439 retrieving revision 1.440 diff -u -r1.439 -r1.440 --- eutils.eclass 13 Nov 2014 04:55:06 -0000 1.439 +++ eutils.eclass 15 Nov 2014 09:49:10 -0000 1.440 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.439 2014/11/13 04:55:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.440 2014/11/15 09:49:10 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -903,10 +903,11 @@ ;; esac fi - if [ "${SLOT}" == "0" ] ; then + local slot=${SLOT%/*} + if [[ ${slot} == "0" ]] ; then local desktop_name="${PN}" else - local desktop_name="${PN}-${SLOT}" + local desktop_name="${PN}-${slot}" fi local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
