diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-26 05:57:01 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-26 05:57:01 +0000 |
| commit | c8dd0115f5a535376603d5224c8139d5edb95595 (patch) | |
| tree | 0e51f5e2d2ba5f8a2c086e25abe3398fdfa77fbb /x11-libs/pango | |
| parent | Bump (diff) | |
| download | gentoo-2-c8dd0115f5a535376603d5224c8139d5edb95595.tar.gz gentoo-2-c8dd0115f5a535376603d5224c8139d5edb95595.tar.bz2 gentoo-2-c8dd0115f5a535376603d5224c8139d5edb95595.zip | |
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!)
Diffstat (limited to 'x11-libs/pango')
| -rw-r--r-- | x11-libs/pango/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.36.3-r2.ebuild | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 4b85c2fe7c1c..4364120074f3 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -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 <mgorny@gentoo.org> pango-1.36.3-r2.ebuild: + Unconditionally use ${CHOST}-pango-querymodules since prefixing is now + unconditional. 28 Apr 2014; Michał Górny <mgorny@gentoo.org> pango-1.36.3-r2.ebuild: Use multilib_native_use*. diff --git a/x11-libs/pango/pango-1.36.3-r2.ebuild b/x11-libs/pango/pango-1.36.3-r2.ebuild index 6048f6646283..46a817cd7fcb 100644 --- a/x11-libs/pango/pango-1.36.3-r2.ebuild +++ b/x11-libs/pango/pango-1.36.3-r2.ebuild @@ -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 @@ pkg_postinst() { 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}" || { |