[gentoo-commits] proj/gnome:master commit in: x11-libs/pango/

[Alexandre Restovtsev]

commit:     ada11ebcd8cbff63de58047cbacd7ca372910ff9
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 07:22:08 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jun  7 07:22:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ada11ebc

x11-libs/pango: sync with gx86

---
 x11-libs/pango/pango-9999.ebuild |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 044c187..d2744f3 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,13 +19,15 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="X doc +introspection test"
 
-# Use glib-2.29.5 for g_atomic_int_add
-RDEPEND=">=dev-libs/glib-2.29.5:2
+# Upstream bug #643802
+REQUIRED_USE="doc? ( X )"
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
 	>=media-libs/fontconfig-2.5.0:1.0
 	media-libs/freetype:2
 	>=x11-libs/cairo-1.7.6[X?]
@@ -63,8 +65,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
@@ -73,7 +73,7 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	elibtoolize # for Darwin bundles
+	gnome2_src_prepare
 }
 
 pkg_postinst() {
@@ -83,7 +83,21 @@ pkg_postinst() {
 	multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
 
 	mkdir -p "${PANGO_CONFDIR}"
-	pango-querymodules \
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
+
+	# be atomic!
+	if pango-querymodules --system \
 		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
-		> "${PANGO_CONFDIR}"/pango.modules
+			> "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}" || {
+			rm "${tmp_file}"; die; }
+	else
+		ewarn "Cannot update pango.modules, file generation failed"
+	fi
+	rm "${tmp_file}"
+
+	elog "In >=${PN}-1.30.1, default configuration file locations moved from"
+	elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
+	elog "~/.config/pango/pangox.aliases"
 }