Introduce multilib support, bug #488868.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

2 files changed, 110 insertions, 1 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 0c79ba9e158f..2e29c38f216a 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # 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.387 2014/02/22 22:47:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.388 2014/03/01 13:33:52 mgorny Exp $
+
+*pango-1.36.2-r1 (01 Mar 2014)
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> +pango-1.36.2-r1.ebuild:
+  Introduce multilib support, bug #488868.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> pango-1.36.2.ebuild:
   Fix wrong commit, bug 502160
diff --git a/x11-libs/pango/pango-1.36.2-r1.ebuild b/x11-libs/pango/pango-1.36.2-r1.ebuild
new file mode 100644
index 000000000000..5fb7037193e0
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.2-r1.ebuild
@@ -0,0 +1,104 @@
+# 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.2-r1.ebuild,v 1.1 2014/03/01 13:33:52 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.33.12:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.91:1.0=[${MULTILIB_USEDEP}]
+	media-libs/freetype:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	X? (
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.0.0[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	virtual/pkgconfig
+	X? ( x11-proto/xproto[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pango-querymodules
+)
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_build_binaries \
+			&& use_enable introspection \
+			|| echo --disable-introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	local PANGO_CONFDIR="/etc/pango/${CHOST}"
+	dodir "${PANGO_CONFDIR}"
+	keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_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 "${CHOST}"-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}"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+
+	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
+}