Version bump with improved Korean and Myanmar support and various bugfixes; introspection support should be good enough now to enable by default. Fix tests when python3 is the system python interpreter (bug #501844, thanks to Émeric Maschino). Punt obsolete versions.

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

7 files changed, 55 insertions, 121 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 4ca106d74789..652942ef23a5 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,17 @@
 # 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.61 2014/02/22 15:32:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.62 2014/02/22 19:26:36 tetromino Exp $
+
+*harfbuzz-0.9.26 (22 Feb 2014)
+
+  22 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -harfbuzz-0.9.18-r1.ebuild, -harfbuzz-0.9.20.ebuild, harfbuzz-0.9.23.ebuild,
+  +harfbuzz-0.9.26.ebuild, harfbuzz-9999.ebuild,
+  -files/harfbuzz-0.9.18-ldadd.patch:
+  Version bump with improved Korean and Myanmar support and various bugfixes;
+  introspection support should be good enough now to enable by default. Fix
+  tests when python3 is the system python interpreter (bug #501844, thanks to
+  Émeric Maschino). Punt obsolete versions.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> harfbuzz-0.9.23.ebuild:
   arch stable, bug 888
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index fb1d2d4fc6df..499c99cf0c1c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0cf5d1333d1276909660c1b4dac8045d8fdda SHA512 5b0072805a8e6a2063be9e6902714196d28a51b5853a3b36c8a63ce34e6381f55cf7669a15c7d7959ed27546abbd1475cfcc41a9f6c05a955eea803a69b89aec WHIRLPOOL 8d49e7bae164d90f9e08c880c65fb18968c61a86a85a694e632aac4afbba4078bbc092a6db9f206eaf6beb77f575541e3a801f7b8addac470f4fda07110f29d6
-AUX harfbuzz-0.9.18-ldadd.patch 722 SHA256 ba662d39a7e1b704c403c76c7e40c523998cb5011b100c7a025369d2b96d7a2f SHA512 4774c697b608a262362630c1a0987fa051cd1a128474e5b3f4c3a188aa59def37a55270ae1bd80d79d320ea977f5913e40546912a557dedfd0462fe90d885184 WHIRLPOOL 17eae4c25cdb2a34774043b21040b3620408aa0343a37378a3e2da84760eb0eb1183d8f975088afd19f191665f80b83bead05c4bd4275c2db08442785ddbfdaf
 DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5 SHA512 10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff WHIRLPOOL 6228766b74a46482811ce0e4c85b6bd80d4c0e37aaade3c2b75b790ed1409255d481688e0def89b75a9a1df3ef10bab221dce105439a433e5b33e65ac8685c63
-DIST harfbuzz-0.9.18.tar.bz2 902395 SHA256 fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908 SHA512 cf873e903b620391efbd681a01620f1719d278bf10a61a8f583abb9ba116ec494459cef1f81f137cf2dbb089c9d6a8460576ccabd46ab3f23a50e3731b427f5d WHIRLPOOL 57ecc5fdb9ed879113fac335aa3a222963183832257a58944c561e671e3d514bde462a323b776184d10b2bfe1abc9151c93cff8d9098abedcfa03415708a0fea
-DIST harfbuzz-0.9.20.tar.bz2 1030152 SHA256 83384fa03fbcf0c5d8203374bae2efef7dcac650f428d2216d8a6d2251dbbc67 SHA512 2473885cf77f2353a28779f55aa5eb323190fd5432d2bba0026a0b337986d293e8a38d7a5bd6c68e7bc3843e6ad3ed3a592d12b896fc28ff7119c67a8c7d6f45 WHIRLPOOL 0a35408913a042a3055f30b743d4e278b903254e762a6daa37f8955aa9907480b670120a6520e7b2487cfcc00959d43930c845293d8a674826fe90f8c2d3f18f
 DIST harfbuzz-0.9.23.tar.bz2 1027508 SHA256 171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 SHA512 b6ddc3e9401d0719757b54aa797cd3a5df58c0740998b95f4d73380cf1734d865099b95683774b393d372bd94fdece2dbee172a10242f36769dd848ec30ce558 WHIRLPOOL d6248a590ef639937483e1b67a21770dc393fbdc57c03fab2c060cea3569ad7d47f07a01854c9b565cb80d41d44e0f09d3f07fb4d81828c7eb346ddcade8196d
+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.18-r1.ebuild 1951 SHA256 cd7e640ecb4800b80df98adf3dc9cbd062762715e4d9785379abf14055d16aec SHA512 4ac064adce670057a1a02eaf5a4cd92f17ab418cc134ff370eee6fa0efa43738c4e51d3546a08e90c50b67d6892d5e2df4659706b57d9c8a068a86b62ade81ba WHIRLPOOL 96c8eac8301a63b60cb9be05c138789fc09e4ab24ce08e149700d2b10ca4b010daf23611373fb4b6a8b6842ff7d21c27cd2d8677dc3dfac9cd478fa015e86c96
-EBUILD harfbuzz-0.9.20.ebuild 2519 SHA256 ce5a919a0dd1caa1f5e02ed9221cc654d7214ef50319596abdfff46a157ebb01 SHA512 718ec1408a1814bf4164308a319433639f7f35c3587db070ae1c8c0f87d6c46fb8cb41ed491675cc806d61082b90114506c11d00f89b5410a3d710bdac62b708 WHIRLPOOL 7a7ca8fcee5cf7144ae96acfb660760dfe70dd413dc345683cbdc2e0e64dbbffe3dea1083031a31ab86a518181d980ffd6f41003f305cb5778034d8375e8a4f2
-EBUILD harfbuzz-0.9.23.ebuild 2461 SHA256 aaa01df2ab813c3f52f7ca30c994ebbc626733234ce006668ab1dc8b10bb3924 SHA512 20f12d9e2cc8b4a989a0e5cfb3213102faa00a3c9f27598620c73e1b690b150bcf0b65db354589fe25d96927d966649d8f0a8116a0fe74a32fb98586a2ab95f6 WHIRLPOOL c9121423a838e5fd48e9aaf2ed95fe5982acb3f8428b15103d37959e2982e3daaa6672d5816f557c29957bcd2fd02199f2150fe2bfecf4a995cb42ed15e19927
-EBUILD harfbuzz-9999.ebuild 2470 SHA256 2dcfac694773ca1e1e202afae1e239ac91bd2c9cf26f076881649c7c7982a684 SHA512 e265298bcd3916e44e02adb2b1830ddc014caf672fae6b25a0545530f4d44b638adf76e4071f0a16beef78b630c8bc05ecb3c9a3f9694fa6e49c3070ba39b8d7 WHIRLPOOL 82b5851d4d0054f34f1fdd08b0e99f7e9ebc0f82859364ae9d15b2b9e448750b7c224e784bd02e00523be45061eda868a3f6c3756837cf0dbf642af9f8bb4bef
-MISC ChangeLog 9271 SHA256 26f70295f24ffeb074caeaf812151d67a5b248f8d1a1b676fbdb257f90aee7c8 SHA512 16e3502614eddf0ca4c763508e3e8ff9ea3d705e19098ef6e565c28d47b553f52b9f50d6c3e209c89a7973f0c9169534205c72f4fc5619849bf481780a4ed33c WHIRLPOOL 5799ff6023348e91a6c0a723e1691cd27e592107ed0559ecbc21548370dc6ef2838d9ce5a9605128a11c57df849b8b12de54374c4b27fd3841ea6ee851b934c6
+EBUILD harfbuzz-0.9.23.ebuild 2589 SHA256 857e0e8a3a344e9548bc69e2e78653d614c2f2d5b29b9ed75be5a0aa19a94894 SHA512 ec369b2627d9cee36a985870b1169b135bb76ada42df457cf9fa85ace3ed2487e6a6ec0383fae0e545be6445502f4faeb9befb4da5d290632048ea123e6ab063 WHIRLPOOL 463f0a849840c77beb68d490e65688caecfcce2bd28e81d6e4b864375037332275b886958df84671a7b1f2d466ecd72652674347772046e832d0baf409b4ef5f
+EBUILD harfbuzz-0.9.26.ebuild 2517 SHA256 d8a978c06ac4dc08f3db3e7c96ae1d878cbbc393628f706dfb239e73133af032 SHA512 86c8b0dc4ec86e60ca7b4a8bf6b7894b0cce46ac518729718b7e24ef8933936630c5c96f14d8823bd3b18b520896415b4825701999c405fb7e42d10456ee78bb WHIRLPOOL 63962d2898e4b28be04da4a0850c98b95ea420f4606ec588eb92f7193eaa6560abc9c3ecb4dcf8bc16e9f705a93720369aebcc46176ac9f27f2c2df45833e02b
+EBUILD harfbuzz-9999.ebuild 2516 SHA256 e4bb2175b3f339c44941c06b18c01830822fbe6519c3f71eb75412311ba593e8 SHA512 7177516922d2427db969f56f515cd625b68c1720cbc14eb66f6ab7eecbb41efd7a245b9043feb5829b2a20e57cf5c6b66f0ad62bfae476e1d796b7234897b5b6 WHIRLPOOL 3b5954e806e46340fb8cae9363f79caed350e22a69b41745e6758ba0c396c100b122949a6af4b4fe61499859f70a511e7e7dfd9ecc496fce4ef1df4092a59821
+MISC ChangeLog 9810 SHA256 c2c5307834e2e8f5d5569d8b2a34fdfd36d902125e5854aad790de7a1c4e34a5 SHA512 8646f0004f9ec1dacf32f2b1b2643fd32107bed4c29441cbfd6b8aba47b91e24da5d4c52a2deb1eff6a4768710c115643b952f0fa10cd474046c361f47e15c84 WHIRLPOOL bb6817d9e38654dfbc4f1c2adc111f7cd781416a02e8e896c3d599841faee6ada1285a8adff6a967e87c12398356d251c93e22fc49bbeaf6e1092e0f53906727
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMIwwgACgkQCaWpQKGI+9SAggCfb71Jqfis07eSS9f1AcYmbo4T
-YFAAnR/S9M3PYeufhhee4vrYOemN4MTC
-=fWyo
+iQEcBAEBCAAGBQJTCPm0AAoJEJ0WA1zPCt1hDD4H/ifd8XsF32Jbz5L6d+TzMXkz
+eMUGxoKzN8EgEX9uCKJiA9OBJKqkRn6Iemo3u7eGb6TJIDT3D6yVKrBfZm5vLylN
+SAAUx+Kfu4ayBbYLRcqBPTWwY73XVKCKrvVDKAQrRcGQuhgf8bYJWwPUEPmCVrad
+5mDyTOEelYURCkMplSoB2iKVCbFUSTgAn6ZrdoOmvXCKD6D1hoUICmiLDwSdcA0O
+jcViJb3ijsedRZKphtY/zQDfRZ28JeRcSnm1BZ5rt1VFDsvDVQ9g/lK8qmH8hRum
+F1B02Vc7+kUwa4Yc/tAmn4EEkZ+Mth3UAfbfi3zcrX5wn7Xv+/Q4E1ofusLVstY=
+=/YGv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/files/harfbuzz-0.9.18-ldadd.patch b/media-libs/harfbuzz/files/harfbuzz-0.9.18-ldadd.patch
deleted file mode 100644
index 6b76e350288b..000000000000
--- a/media-libs/harfbuzz/files/harfbuzz-0.9.18-ldadd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2966d3603259430800cb5880491d28a1c5ea2314 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Tue, 28 May 2013 21:34:37 +0000
-Subject: Fix test build
-
----
-diff --git a/test/api/Makefile.am b/test/api/Makefile.am
-index bef7716..4ff14fa 100644
---- a/test/api/Makefile.am
-+++ b/test/api/Makefile.am
-@@ -28,12 +28,13 @@ TEST_PROGS = \
- 	$(NULL)
- 
- test_unicode_CPPFLAGS = $(AM_CPPFLAGS)
-+test_unicode_LDADD = $(LDADD)
- if HAVE_GLIB
- test_unicode_CPPFLAGS += $(GLIB_CFLAGS)
- endif
- if HAVE_ICU
- test_unicode_CPPFLAGS += $(ICU_CFLAGS)
--test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-icu.la
-+test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la
- endif
- 
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild
deleted file mode 100644
index 15e73b357789..000000000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.18-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.18-r1.ebuild,v 1.4 2014/01/20 19:21:18 vapier Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-2 autotools
-
-inherit eutils libtool autotools
-
-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 static-libs +truetype"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( dev-libs/glib:2 )
-	graphite? ( media-gfx/graphite2:= )
-	icu? ( dev-libs/icu:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-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
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	epatch "${FILESDIR}/${P}-ldadd.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(use_with cairo) \
-		$(use_with glib) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(use_with truetype freetype)
-
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
index 19398bb81615..4c6f38296638 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild
@@ -1,13 +1,15 @@
 # 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.23.ebuild,v 1.8 2014/02/22 15:32:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.23.ebuild,v 1.9 2014/02/22 19:26:36 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool autotools
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool python-any-r1
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -18,7 +20,7 @@ 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"
 # TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
-IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+IUSE="+cairo +glib +graphite icu introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
@@ -32,6 +34,7 @@ RDEPEND="
 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
@@ -40,6 +43,10 @@ DEPEND="${RDEPEND}
 	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
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.26.ebuild
index 9ddeebebe0f3..bf83384829bf 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.26.ebuild
@@ -1,13 +1,15 @@
 # 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.20.ebuild,v 1.9 2014/01/20 19:21:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.26.ebuild,v 1.1 2014/02/22 19:26:36 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool autotools
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool python-any-r1
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -16,9 +18,8 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
-IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+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="
@@ -32,6 +33,7 @@ RDEPEND="
 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
@@ -40,6 +42,10 @@ DEPEND="${RDEPEND}
 	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
@@ -51,7 +57,6 @@ src_prepare() {
 		sed -i \
 			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
 			src/Makefile.in || die
-		# can't find how to patch this in .am file
 		sed -i \
 			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
 			test/api/Makefile.in || die
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index bc1409b51d51..799ca13cf378 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,13 +1,15 @@
 # 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.20 2014/01/20 19:21:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.21 2014/02/22 19:26:36 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool autotools
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool python-any-r1
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -17,8 +19,7 @@ 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"
-# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
-IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
@@ -32,6 +33,7 @@ RDEPEND="
 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
@@ -40,6 +42,10 @@ DEPEND="${RDEPEND}
 	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