Introduce multilib support as a dependency of pango, bug #488864.

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

3 files changed, 113 insertions, 9 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index efbbfed1a988..00276c970a89 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/harfbuzz
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.64 2014/02/22 22:22:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.65 2014/03/01 13:33:20 mgorny Exp $
+
+*harfbuzz-0.9.26-r1 (01 Mar 2014)
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> +harfbuzz-0.9.26-r1.ebuild:
+  Introduce multilib support as a dependency of pango, bug #488864.
 
   22 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   harfbuzz-0.9.23.ebuild, harfbuzz-0.9.26.ebuild, harfbuzz-9999.ebuild:
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b16f51d642d2..80f7cea320ea 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -7,18 +7,27 @@ DIST harfbuzz-0.9.23.tar.bz2 1027508 SHA256 171ab7f58e7243082a4582f4d1f21b3f4446
 DIST harfbuzz-0.9.26.tar.bz2 1060264 SHA256 5ded7dc3d15fb5c9230d7a224b9256b67b35fde30193b4c3a4c3f6b13110e257 SHA512 73a6588fddb7f33ee90f96f3e34b8c6ba4bafffc4879560e38c4b7550adbd56154169de916c48bd46b34e771641a1f83226e9bfae7ea04ccb31576c4a1aca802 WHIRLPOOL a5758675f42a47de766b695698b242baff9a127b28c24727210341aa5bfbcf7a6e86bf2ec1ab2b68a389dff9d54d672d2d7fbda71f4b2d535e0705dfbc3dc27e
 EBUILD harfbuzz-0.9.12.ebuild 1695 SHA256 e6841761c214dbda69c314c5bf1ff6e84d38909a49bfe9d54767ac071b943999 SHA512 5becf409cad878a9a8b6dbbb112aa93bd6376e0d5be79b58b269e663c036761851da80590bc13cc99fff92bcfa3d5f2b633ce3c6cc1218494293808979dadb28 WHIRLPOOL f1caba836acca66390503e7ca2a17d971172dc55ebf24258e543a873f2279a0996662b3465155b0527bc827203c6b041b4f19857a6c8237f9034fe65f5fc4802
 EBUILD harfbuzz-0.9.23.ebuild 2472 SHA256 e60da99ce7daddef100fb4205989497de016f08a16b4b6a6c9b53a6d835a0eaa SHA512 467ac6222198f347383efa81403e444bf07a56b3a523fa0c73b6e8ffde595c3c654df57128e1b64e8a9133597528afe775440cb29834bfbefc4bdc2c938e378b WHIRLPOOL c0cdecfa5556ed27b92b1ae8926333a318cb5b075661176ec643827b8d99a7787d3740a6489bf179fa2a314de8fba7e26f3e042f16f282856b81fc537d350ca3
+EBUILD harfbuzz-0.9.26-r1.ebuild 2778 SHA256 4b65badb0deeee8c8f929e8530555ee974a7c3ad627d044d4fde42af6ca57447 SHA512 ac2dd5ad102069348d22e27684325410e495a08a6b1b0b6a89bc8dd27e42d6d0946af15b71234daff8e2d62a32055efefb01dd821f5dc398d82e75a87df93355 WHIRLPOOL d274d4862bdcddb77d0d274f5fe98778f382a2f838cf1209f69b76cfc5865e7278f496a796bfcadd652fd76b1b250797fb6f10ec7f80e97a3276c0186498de80
 EBUILD harfbuzz-0.9.26.ebuild 2517 SHA256 6bc129c0694b2f2974384dd9763053d5a6647f9a9e8be4f96b11e6463d70b59b SHA512 946d36a728820fd3b4a90fdf130872e7a6498991d8b9b03af5cb3e5d773346c2c315e423925497068c2cc4adba9cdfcd97f58cc43f793054090ebfb92a35187b WHIRLPOOL 901a703ea9a56f99995be035a1699fa29df165c5b7c55d58af0f10873d5264bce4c52f26ab33cc29186a051b6e30738f6c59c795297f23b857b58f15bb5a8b7a
 EBUILD harfbuzz-9999.ebuild 2516 SHA256 22dc1d33311c0b40b85f295ce758b1a3c87012da062d6068522dd77f231fcce3 SHA512 85cb252eabdc1d15b3694ad3e9ac94a7412cd23e606e2b5fdeea2247589b912e83cf6400e88c6dafc65c6fb89b792abd8b0f3587ec91f58570fd2c7b2df56d6d WHIRLPOOL 3fa8f3096d3aceea050fc303d767b3a9321c8d518f899ef54a5a8670bcd42b100001df48ea6f18637f86699d24bd5c2f0ec6b1759a74e07f395a2b495405adb7
-MISC ChangeLog 10116 SHA256 df3096ed9bce4d7b3ae06a54319b44e1ad581fe186100d2fefe1d312b7da69f4 SHA512 98b6ab34064f410cde321bfd34cd09f14e25852dc3bc9b62a53759cd09ea91a3cb0d11f2272af6c186efa1a6354e0f742e04b7c1923471fb3629fd0233d74568 WHIRLPOOL 374c159b14667b43d6ba567f85c891859cd1e1d1afa73686ac05ab6867f7f1b6c1f749b1144f392075584ffab54e5fd3fc403988b8bee22741dc88e271c8a607
+MISC ChangeLog 10295 SHA256 93d0caf2eb36697c6c00b8ce860433989305dc6c3eb61b0201c96d2f336a986d SHA512 6c6b2b0959f0bfd1e2dfc06ec4d7975935fe0d2b82436d7bedf3af5c704a771bb3370b012ca58e7ed2cdac7ec6b5d3f76971c7ab255bd1ffe111c0387001cac0 WHIRLPOOL 096277b78a9669e2f0312681b008c2d6ef4bb5050f8f56a0d2214ee69d6c0e42b4c3286f87a124ba80b69d6662f7af19a464be89e6561397c8ba18c50afe0ac0
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCSLrAAoJEJ0WA1zPCt1h19YH/iiUgh/uwuuveRqFx5dZNxgd
-5DM5BM/O55XPfRAEx8+rgroJ7CUMPYoGtUMRhw5cNYc2XGvLb+EHbR5pMV6d7+t/
-iWi+WKVSdq+YW3WMoh9Y4qzvCNGSSukhEmOZwKSdgEKINYW6dEkLvZef5z1VzxOG
-RU1kGJ9CXYut5JbLgM5Gq2t/U7/haAJm8pdrshI/UtpSsjfuvFY/43gQ2SjbKXJl
-P+isE40eFdAhCT8kJ0hOZcKGarDQC7Nz9N9oYglPk7Oz+ohYCB1vK3f7No2HfHTn
-GuH8OS6dwCJjKZ6M3KF2samnp+Y8VPXeCCVrWaz+8FYcZJw3vKSw+6YPuDsGLoE=
-=2pji
+iQJ8BAEBCABmBQJTEeGiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJGYP/1cHTTTF4jLZtoQMLxzN6EQU
+F2TyFebHakaPCu0Udmyb2bD7euE4U+Fz0PSDLqL6xeiWgxhzOBN+GByT0Y7iEs1D
+E0/tHwvFlNrC2VG+YUlZIiNLi1WkN053yTDAjm++9N3Yah1O8kGl5S79pwnAu71H
+HcBe5yXQ4Fd+l1OL4oHPM5KJyNsRIM32LM36ldBp3UtoFcgDjgu7MZYBBmFR4vCQ
+mJNkMJQBJCSkBFNK4TV/R1n49xIdXzvN9YdQD+YgBj15oWnSZiTckt3QuJB15pvx
+icfWLks068fxyai3Y6R2r71jXCdOddTTjK3F9SYRuByrT/GZCr6xjvniMw0WRDPw
+CMskUKVhGXELOGQxqOSaK1YMQ22rUDtl3i693zvHRHd8DPuEn73drjDX2nVfI7CG
+pbO5+AN9I0uE63JoYUD50eTAADrzv/Sxy9ju+0xhoc2m4/FhCBlI/eqeehmd8D19
+PkCTrbTEpJpv6nq5H+AKCgH9HxfxupD0t+tA2/fdKb6bbQ/OywJ0QriKiK87/ifd
+jGuAWVBiCD5bDXRYrpOjeYVMgCYU8p5rxk9l6tbbhoZNpZZMF4eQdReu3DseBDVw
+sn8Q6vH+84a7eYGcDkhqebh1CYv1XkRvs7aWzr+W3b3yx74d3RzQch935caiX+9r
+eZHBdU3BhU7wYSVIz+nu
+=X3cz
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
new file mode 100644
index 000000000000..6a482d96c8b0
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.26-r1.ebuild,v 1.1 2014/03/01 13:33:20 mgorny Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-2 autotools
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	graphite? ( media-gfx/graphite2:=[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+	truetype? ( media-libs/freetype:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi \
+			&& use_with cairo \
+			|| echo --without-cairo) \
+		$(use_with glib) \
+		$(use_with glib gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_is_native_abi \
+			&& use_enable introspection \
+			|| echo --disable-introspection) \
+		$(use_with truetype freetype)
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+}