Version bump, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 25 insertions, 12 deletions

diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index c4da13fc5001..8fcd86cd92fa 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,12 @@
 # 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.111 2015/05/31 10:56:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.112 2015/07/05 08:18:38 pacho Exp $
+
+*harfbuzz-0.9.41 (05 Jul 2015)
+
+  05 Jul 2015; Pacho Ramos <pacho@gentoo.org> +harfbuzz-0.9.41.ebuild,
+  -harfbuzz-0.9.35.ebuild:
+  Version bump, drop old
 
   31 May 2015; Markus Meier <maekke@gentoo.org> harfbuzz-0.9.38.ebuild:
   arm stable, bug #544792
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a817a3b2fc3e..571e71603793 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST harfbuzz-0.9.35.tar.bz2 1165359 SHA256 0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed SHA512 843555b33a5cfb96a909f14a558818a10fa59b70e5284e749c96ec0273fc17b59d535fba314992e8b6713fddfcf3cb96826e5420e88a251e5d39802fd07aadc1 WHIRLPOOL de15ac4fa6680b10121c50b0dcb0412aa04d98729955ea8bd58d83ef629098eb2eeccab36d0e8b9a224b2d4ff19201b294ca27e5552ea4cefdb1abe73eb3c780
 DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
 DIST harfbuzz-0.9.40.tar.bz2 1182989 SHA256 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f SHA512 9dcc8f5790b78efa14d328e48c68d97f44fce8658fdad9f6d46a79feb715a57903064087d2aef6cea84904936c27c623583b4c67d0e21511a4b82a9213d86eff WHIRLPOOL 4b450d4a1a02bb846de582f84a63483182d3b2f071e54abd2a58b2b9d88c25eb7b880a961584ad087bee8c1eae2789446a9da29634f22467f00d72e7b90eb0d2
-EBUILD harfbuzz-0.9.35.ebuild 2826 SHA256 6fdb796f68503dfaa9f531da4de113f0ad73da0c33e2e518bdbf05240d090df4 SHA512 be92293b0a85cc22b15653188b5191f8d8e009a6cbfad3da8e51a2156d5e5c26e7229263a8c46a5ea8d4b02b70117be4970e1fb0b588fb4507d6942f159621ed WHIRLPOOL 5c43b495c8d5967752d791f09204487e0918f8dcc6a14e93f3c616a6328918ec30aa7f7b4b5a092e073043f1f223a0f271c72ea851c4a8b9285a818ca581a261
+DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
 EBUILD harfbuzz-0.9.38.ebuild 3068 SHA256 3b6e934eb0f5f23dc45a98b0c2f09085c579e3d38e8fa7a99802e4f9cc4b376a SHA512 c6ccb28c3e42f6046905f2321f2381bac41de3e31e87d272e65c482f945a4ffe1ea538082938ab0637b8c79dec9b1b27830d5c1ff980d07ff3c30bbc7462ceb8 WHIRLPOOL 7f998ce4465763c02dc0330058cf8dfdf772bd2371c6aa297777a4a39fbb842e03f24b9df3989a924b4091f579ff90da18c18444a43f9a6b0248e5f64e493a0f
 EBUILD harfbuzz-0.9.40.ebuild 3076 SHA256 f554c9ae2fc7d5d14e41467b411f0e6b3206ef45be5addf931719b5f38b6c39c SHA512 67a9d30c76efbb72b6b383cbf993ad648856578a61a6a533ae68335f29824faa2e3a1e8732e89c009b8e2d6579f154eefee1cf4b0f5cdcc50399b4bdbf5eac8e WHIRLPOOL 4373b8f586cc3c18c8aebcdf0f6c190ca79412f5ba29453ff958e183a630ef4875eddd336ad73795d41e04dce710ffec2453049c0ec1cd623b1f110cb3456490
+EBUILD harfbuzz-0.9.41.ebuild 3177 SHA256 a04c257b4af9ff419ea7b43daf757d17059f5fe76d0d9738efc661254501917d SHA512 494bada6cd59e7f46ae81f243fce22c0505653c7408812550a89b2be3d8f326363dc5a76e0db9c945486291946ac0e974ba38ca7a1ab14558fcf06e29a7947c2 WHIRLPOOL 0d4818a8a09721702b869d1693e8c086b0d79313686afdc008f1ce9680d005c42344656c7693f7be470a1c7eddbc25ff4de718536ffffae69fd7ea88921fcf7a
 EBUILD harfbuzz-9999.ebuild 3075 SHA256 b15a8a9a9444abeceb6047eb3fe8d1339816c0d25f3d2a6250017b384ac98dd6 SHA512 44ebf16de174285cb7c9220a0e867979e2269d4b357b5582a1f6e7599d3dc36737e1c1d51bef2c67c3e693b54c367635ccfe36cc332c0fd9b6cbc2f8eb42ec6e WHIRLPOOL 4c0666c916b1aa2171bba62f23289520da66cd03387e62eb859c8307a0b93d678741745dc6a1bf1ef6ff5c0cf5a4ba466a44f8a3baf39717dab11b925b0b33d4
-MISC ChangeLog 16302 SHA256 8b094afb168198918795986e1091fb5a981e66d96371ea34d0f2e650c7212c8a SHA512 0ebe96142d8f759e22d55a6a8bd68013e7ff0999d27f8cbe69d280cad75e85ac797b04db56a261731609d50e841edd6bad70e66e607caf4bc3754632a5396075 WHIRLPOOL 27c5ac52c66d38acab058b94383319eb52c04df7a0e632b5f2aa256d5e693265078c1b7a0d70420d5fe081ed7d2ec9af8436ce9399fa68cfb8fd3eff694d579a
+MISC ChangeLog 16457 SHA256 595e9fc359dce6b1a589cccb849f9a2e794567a0e42d95608274b0e74b32f1ce SHA512 bf7caead5d77dd981c085c3b689661224885110bf00e3721f12d8eb8d4ec0273d1470c7b1ad6f85c914e8c7b7754557586b370718bdb5f8babf0c70bf49a6d16 WHIRLPOOL 17b53a3b97fe7d64be9b07a9f64f28529e9671d2fde6365b25160662b0a758be00c51e94c0e30b4337e0f7ddaa9461ad6fba248a0d576958e79d367ffdd445df
 MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVq6OkACgkQkKaRLQcq0GKGdwCgkZzz4QVxBG6imLEDyZPyM2GM
-m50Anjnamc3DhCRwaIlhWd1ayA6D3R6g
-=TfsF
+iEYEAREIAAYFAlWY6F8ACgkQCaWpQKGI+9QfTgCgghr6f6Pss64j+pnPHeqkL6Nd
++UIAoILG+7csBjy2/4WF11JIjIw8C7RJ
+=m9yu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.35.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
index a05d6352a876..c390510afc20 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.35.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
@@ -1,11 +1,11 @@
 # 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.35.ebuild,v 1.7 2015/04/08 17:59:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild,v 1.1 2015/07/05 08:18:38 pacho Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-2 autotools
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -18,12 +18,14 @@ 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"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
 	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}] )
@@ -64,17 +66,22 @@ 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 fontconfig) \
 		$(use_with glib) \
-		$(use_with glib gobject) \
+		$(use_with introspection gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
 		$(multilib_native_use_enable introspection) \