mgorny 14/05/26 05:57:01 Modified: pango-1.36.3-r2.ebuild ChangeLog Log: Unconditionally use ${CHOST}-pango-querymodules since prefixing is now unconditional. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 x11-libs/pango/pango-1.36.3-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild?r1=1.2&r2=1.3 Index: pango-1.36.3-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pango-1.36.3-r2.ebuild 28 Apr 2014 18:01:04 -0000 1.2 +++ pango-1.36.3-r2.ebuild 26 May 2014 05:57:01 -0000 1.3 @@ -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/x11-libs/pango/pango-1.36.3-r2.ebuild,v 1.2 2014/04/28 18:01:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild,v 1.3 2014/05/26 05:57:01 mgorny Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -80,15 +80,9 @@ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" local pango_conf="${PANGO_CONFDIR}/pango.modules" local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) - local querymodules - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - querymodules="${CHOST}-pango-querymodules" - else - querymodules="pango-querymodules" - fi # be atomic! - if "${querymodules}" --system \ + if "${CHOST}-pango-querymodules" --system \ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \ > "${tmp_file}"; then cat "${tmp_file}" > "${pango_conf}" || { 1.406 x11-libs/pango/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/ChangeLog?rev=1.406&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/ChangeLog?rev=1.406&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/ChangeLog?r1=1.405&r2=1.406 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v retrieving revision 1.405 retrieving revision 1.406 diff -u -r1.405 -r1.406 --- ChangeLog 28 Apr 2014 18:01:04 -0000 1.405 +++ ChangeLog 26 May 2014 05:57:01 -0000 1.406 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/pango # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.405 2014/04/28 18:01:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.406 2014/05/26 05:57:01 mgorny Exp $ + + 26 May 2014; Michał Górny <mgo...@gentoo.org> pango-1.36.3-r2.ebuild: + Unconditionally use ${CHOST}-pango-querymodules since prefixing is now + unconditional. 28 Apr 2014; Michał Górny <mgo...@gentoo.org> pango-1.36.3-r2.ebuild: Use multilib_native_use*.