diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-04-20 22:36:13 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-04-20 22:36:13 +0000 |
| commit | 87cffa8be2125c95bf8c0e9056276f3f3071b04e (patch) | |
| tree | 5c3426e9c2eedd048272af7084021023ee5f2daf /x11-libs | |
| parent | Version bump (diff) | |
| download | gentoo-2-87cffa8be2125c95bf8c0e9056276f3f3071b04e.tar.gz gentoo-2-87cffa8be2125c95bf8c0e9056276f3f3071b04e.tar.bz2 gentoo-2-87cffa8be2125c95bf8c0e9056276f3f3071b04e.zip | |
Unbreak pango-querymodules postinst call for non-multilib case (bug #508278, thanks to Robert Förster).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4F1D4860)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/pango/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.36.3-r2.ebuild (renamed from x11-libs/pango/pango-1.36.3-r1.ebuild) | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 964578d2659c..5ec278bdd9d0 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,13 @@ # 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.400 2014/04/20 08:49:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.401 2014/04/20 22:36:13 tetromino Exp $ + +*pango-1.36.3-r2 (20 Apr 2014) + + 20 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + -pango-1.36.3-r1.ebuild, +pango-1.36.3-r2.ebuild: + Unbreak pango-querymodules postinst call for non-multilib case (bug #508278, + thanks to Robert Förster). 20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> pango-1.36.3.ebuild: Stable for x86, wrt bug #507568 diff --git a/x11-libs/pango/pango-1.36.3-r1.ebuild b/x11-libs/pango/pango-1.36.3-r2.ebuild index 1f8c03870749..69e1feb456de 100644 --- a/x11-libs/pango/pango-1.36.3-r1.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-r1.ebuild,v 1.1 2014/03/29 21:27:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild,v 1.1 2014/04/20 22:36:13 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -82,9 +82,15 @@ 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 "${CHOST}"-pango-querymodules --system \ + if "${querymodules}" --system \ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \ > "${tmp_file}"; then cat "${tmp_file}" > "${pango_conf}" || { |