Update the live ebuild to use multilib.

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

3 files changed, 35 insertions, 28 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 00276c970a89..2651de8f9f5e 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,9 @@
 # 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.65 2014/03/01 13:33:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.66 2014/03/01 14:04:17 mgorny Exp $
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> harfbuzz-9999.ebuild:
+  Update the live ebuild to use multilib.
 
 *harfbuzz-0.9.26-r1 (01 Mar 2014)
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 80f7cea320ea..55a78daf13e5 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -9,25 +9,25 @@ EBUILD harfbuzz-0.9.12.ebuild 1695 SHA256 e6841761c214dbda69c314c5bf1ff6e84d3890
 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 10295 SHA256 93d0caf2eb36697c6c00b8ce860433989305dc6c3eb61b0201c96d2f336a986d SHA512 6c6b2b0959f0bfd1e2dfc06ec4d7975935fe0d2b82436d7bedf3af5c704a771bb3370b012ca58e7ed2cdac7ec6b5d3f76971c7ab255bd1ffe111c0387001cac0 WHIRLPOOL 096277b78a9669e2f0312681b008c2d6ef4bb5050f8f56a0d2214ee69d6c0e42b4c3286f87a124ba80b69d6662f7af19a464be89e6561397c8ba18c50afe0ac0
+EBUILD harfbuzz-9999.ebuild 2774 SHA256 0de3e31c4c39bc178c5e542a1bdfeccba889bbcdf1237ebbe182fd3b585003a2 SHA512 6206464bfd753b39dd6a5f27db18384658ee692ed2f1ad73978432eee42b8f82d33bee587e6d3982c8fa267d733c8e6e931c362e737545824eced7f733182578 WHIRLPOOL 29cfcba52d0000d1be278fa73b8a0ed971f6fd4c53bbb91d2ea1f48e986c7c4491c8710bc44a9ee0acfd11bf0c8137f7e3d83508a1651f8be2fd3176f0b59eff
+MISC ChangeLog 10410 SHA256 a656418076fb4ea82d0c1395cf158537ae24cdd0e6ecd5f3f250bab2210b29c3 SHA512 8906b63cb6f08925f1e838f58032d68aece378e856aa88f61ed7b10c3d5199bc8112cf7027de1c8c7558928c8b6d3de07bae5b0eb2c60267c46475523e7b89fc WHIRLPOOL b8eebcbb5bdc02bfee702e56c3592e1c1e3d189283f718fe76400a15e387c98e2571aeb1d171c91279a1542c9c0c915747d3b2acccb0323fe292f3aba40b8cac
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEeGiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTEejjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOo0P/REchxR5zmf7FoZnvoDXAjiK
+OmMuIdXirLquHR6NTiziN2bw7N+2viiosk4DA1WePmuA4gnh7bThm676nqd0gyOP
+UiEtDTTxMXjm7n+9jhNQp9bp3Enz1vvJKsC0/G9tY0W8eKil2x077jO4ZKCF07Vd
+I+iZc0b8fzeoiBKJTI8Wb/LBvSnM6Z8H0sXi+3wN5LQEzPrd90srEafrS9HN/5bH
+C0cqE8L6Eb9JLY2sGR4D1gg8KKD9aWRk+tU7lrd2ZaTKzGZIV6oAiq4r4DyqmT3c
+1WX7ZXGJRA/fq0+E4hwgiUuKkklRE2Zdof55GW79ElcI4cThWtTDG2mVfD5NK8zM
+X0oHcxhZ+V++aaNvhqLeN0KRMr2O1+d8UOMYtWbZOCuq2v2r/VREeo845hEum0Vq
+U6M+KmvNv/7T94fC3F6/xxgY5NF2aa+zjLSze/Nu60ORQvMw48xU92FUs0OCAhEq
+RGfAHqSIQuTpxpMHYYVp/11vQ8ctL/yBw1tYpdi+Ywf8ziXvWacMWxChfoXzRXju
+mZgYgKMWgL5bmdnN+aGsHY5z4C5mFFKzflPZ6t2lLgwbGT9xUqPRTEzEf2/L8KZZ
+i2LAMisUzfT6I4cm+n6m/rqspsjqHncMdEX7k6dCDmTqIznkwSq36CsR8sbVTRc7
+9X1tB8wEVI+CAxSdeIfq
+=9FhT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 5f7cc5cb363f..88125fcaa4d5 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.22 2014/02/22 22:22:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.23 2014/03/01 14:04:17 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils libtool python-any-r1
+inherit eutils libtool multilib-minimal python-any-r1
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -24,11 +24,11 @@ REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
-	glib? ( dev-libs/glib:2 )
-	graphite? ( media-gfx/graphite2:= )
-	icu? ( dev-libs/icu:= )
+	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= )
+	truetype? ( media-libs/freetype:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
@@ -66,21 +66,25 @@ src_prepare() {
 	elibtoolize # for Solaris
 }
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
 	econf \
 		--without-coretext \
 		--without-uniscribe \
 		$(use_enable static-libs static) \
-		$(use_with cairo) \
+		$(multilib_is_native_abi \
+			&& use_with cairo \
+			|| echo --without-cairo) \
 		$(use_with glib) \
 		$(use_with glib gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
-		$(use_enable introspection) \
+		$(multilib_is_native_abi \
+			&& use_enable introspection \
+			|| echo --disable-introspection) \
 		$(use_with truetype freetype)
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
 	prune_libtool_files --modules
 }