merge x11-libs/pango (with interim dual executable wrapping hack)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 109 insertions, 101 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 7e29adb..54e0c43 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,8 +5,8 @@ AUX pango-1.30.1-coretext-hash.patch 2873 SHA256 e1f8ba6514b96d5556a20aad341cd23
 AUX pango-1.32.1-lib64.patch 1451 SHA256 f6b94cb1edfdb7d56ca75642f1c3c556c53b654d8ec8dcf391f0db9239092937 SHA512 a790850a498f5b164ce1f591239787e452d7b3b51b1b3edef26a1e3f722bedff2282687f1074a1a10f996aa798266a082871de6d9cbdb5ff9442023cbfb9c1ae WHIRLPOOL c41345af26d7dd6658c3e64fe2a59bcaed0b5bc8466f94775933d2812ba989adb56a2417559d37853fd5e0e53375c62ec1f6919326ef9ccf09a602c2e69be672
 AUX pango-1.32.5-AM_CONFIG_HEADER.patch 930 SHA256 6ca36b8067ab02ffdd92bd8f6300e1fef30b8ec2e504b3230f13cea7288d47a7 SHA512 6aa2447e02a376d22b633b8884dafc5a03576d66caa686e0215551f3cb9e203b94e40a6f5437aaada60fad552267267ef3ebec27f8506b78c771b9430d55d2b5 WHIRLPOOL fcf085614bc48ca68372ac990daeb38b6a813d8b201b38f9b1b1410517f085654adb36877c227391b49e869f58039582f744732a6d7e77a1b5555b5ccf6c5c03
 DIST pango-1.34.1.tar.xz 1015112 SHA256 1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c SHA512 7ab0961c05cc30687827fe7fc8b86827bcd7916c048811c09796c38d449575eab292e817f3339be44e1e6a61f7aac7c172ceccaed7deda6e7b4286e8a4436255 WHIRLPOOL 478e6696678d823cd8cbbe9dc39a3a9c629c0dded33d609bf9bfb66aabcbe3089a401ea16ada15200b64dc032c3084ac318bcd8d6035c232e077eb6c381a7714
-DIST pango-1.36.1.tar.xz 1017924 SHA256 42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8 SHA512 4807462ad2ff886ebdf83a6d4a4f7f855163de1d58a9cdb94de48d003bbdff2697ebb0628029e6270cee13071b81f8104b35ec9e0d6801312969299b8d8f859c WHIRLPOOL 7e388d553a9dbe92705db19089b499227cd769a80b14bb59910e82f8601f0b7caef10d7abf5f8eba6785cc656ab165979697d2f3899dd41d3ff489b689cf8201
+DIST pango-1.36.2.tar.xz 1025208 SHA256 f07f9392c9cf20daf5c17a210b2c3f3823d517e1917b72f20bb19353b2bc2c63 SHA512 986752002cd7a7af4efc33bbf278a5076ca19c20a6a5b885a52b6b4769f564e119b69063143989782ad9934727ba80a0f87349573adf2ef74baf7c101cb03b7c WHIRLPOOL 3cd8949008b07ebcb458a8e14cc6622e23805446508b69c0aeb2172f29a080c5b22e875e9f2401b4207f39b767a36652f8f40925ce13e438d438d90fd31b0062
 EBUILD pango-1.34.1-r1.ebuild 2772 SHA256 59c4c633f716d7012ba83fae4667ccb40edb228a0802ae12aedb27c3192d3853 SHA512 39fbba407ceb8052c053e5eba11624759e74bb078bed21e07ede3faf130463dfe8914a5710f92d7eee48c38e9a88dc6e2abb63fda5a9261bdc0dc3e7db1c668b WHIRLPOOL 222434d8548a9f04a54cd768bb1dec00d221ca72e3a4eb55cbdac8577727c31506a5410404545cd442c6ea902577aed3bf354cd68fa94038d9995b17be295ca0
-EBUILD pango-1.36.1-r1.ebuild 2704 SHA256 3b7b7a208f9714211b0e2b4caef8fa2295c2567ca5fa5b24ead6ae6e64370aeb SHA512 cbec191ce9f56f47d40535795ee61fbfa66b3e58a2607452491e0b18fdc4068e51610fd37a15b492cfa567d251e7dd1511bee0c4f7237a0cc799fb038e94c1dd WHIRLPOOL 5b8bb741b241a48b9b465efc95c378b91f9a9e07e96dc9cd34623699c4e3b747a73af89a372c6dad334310e1181d7935999dd71d24c37a2e85c5c634ccaca7bb
+EBUILD pango-1.36.2-r2.ebuild 3086 SHA256 4a87d4f8c2da6bfab653ef7946136e9ce3c0a41d7f1bd0d1977755cc286f02d4 SHA512 afabf62473a480a3c3e4982c8fa77feb8e3649493bfe60e73fa143db0ee2086c9c82711ecfc0c8f7a541ff4055ee08a0c89a3ded5e1e5e55d377acd32b0d3ae3 WHIRLPOOL e0a1434fa4b49ab066df25fc3ebc2c4ef5c550cc4495ee66adb632201dd9500293b544099dd995140a11e2f66540f0c47c1fba8028b134f6032f7389e13326f1
 MISC ChangeLog 49049 SHA256 514f9698dfefd89d459c9af34dbaba05ae504217d394fa0cd20f8a94f46f3e6f SHA512 9e25e45a5b98b72bb7b40e8c0a17fce1d1a33f5ef53447af40d3244abf4e485f3f6e2eee9e5a22c4638439cb99b5c1a43db69f5b96884ec37ee4d27306301f53 WHIRLPOOL 331b6d96e067186acd9efd1857b000e37eda9a99bf098bec2cbb07e239aeac01ed7aeee8abafca4e734e904b428aac23004521d856ee5d30f9834862db1377d0
 MISC metadata.xml 244 SHA256 20812e9c9f3ceb9adaeda150307d00c8e8d8ad03faac4518cf753cbdf5c729bb SHA512 849c0f727d60d5c50ed15fc640f59246c98115c37095507db0a6e03c196ed9875ca71d95b7f12170ec8ec81e7f907a364522c5ea7bcf51d253b264ab404a902f WHIRLPOOL c6e167a16dcd88d78cd123dcc5283a5adcc08daaf7dd713c139a2a606dbe2009f7c68b4d2d017c8357f5e422ee9b3e2516ccc7139eb8cdabebdb106be82582e5
diff --git a/x11-libs/pango/pango-1.36.1-r1.ebuild b/x11-libs/pango/pango-1.36.1-r1.ebuild
deleted file mode 100644
index fb84c2e..0000000
--- a/x11-libs/pango/pango-1.36.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gtk-doc autotools eutils gnome2-multilib multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~amd64"
-
-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[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.0.0[${MULTILIB_USEDEP}] )
-"
-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_WRAPPED_EXECUTABLES=(/usr/bin/pango-querymodules)
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
-	eautoreconf
-
-	gnome2-multilib_src_prepare
-}
-
-src_configure() {
-	gnome2-multilib_src_configure \
-		--with-cairo \
-		$(use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/@GET_LIBDIR@" "")"
-}
-
-ehook gnome2-multilib-per-abi-pre_src_configure my_abi_pre_configure
-my_abi_pre_configure() {
-	CXX=${CXX:-$(tc-getCXX)}
-	export CXX
-	return 0
-}
-
-ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install
-my_abi_post_install() {
-	local PANGO_CONFDIR="/etc/pango/${CHOST}"
-	dodir "${PANGO_CONFDIR}"
-	keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
-	gnome2-multilib_pkg_postinst
-
-	multilib_foreach_abi multilib-build_run_in_build_dir abi_pkg_postinst
-}
-
-abi_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-${ABI} --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
-}
diff --git a/x11-libs/pango/pango-1.36.2-r2.ebuild b/x11-libs/pango/pango-1.36.2-r2.ebuild
new file mode 100644
index 0000000..d922c8b
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.2-r2.ebuild
@@ -0,0 +1,107 @@
+# 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
+)
+MULTILIB_WRAPPED_EXECUTABLES=(
+	/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
+}