Version bump; libharfbuzz-gobject is now installed only if USE=introspection (bug #535852, thanks to jshin et al).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 130 insertions, 20 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index c327277d4246..b4f82eb65825 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/harfbuzz
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.96 2015/01/31 13:14:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.97 2015/02/17 17:19:34 tetromino Exp $
+
+*harfbuzz-0.9.38 (17 Feb 2015)
+
+  17 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +harfbuzz-0.9.38.ebuild, harfbuzz-9999.ebuild:
+  Version bump; libharfbuzz-gobject is now installed only if USE=introspection
+  (bug #535852, thanks to jshin et al).
 
   31 Jan 2015; Agostino Sarubbo <ago@gentoo.org> harfbuzz-0.9.35.ebuild:
   Stable for amd64, wrt bug #531592
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 56469cdf72cf..4bedb18f00f3 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -5,26 +5,30 @@ AUX harfbuzz-0.9.12-hb-version.h.patch 2003 SHA256 39b7689aac2e60c105b17acd3fb0c
 DIST harfbuzz-0.9.28.tar.bz2 1063769 SHA256 a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048 SHA512 6b475cc05fc7707d60138573bfcf97f2415c3b8a17ddf844dcf919c215eee882f220a54792ceb9a15b009a5f574f965a06ed1d8b2cbcc990b758fcca3503f021 WHIRLPOOL cbb3a9ae0d3e00c8cd28b145982f396d75a7e56f659657e21f2ed9767c756b0a72e43c3b5b233667dcd29102a8307a791f5ef48e64d9abd1a45a495066264048
 DIST harfbuzz-0.9.35.tar.bz2 1165359 SHA256 0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed SHA512 843555b33a5cfb96a909f14a558818a10fa59b70e5284e749c96ec0273fc17b59d535fba314992e8b6713fddfcf3cb96826e5420e88a251e5d39802fd07aadc1 WHIRLPOOL de15ac4fa6680b10121c50b0dcb0412aa04d98729955ea8bd58d83ef629098eb2eeccab36d0e8b9a224b2d4ff19201b294ca27e5552ea4cefdb1abe73eb3c780
 DIST harfbuzz-0.9.37.tar.bz2 1172911 SHA256 255f3b3842dead16863d1d0c216643d97b80bfa087aaa8fc5926da24ac120207 SHA512 0884b0b672e8c99070f488dc7b1054d633c66dd1cd5f298dacb5246d280d1e8aace243dd38958b5c42d7b43fc832ac6031cacaf36e1fc6b58a82c12235eddd5a WHIRLPOOL 725bc9dbf63d4885df8fb11936f0208ee9cddf4082ded5a69c1daf814a314833bd4913cef557a3329f02914053cba886f25825a00fd0714482d06c5a3d117577
+DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
 EBUILD harfbuzz-0.9.28.ebuild 2728 SHA256 6fb6a7ae7f7252fc24d9701dc328b522a8338b268a5b97b8b03997e2a387376c SHA512 0e7f1109cff353bd613b1e2d1cbebdd3dd2c0154fd770c0c7340a0a3348ba692293c2e573a7fc640f9e32b36863fc041242d9f575c355217c875a622a9c18f49 WHIRLPOOL c10958f78f0440cbc9a4a8f3202dd1cc2436b77f9a523df61adafa913b41e7a1fa30cb12f0a34629273988857571a79eaecc94d306cd280da97b66dd14977a3f
 EBUILD harfbuzz-0.9.35.ebuild 2830 SHA256 9cb0a79a40203a280c34a704cff81b9140d13d015489fa875990a433d54b17d9 SHA512 3196d33174779426e687d40471f100b9abb49b23a9f08344f78ac10919539b08e94b1d0edf5d56d41bd04751d3c4179b6671550fa6e93fcc67f656eb8b597ae0 WHIRLPOOL b47fe528118759fd9ffea3e479b127962e8effa28e4c7536e0bf851ee0e73f7bc1adc57d2df94a80ce3fed18a2bd5f51c90efe44396a93118a3ee1a4439f35a1
 EBUILD harfbuzz-0.9.37.ebuild 2840 SHA256 abedf9cd67c6fd4d00fba4a83b154069e60c74369b39378e6afb94582f7640b4 SHA512 bae0fbf4ee91eb8d559232e4b9fefea22d498425839e5d59786fe1ebccec05129f19316a930bda647335af5c2bf1609bc585821aefa67e47d606d30a62c31aca WHIRLPOOL 031ec4e49ce5af4d326e4cfcae650780a40483bf03d73962b612cdaf6fc32cc852107831d141890cb184865f6a2dc4c51bea50909e3223ea61cb1c0d9eab74a5
-EBUILD harfbuzz-9999.ebuild 2839 SHA256 4d00353f6e6d3f339e06b87fc1bb3a68bf86c2e41b93e34641a49db2ecfd1dd1 SHA512 62c2b4ccdd88f9a70fc96bf6c51dbf9ef32f3410f9999b43788f3d173396bf46d60f4cd7c82e65ed8ed86e0d3635952a55dad4f3d3ed63c0b807bc5ca76bd47a WHIRLPOOL 2d63b9b55cdf26cb2d3224e115fde0e835b1cac6f426cd516a642a7a2df64b0cd6c4e7677f76d478c0172f770bf6231fa8a18ade67b81e6c3f2c5d577a3fee05
-MISC ChangeLog 14317 SHA256 b4f14a62c98ebeace7e9f0c613c7997c794eefc2b0303872184d0aad1373043d SHA512 e3bb2594240770e985501d68c5e4c3f961aa7c7df3c8aa91ed52c4ef088c7e6886dd93f107097c5e4ad1ca7f9966c78e2668855adf091d2ad72f3ac3489ca2f7 WHIRLPOOL 24c984010fc094880de14839bfff774db7a707734ee6d08f98ed4705af7893feb9f520d2ea52eebb468c2cbd4eafe7b5936b324865514f0a7fd7bd6436a5c179
+EBUILD harfbuzz-0.9.38.ebuild 3078 SHA256 d96f3e43e608ec5a05da37a397381cb06984ca03306b1985023fb074d1fafbc8 SHA512 5f18f74cbd2489313692a70acf49b4cbc0278d94c8cfdfe6fae6768f95a30a3bdb3cdbf104ff25d0ba053f9c06f4aeced411034a94842b58bb95706064e90479 WHIRLPOOL 2302125a9d593127178609e6427a1adb15af74b8339c73a7085429a49187c6d9a6780d7a70f7b454738bcd79688609a29c06699971ee974918cbad9ecefa63bf
+EBUILD harfbuzz-9999.ebuild 3077 SHA256 e4039e22aef9e54b210ce2fc248d6c29b3543df414602246f09de0cf30a7b2c0 SHA512 16a6bad68592bbdfd8faaf68dce64d2629681f9064e3e11ff1215028c4fba6d21155daba7e3760672b6bc3d7a551a5cc5f9ec6b967fff1a649b32b644eea9d81 WHIRLPOOL 8fae9e26e02aab63469f99c287b958dd573b7041370428fbe11bab5eec64a128156c4d032e0632df5e174da902ec707d5268505b89237b9fd3818d150dff20b7
+MISC ChangeLog 14583 SHA256 1c74878595295ff735d2a44e0628725038d1a8cefba83b10c5a27ef8d31ea5d1 SHA512 ae5e731e188944c5fb2e62eeaa9a565cd41bc2c86652d126db59c8e5537f2c1b0fb9cdbe4a3e680adc8a744b0637bccd1aac1225fbd77739a81c41835e280b2f WHIRLPOOL 094022b67c0c82fdc93c13bfbcb6641850d281c369bf2a3658e6ef5a817507fecc253f4f8fdd5bbbeeee72444ccbb7834711b30013d542afaa8bcc3a85d2ff98
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUzNVRAAoJELp701BxlEWf4KMP/2mjOdWWwkCQsNpV9QXUxvl4
-pq+UfiI+DPh8x3Yj/Ozv23FnJQ6OEXo8Iu/Tn8iUyzBBXpms0s21nmuizariqDT9
-3bYCqBBW+wvRlsvXrTxzvls8IGwQJmCOjmRsxofB3lj6BeWdG81/dNL0/wwfaiUX
-wHtssqBuhIzXa6EDYrpiPTMvu3F48Nw4IuZY2PC7tQXrKdmNCFUkirmNo58dwttR
-bGo17ylZW3LZgoVliPL/7t6tnVV5n/Jn40Y0Sl45QhwrBEFC7H8/EEgA2Ehfz3zw
-oZBDK8KFvveUZKv/ai1uoxxML10P1y7BY4XfgaZ8Fyf0CQRB60Bgau3gow2DK+/i
-3A0EmiB0pgTFKAqX61pQf86bqfK6GX0cI8++yDp8gR5cPzIJxxca6tqq6hQG2397
-zdIC2vhVp0BZD8huLvB6PKiZ64QN6ql6SQ/Q3qWbRV6lXlomNTfTvDFv1WmL2ROm
-1Nfie/KyKgSjq2zTanqCsCeZtVr1miFQXojL2MQnQ6s5NF64/DWDmj+/APs6vZVt
-idyqlaKYlIUTwiKTb2MOAEOCURpMEccfFfjrlq6U6hWPWcxxy4Hw+8L7kxAfMIxZ
-4iidDBRhUKzoReCNQDRzvo/6bVsHd2rXpZNwHXa6wC9MCcLQj6DgZPzvHRaEN6vo
-zLHfmPyF3ObIVXYhJ6k8
-=A4Rc
+iQJ8BAEBCABmBQJU43goXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNkZMP/3ZFRiuhxA9slw7bDUdEYhzt
++Izsn+0EQ8VfUDURg8lhNn3B+7hX1oe3m3erV70DXjWWKsJnUYF0Djqf0QBTtcF+
+cIT97+GkXh722mH6qEKJGp2Ickxd06m9f3b5slb7qGumi6MePFIdab+1DPDKTwCa
+mP0uoYvxszMEn76NRiX3mwKywSc60JAO0QJMlgdKhK1oDDEK9/bxsaUVEDnUF+uh
+pgZkVw76wTqU8N6/TFPdClLYYujcTcLEG/6Uh5TL9fO6ApgNzJhT5U7rV9h1pArT
++ZUIqApOflxIoHWIWBqNvJIJYMPDc3yo2itK3srA7uvxgMjiJIuQlEPl/x7zLk/4
+Uoh3FyWoEVL6ku0yB7eCsczQkJAm6niETWNRzhR4bFbzGFI1KTDigu6HK610dsfm
+RpFXp27NeHIHJSdP3Svoi3ZTIwoMA+LjHlM3uJIGLVpEKGUBxpbYU2JEAFA7rABy
+W/bvL9fcz1CY8SU8P0MowQcSaa/epFZp2EJfPKXNoaAP1PVPxRLmbOYWslnOnCKj
+Xk1h4u7mlVzgCWt4l9n1jiwX9dPFBz9eoA8oftVXcSv93rJSWl7hnae3lpcF+y2H
+LoOZ0AIF6KmNfCuh5dvu2nUJ4Tj5pXLPMJMiuK9YdVSO0H/rgT/XA6/hK2cky2q9
+lIXyybNPH7PtryY8IVQv
+=JBAg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
new file mode 100644
index 000000000000..44f0181948c5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild,v 1.1 2015/02/17 17:19:34 tetromino Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 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 ~mips ~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.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+	truetype? ( >=media-libs/freetype-2.5.0.1: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
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 43bc2733d53d..167c40beaf20 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.31 2014/12/27 20:47:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.32 2015/02/17 17:19:34 tetromino Exp $
 
 EAPI=5
 
@@ -64,17 +64,21 @@ src_prepare() {
 
 	[[ ${PV} == 9999 ]] && eautoreconf
 	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
 	econf \
 		--without-coretext \
 		--without-uniscribe \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_with cairo) \
 		$(use_with glib) \
-		$(use_with glib gobject) \
+		$(use_with introspection gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
 		$(multilib_native_use_enable introspection) \