Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
Date: Mon, 29 Oct 2012 22:06:17
Message-Id: 1351548325.cf4ce9e4ec82b16679c3949a9fe6dab64657bc57.eva@gentoo
1 commit: cf4ce9e4ec82b16679c3949a9fe6dab64657bc57
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 29 22:05:25 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 29 22:05:25 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf4ce9e4
7
8 x11-libs/pango: fix a few ebuild issues
9
10 Pango not having a modules file was pretty embarrassing.
11
12 ---
13 x11-libs/pango/pango-1.32.1.ebuild | 16 +++++++++++-----
14 1 files changed, 11 insertions(+), 5 deletions(-)
15
16 diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
17 index bb4bb93..4b800bb 100644
18 --- a/x11-libs/pango/pango-1.32.1.ebuild
19 +++ b/x11-libs/pango/pango-1.32.1.ebuild
20 @@ -56,19 +56,25 @@ src_prepare() {
21 gnome2_src_prepare
22 }
23
24 +src_install() {
25 + gnome2_src_install
26 +
27 + local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
28 + dodir "${PANGO_CONFDIR}"
29 + keepdir "${PANGO_CONFDIR}"
30 +}
31 +
32 pkg_postinst() {
33 - einfo "Generating modules listing..."
34 + gnome2_pkg_postinst
35
36 + einfo "Generating modules listing..."
37 local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
38 local pango_conf="${PANGO_CONFDIR}/pango.modules"
39 local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
40
41 - dodir "${PANGO_CONFDIR}"
42 - keepdir "${PANGO_CONFDIR}"
43 -
44 # be atomic!
45 if pango-querymodules --system \
46 - "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \
47 + "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
48 > "${tmp_file}"; then
49 cat "${tmp_file}" > "${pango_conf}" || {
50 rm "${tmp_file}"; die; }