diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-06-26 10:00:39 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-06-26 10:00:39 +0000 |
| commit | c7892220f586448808eeff009e1e9454283784b7 (patch) | |
| tree | 1bc78e13d535359ee4e8db027e091c153cddfd73 | |
| parent | net-libs/czmq: Bump to new tarball, fixes missing version.h, #513398 (diff) | |
| download | gentoo-2-c7892220f586448808eeff009e1e9454283784b7.tar.gz gentoo-2-c7892220f586448808eeff009e1e9454283784b7.tar.bz2 gentoo-2-c7892220f586448808eeff009e1e9454283784b7.zip | |
Raise gtk-doc dependency (#503510 by headcrabextra), handle ROOT in pango.modules generation (#486214 by LeeL and Fabian Groffen)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
| -rw-r--r-- | x11-libs/pango/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.36.5.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 8aa0c63ac80a..e45e1c6d629c 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.409 2014/06/26 09:50:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.410 2014/06/26 10:00:39 pacho Exp $ + + 26 Jun 2014; Pacho Ramos <pacho@gentoo.org> pango-1.36.5.ebuild: + Raise gtk-doc dependency (#503510 by headcrabextra), handle ROOT in + pango.modules generation (#486214 by LeeL and Fabian Groffen) *pango-1.36.5 (26 Jun 2014) diff --git a/x11-libs/pango/pango-1.36.5.ebuild b/x11-libs/pango/pango-1.36.5.ebuild index 241c60559975..e490f815d1b5 100644 --- a/x11-libs/pango/pango-1.36.5.ebuild +++ b/x11-libs/pango/pango-1.36.5.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.5.ebuild,v 1.1 2014/06/26 09:50:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.5.ebuild,v 1.2 2014/06/26 10:00:39 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.15 + >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) !<=sys-devel/autoconf-2.63:2.5 @@ -85,7 +85,7 @@ pkg_postinst() { if "${CHOST}-pango-querymodules" --system \ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \ > "${tmp_file}"; then - cat "${tmp_file}" > "${pango_conf}" || { + sed "s:^${ROOT}:/:" "${tmp_file}" > "${pango_conf}" || { rm "${tmp_file}"; die; } else ewarn "Cannot update pango.modules, file generation failed" |