gentoo resync : 18.11.2018

4 files changed, 117 insertions, 4 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 13030cb5847b..31f8e40687c5 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,12 +4,14 @@ DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff906
 DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 DIST harfbuzz-1.9.0.tar.bz2 3870586 BLAKE2B 53aa631145662fc0fa1bb80e6b438de7d68d5f8f55d163e62a7c6153b250ab2e1c4de327194ba566682a4033e632f0ebc2915250760f721a2a2f2b97e9e6c844 SHA512 fed98e4e67a518a7bee4f3222f8e595bfa529cab12d42707577c639b7bf9a6d771646e63859bd70850bbf93300780e3b0538483e6b73332721e6c2ce5a17a0c2
 DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
-DIST harfbuzz-2.1.0.tar.bz2 4375308 BLAKE2B c9581e4c6756e1c4e9cf82af9b078c7470fe07d3d2b3bc13e54c08b9007a2d9eb3ac3254462fca5843ab2b8f23b220b13226c5d4b67e80ccc487bc7d4e18ce7c SHA512 cf34ea5ace9f7ff0ef31768432bbbf3b66d909491cc571b4330c418df40be4fe57bf61bea60f94a4f76f25f687dd7f2401d46eae81c7b1d37f1e25295eb3d664
+DIST harfbuzz-2.1.1.tar.bz2 4386396 BLAKE2B 9717a15fccc557b795cfd2462358b6659c57bd052976b2660b61d76a858b3df12b00ee8d824c30d4675261e2b30fb79ae3c14c98bfad3d5cfcc67fcd0b1ef44e SHA512 c3fc46eaeb8c02594e2430f853b6eebb762072638e3113e27ff9b5caefce2c06534e8056d57f35d87df6dbb1027cbc0c1a08f914dec7c6a715c3f0abc0a18933
+DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
 EBUILD harfbuzz-1.7.6.ebuild 3241 BLAKE2B 3886cc3cceb195e62d5dd5b31d4243dbbc8ed218609dc3a65455b9e83f98b5471159039f5fef106d361a240af992257da1f87b43a4ad05a1960f9410dffc051b SHA512 cbc34d68ec264add1f34e9c1c629a0b5351803df370dac7bdfd89da94aabb60b22a3be2202a566d3d31b48e187ef1d7a9bf2dd659c8ed7e203f838eede55645b
 EBUILD harfbuzz-1.8.1.ebuild 3196 BLAKE2B 1e66c1d87d91571ac977a0eb6803a9c710c6d16e3590dfc975cbfedd4924103ad7f1a733ecefaa16003aff0774ef0d31cf2cadd398e35a4faaa89b8fd5e4aa35 SHA512 0741642501ffbf7b14d82c2303b44aac104d17ed74c86ac34f5d1173e10dfef243c81b371600d56bce98eccb0a0ac1c662eba28edea9dbc1d81c23225c5d7a81
 EBUILD harfbuzz-1.8.8.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
-EBUILD harfbuzz-1.9.0.ebuild 3028 BLAKE2B 55735f2884fa899662c2e8737fc1c1e68e388d3943f51775f5d552628ad74164b55821af02f6e10dd24e9e06ee5f41e2a2aa2dece5e18e58ef465afb83df010c SHA512 4c1554d6db2b8942be88de1d498327f0d0aee8d65864c1c914331468545a5a62488dcd53544875ce3cf6c95f741c32bfa6979cac46840e03af03622ea09f6c13
+EBUILD harfbuzz-1.9.0.ebuild 3027 BLAKE2B 6b9d093425d48452ddac71562ed4b06303ee5dbee28cb802b2bed00552febaaca1a4f3628ab9fdcf9a62e2f8d2395dbe3dd19e0933df5e687c9cf56bdb33c346 SHA512 1cccdbe99359d5cc09dbaa0f4f37d2b267dc35a3e24e45a3caaa6a6c2eb95a1e79b53d6684971b5e16ca3eb4f62cfce87ca0835cf8d7e8058859de9ea0d77248
 EBUILD harfbuzz-2.0.2.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
-EBUILD harfbuzz-2.1.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.1.1.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.1.3.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
index ee83fb48ad38..bd81315f254f 100644
--- a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.1.ebuild
index 85491d783cd9..85491d783cd9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.1.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild
new file mode 100644
index 000000000000..85491d783cd9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit 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"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+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
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+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
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--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)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}