gentoo resync : 29.10.2017

3 files changed, 108 insertions, 2 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index dc33c2d45508..694a4e46fccd 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,11 +3,13 @@ DIST harfbuzz-1.4.6.tar.bz2 1475086 SHA256 21a78b81cd20cbffdb04b59ac7edfb410e421
 DIST harfbuzz-1.4.8.tar.bz2 1587622 SHA256 ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131 SHA512 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152 WHIRLPOOL c5b17719b0a362d775cbebf081bb6bd946c3a3401a7ed292ae0bc021abe2b4a18a5fab3adc8e65793ead45d665b2b45b04ffaf8ea2924c4325b6fd39d1b1abf6
 DIST harfbuzz-1.5.1.tar.bz2 1615704 SHA256 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51 SHA512 e5235c9fe4524059128f97e2773056533803b40db70c18b43c8dc6e27a970efc40d9ce6e8754ae7075c245cf8f4386b33e922a6edb3b6a722a596cb7759b8b36 WHIRLPOOL 8cf092ffcf42b5744041b3e2d40ce720a2a089964bb5d8d6a3ed5ccb846df8f3f44e6182744cb7b8c132e2fbfcc93c13fd974c2faa0adcf66961fc3b9863563d
 DIST harfbuzz-1.6.0.tar.bz2 1625615 SHA256 5037ac0efc85a02a334965e66c1053d9dc9ed6833eae9739bd85bc33c83167c9 SHA512 392c7055d7fe9bc3fea07e62fa9d00407c98d502de7b42937f434c6127f660521706d3b2c0afbc61ad636676abb50bafe73afb15b9090f0fe1f75443f1f34706 WHIRLPOOL 55b0c66500cfe099a5b1658fe89e5e44665158f86c82851c0787a417d6bf4d914c31fc2324b4816d7ed948e220a9cd0eea6dc0dcdb87c217dfe4f28c52105ac3
+DIST harfbuzz-1.6.2.tar.bz2 1639114 SHA256 ceb8cbd652829b5fa680a71d89cb79cac7afa104e9484fbd23a24e71c0d6e80e SHA512 90fd16267b19dfcb9fba0553555405df46b7543f48476bea3d9f59bdc809c8257f05bd0436ab32a3582a3f8dbef7448ba10485699d1435b56d8c247e2fcfeff3 WHIRLPOOL 8081a1d82d82b95f47162834ceb05134a1ddeb6aefb1d81c9483bba1440e4e146e92d9fd205ab63c54c6b36d0097b0ad19a966ea184e6ef6bfe35426d6899db8
 EBUILD harfbuzz-1.4.5.ebuild 3090 SHA256 3e25f7c841947c870a770c0dc07a46bdf0873d36acb39fc7be193d3bf0b9d712 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24 WHIRLPOOL 98cb6c1d7386ad87714dfe46b5a1cec1a67571214fa479778c97abd202aa046ceb696b6f698a54c7db1970a5e62a7c4b14d19ec03a0365a9b6c40de8de338ab4
-EBUILD harfbuzz-1.4.6-r2.ebuild 3170 SHA256 24e217f5d165cc552f780c110f6d6dd4e2dcfb3892b2de6aa0373576b5d08b90 SHA512 819ffe013f26fafd008f12771b9fcc00f656dd62d726f9465b0a0f6424038b3d8ff816f1fa4f967873363a7e1b5d55b7a5b27dbd649fe5edd3499bf367b6b5e1 WHIRLPOOL 44e15b643d610668ead56848154ee6ee48e82fcd3d392a3fde155d815b896ce279bfbf4547790dfdef349d320a066298a5d3f3a5f3dc766dd38e7ea091b662aa
+EBUILD harfbuzz-1.4.6-r2.ebuild 3169 SHA256 5ef79605f011b62d6967a9dcd208a894f5e9443db57dba7bb47c7caa719c21ef SHA512 8126753c04002df17e796bbff1e1665d78ab1b8e2ab0d212ea61fa5a6b315a2e86d9862db442ff44ee55df1341e4eeadb2177558a91bd239a45b386d82cab707 WHIRLPOOL ea157543a5a1cf3245f44c00fc04af9f68fe3993b3f955a516d08e514b8613300eac978857d1c687580df29ba4da0f20c2f1ea5d581066ad5f32e36c6cbd6ce5
 EBUILD harfbuzz-1.4.8.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-1.5.1.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-1.6.0.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
+EBUILD harfbuzz-1.6.2.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-9999.ebuild 3193 SHA256 3cbab4ad2ac6923ac09746d29192c35a604fd1c4945fbb3167544a6990b299c8 SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d WHIRLPOOL bf7c8fb4f8af04bbf74322b943b448535586c050ac96a0149ebb267f358ff5ccb08653b44b6a29a5fa8a57a2ace0a2b6d8066c489b422aa9533bb8a409115784
 MISC ChangeLog 13106 SHA256 4ec97a88f0b61a71659b51c57ddfe9205ab268f09b02f2493ab699f2a07a2791 SHA512 2490c6eb077f4862c13e5cd64ff433dd590daf30deb27948ec1af9e4f5be23517ddf4c9d20cec199802b1e9f183fe96ba2e7c547877f59841141f37418e3c34b WHIRLPOOL cd19849105dc5033e80e96a402cd026f1be448fdaaa186ea8a4949f768b368135d3c17caadffbdebbe2875b30d72c67f1de6eb8040c101c47e19dbe25efa8f1d
 MISC ChangeLog-2015 16457 SHA256 595e9fc359dce6b1a589cccb849f9a2e794567a0e42d95608274b0e74b32f1ce SHA512 bf7caead5d77dd981c085c3b689661224885110bf00e3721f12d8eb8d4ec0273d1470c7b1ad6f85c914e8c7b7754557586b370718bdb5f8babf0c70bf49a6d16 WHIRLPOOL 17b53a3b97fe7d64be9b07a9f64f28529e9671d2fde6365b25160662b0a758be00c51e94c0e30b4337e0f7ddaa9461ad6fba248a0d576958e79d367ffdd445df
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
index f11bb8d457dd..2ed3bdb8684c 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://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 ~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"
+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 debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild
new file mode 100644
index 000000000000..da388e5fba70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://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 ~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 debug 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.38: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
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	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 fontconfig) \
+		$(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/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}