1 |
commit: 09ba74a6a80d6ded6eca7ec36618f38ce2a45811 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Sep 28 20:21:46 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Sep 28 20:21:46 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=09ba74a6 |
7 |
|
8 |
x11-libs/pango: update live ebuild |
9 |
|
10 |
--- |
11 |
x11-libs/pango/pango-9999.ebuild | 25 ++++++++++--------------- |
12 |
1 files changed, 10 insertions(+), 15 deletions(-) |
13 |
|
14 |
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild |
15 |
index 0e75080..f6be33e 100644 |
16 |
--- a/x11-libs/pango/pango-9999.ebuild |
17 |
+++ b/x11-libs/pango/pango-9999.ebuild |
18 |
@@ -1,6 +1,6 @@ |
19 |
# Copyright 1999-2011 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.8 2011/06/22 18:26:42 grobian Exp $ |
22 |
+# $Header: $ |
23 |
|
24 |
EAPI="4" |
25 |
GCONF_DEBUG="yes" |
26 |
@@ -24,7 +24,8 @@ fi |
27 |
|
28 |
IUSE="X doc +introspection test" |
29 |
|
30 |
-RDEPEND=">=dev-libs/glib-2.26.0:2 |
31 |
+# Use glib-2.29.5 for g_atomic_int_add |
32 |
+RDEPEND=">=dev-libs/glib-2.29.5:2 |
33 |
>=media-libs/fontconfig-2.5.0:1.0 |
34 |
media-libs/freetype:2 |
35 |
>=x11-libs/cairo-1.7.6[X?] |
36 |
@@ -76,19 +77,13 @@ src_prepare() { |
37 |
} |
38 |
|
39 |
pkg_postinst() { |
40 |
- if [ "${ROOT}" = "/" ] ; then |
41 |
- einfo "Generating modules listing..." |
42 |
+ einfo "Generating modules listing..." |
43 |
|
44 |
- local PANGO_CONFDIR= |
45 |
+ local PANGO_CONFDIR="${EROOT}/etc/pango" |
46 |
+ multilib_enabled && PANGO_CONFDIR+="/${CHOST}" |
47 |
|
48 |
- if multilib_enabled ; then |
49 |
- PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}" |
50 |
- else |
51 |
- PANGO_CONFDIR="${EPREFIX}/etc/pango" |
52 |
- fi |
53 |
- |
54 |
- mkdir -p ${PANGO_CONFDIR} |
55 |
- |
56 |
- pango-querymodules > ${PANGO_CONFDIR}/pango.modules |
57 |
- fi |
58 |
+ mkdir -p "${PANGO_CONFDIR}" |
59 |
+ pango-querymodules \ |
60 |
+ "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ |
61 |
+ > "${PANGO_CONFDIR}"/pango.modules |
62 |
} |