Version bump for gnome-3.6; now uses an external harfbuzz library and supports Unicode 6.1. The pangox library was split off into a separate package (pangox-compat). Keywords dropped due to harfbuzz dependency.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 137 insertions, 1 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 9203298a3042..b5e8d0135b3f 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.360 2012/12/16 06:47:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.361 2012/12/19 16:38:13 tetromino Exp $
+
+*pango-1.32.5 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/pango-1.32.1-lib64.patch, +pango-1.32.5.ebuild:
+  Version bump for gnome-3.6; now uses an external harfbuzz library and
+  supports Unicode 6.1. The pangox library was split off into a separate
+  package (pangox-compat). Keywords dropped due to harfbuzz dependency.
 
   16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
   Switch to global introspection USE flag.
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch
new file mode 100644
index 000000000000..0820c78f128f
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.32.1-lib64.patch
@@ -0,0 +1,44 @@
+From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 28 Oct 2012 23:19:39 +0100
+Subject: [PATCH] Add multilib support
+
+pango.modules list modules specific to a host architecture.
+Add host triplet in path so that machine able to run multiple
+triplet have a proper file per pango library.
+---
+ pango/Makefile.am   | 1 +
+ pango/pango-utils.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pango/Makefile.am b/pango/Makefile.am
+index ab092c9..558108b 100644
+--- a/pango/Makefile.am
++++ b/pango/Makefile.am
+@@ -17,6 +17,7 @@ INCLUDES =						\
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_builddir)				\
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c
+index 18ffa26..3b88f15 100644
+--- a/pango/pango-utils.c
++++ b/pango/pango-utils.c
+@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void)
+ #else
+       const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR");
+       if (sysconfdir != NULL)
+-	tmp_result = g_build_filename (sysconfdir, "pango", NULL);
++	tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL);
+       else
+-	tmp_result = SYSCONFDIR "/pango";
++	tmp_result = SYSCONFDIR "/pango/" HOST;
+ #endif
+       g_once_init_leave((gsize*)&result, (gsize)tmp_result);
+     }
+-- 
+1.7.12.4
+
diff --git a/x11-libs/pango/pango-1.32.5.ebuild b/x11-libs/pango/pango-1.32.5.ebuild
new file mode 100644
index 000000000000..bf1e714c13ba
--- /dev/null
+++ b/x11-libs/pango/pango-1.32.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.32.5.ebuild,v 1.1 2012/12/19 16:38:13 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/glib-2.33.12:2
+	>=media-libs/fontconfig-2.5.0:1.0=
+	media-libs/freetype:2=
+	>=x11-libs/cairo-1.7.6:=[X?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	X? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		>=x11-libs/libXft-2.0.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	virtual/pkgconfig
+	X? ( x11-proto/xproto )
+	!<=sys-devel/autoconf-2.63:2.5"
+
+src_prepare() {
+	tc-export CXX
+	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		$(use_with X xft)
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")"
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")
+
+	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+	dodir "${PANGO_CONFDIR}"
+	keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "Generating modules listing..."
+	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
+
+	# be atomic!
+	if pango-querymodules --system \
+		"${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
+			> "${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}"
+
+	if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
+		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"
+	fi
+}