Introduce multilib support, bug #488868.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 127 insertions, 5 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/Manifest b/x11-libs/pango/Manifest
index a51e6dbf74c8..0107b8fb3d2f 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -16,13 +16,26 @@ EBUILD pango-1.30.1.ebuild 2856 SHA256 09558d613eaaf77f8eeab1076284302de1e01fb09
 EBUILD pango-1.32.5.ebuild 2489 SHA256 0f0884f32e54788e776de743dcffa34a97210759bea6304123c92e0ddc6ad5bf SHA512 b160147e4edccc061d845f4180f3bfd94baf391e57d2ca4c654d953fba754ac1b11728763a028807f479550a486be1dacd32b51320abcfa790002c38c13ca9f7 WHIRLPOOL 503461539171b475515a6160803f86bca809646f580e33ffe42ee0037222ff2bf93f5df77c7c063c8cfea694dd7e5e086d26be787aac026186d5121155456862
 EBUILD pango-1.34.1.ebuild 2500 SHA256 46859ae2c438365cfe9e66887d91c4435f58bf99316b0d404b0d72339258cc41 SHA512 d6b74518d6b2fc48de13f0ecab05df4c422daf7850839e18f4d6fcb5593bb19ace5a2b0d731d6dd08cab232a717ee74854eaff4fdc04332a10ad155772c16351 WHIRLPOOL 75da789b86764a8401de8a2dc8b1b382a204303bff9267305f92faa2e118651b76b3281880b19727f704c5e997cbcfd582369f897b6de4fc4f257affa3126ec4
 EBUILD pango-1.36.1.ebuild 2435 SHA256 69d65661c04b7388c3855633e267e9167db47e688531833628c8e226203421e6 SHA512 5ba09d477870bba057f4417be45eb1101cfd82b1757e98b3840521c3bee080d31b99555ceab33f931c6dfd833962cb0d8417190fb9b7ecf8197aa7bb4e9df201 WHIRLPOOL 453e0585426be22e2f2fb3b97e5a6f2ea3ef624060205b25a931dffffbbc3188c7f66853f7c56ed18594198e3eadeb7783776b568e2f6b95b8cddcf8acac7377
+EBUILD pango-1.36.2-r1.ebuild 3024 SHA256 170c901a50aa4875df980891bbdef938ba941c6b01aedb08ebe2152795b6d905 SHA512 c2d149cf98cf149875aec7a3710301116068796c5af76e91a75e59d0b4c78063e3bee041b32c5894c4eda805b8bcfeeb0e3c805e4d8ad8b3aa4073b95c5e6fdd WHIRLPOOL 44d7f6ee60ae47b4c8606ea17c0a386a0869bd031bf4c7ab769d9cee050f9504e6bbe0a66cf9c1d2b61e8d693054a6905c71505f0e9258a9dd63f080505a185f
 EBUILD pango-1.36.2.ebuild 2434 SHA256 1d95e4a202a7662c0615b8d9dde143da556e7af19b44719a6611d929a3d833e6 SHA512 75de5e8e6d28bd272af3344b49609b95ddeeb57dc5f5ca64688572fdbf694096211a7e43a6196a1fe6d721914aae4f20bffb95ae378e836bc0a58069877660df WHIRLPOOL b1bc8eced7a0b1b0fc242b3d65be2d0df43ae6d6bbb30da61caedf6901066a9bfaa945ccddc21b74e422ceebc1208c631570eadd4e9e666edfcd4eca36af8501
-MISC ChangeLog 49528 SHA256 7b7fec2fd433d6fd7925035a8533cfdf1e4fffedbd13cbf75af3343794ac1c13 SHA512 b129ebf93da1ac73d3fe8f662bc6254fbf702e08c451b4ee8bb7a8ec41dcb734d934363f4e531c12b92786224159de091b04339f787141aaaefcd649b1abfe16 WHIRLPOOL cce6f5d2d9e1a4bd14568970436836970659c40536268ec5d7e13149b1376f7686f1499a60a8a5b23699843e6aec07544499aa6ec0effcbfa0109538ff6b277d
+MISC ChangeLog 49680 SHA256 2495cd1046e81dfe346f2b7e69125a6984b1d7ec57d3a2ab421afe67a6768509 SHA512 82be9bd80fc72e8fc56074d01e6dae3d2632563b58bf2d96519d51a9d6da077209d2af6cb4d75d9929b1343d2e6d6c0c708d16bace0614d8c289ed66ceeaac06 WHIRLPOOL ac94a376d6c5b2047db4471a9ff908e03af63ce277ed39137a3048f7311b27a8c82eef3abc8287c1c5b4acea4d98f37451496bdc54afc998ef1be34be67aeda8
 MISC metadata.xml 244 SHA256 20812e9c9f3ceb9adaeda150307d00c8e8d8ad03faac4518cf753cbdf5c729bb SHA512 849c0f727d60d5c50ed15fc640f59246c98115c37095507db0a6e03c196ed9875ca71d95b7f12170ec8ec81e7f907a364522c5ea7bcf51d253b264ab404a902f WHIRLPOOL c6e167a16dcd88d78cd123dcc5283a5adcc08daaf7dd713c139a2a606dbe2009f7c68b4d2d017c8357f5e422ee9b3e2516ccc7139eb8cdabebdb106be82582e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJKSAACgkQCaWpQKGI+9TysACdEnCa4dGnQqpxAXVZ1Wl84dh9
-cLsAoIQKJY7nQK3v8+Re3eMRGqJNam53
-=IpGo
+iQJ8BAEBCABmBQJTEeHCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkNwP/j5nI+WbW6rWQU72ojiSmvEJ
+qeC1see/Dczlo1nS8RBppiUd/Vj50N3eS36zx2/YAdBAXAV++dTkcOvKf/Xdzg+k
+yKu0BIBvEmTxCw2uTL4ddS/jGjDJJuRSE1epjLb4/6KbFM4elSqgq5jjbzlyVPVa
+bjc7gUyhT6SJ7Mf9lSClqzMVeJd5NN0dHawxr9HJQPlODsNvpP5VrNv3wE9addRI
+ys8+jWwtLV/itDUgTqd6lC/4MtKGEu/pMUtJD2hggOSI6dOE0utvepmaBALyiX6Z
+zQWTugzi7W7nCAKQzjS8IyitWNTRPdda9xJaC5MUMhsSUFKksZFKwAL+pw1fP7RK
+MGLEdNeH1SSXWTq1UBnrsbNtsw0YmBtUy4VKUpp7nrMMIUUIzUas9Lb0asuqxwOa
+/C/bK9nOYmnWQGEgamecT/8B8MQ7x6cVYnhk813F3v6DtuxaAFo4fickBZLZiOFD
+UvEjcRrg0VkVxuXWImSiFxdz3YeQfTkPvHSIgVtvXD/zoCmlJhn6ctwTTOmvsJs7
+KylXv4THnFDWFLrJYLy2vMFEQ978i0AmTDnV4QNrvUOlGgd829te8EtYYKObXpf6
+fyBQ+QsgRC1iej1xSebPNlGElhiF9GQSLVaR2aFEBSpbpYIqOxT0uVj/usbKgZSU
+RQEx3kksCwLy9OOVto/j
+=2Y3Y
 -----END PGP SIGNATURE-----
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
+}