gentoo resync : 21.12.2017

2 files changed, 106 insertions, 0 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a4b56074d684..82abc0098b61 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68ab60c6d899c9805eec0bc6d0a714a3d98bfb6718ea4225da68b19e95db357c744dcba310076f4c56ed590985c9d1d SHA512 dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e
 DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
+DIST harfbuzz-1.7.4.tar.bz2 1718260 BLAKE2B 9a1ded92df7682b161a3db8ee9de80d0a2bc7d6b28f3318bad37c9efe45d7b13b8e268346dc814d7875e739d22eb264c0e7e75b24c931be416e8dca4b7f6e9d9 SHA512 d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
 EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
 EBUILD harfbuzz-1.4.6-r2.ebuild 3167 BLAKE2B 7f7ed68df05d3d71c1977e253a8ba7da7ac28d65467b255e7076f39a47e46e91e558ecc5a30069c75f47d9933163ae2a661c3c11c9937dd768cc082136c14797 SHA512 e20d4f4d7573ddbf45eda1df6ac1302ef262e1023a02da03e9202c274681fe2fa7355afeec0edeee36898aa8e61195ecb2f3afbccea230b21d5c7c6bc1a38eeb
 EBUILD harfbuzz-1.7.2.ebuild 3155 BLAKE2B abc11b2c1318453d833d04a2c9c33c875b1eb7b0af4ac5d35bc9aa97961be8ef50b1f3d3e446440d2c7ac13a09baa1b472b66f8a14c150943982164712fce1cb SHA512 c148286f61e20af53d46097bb7198f4a41ffe2dac46a54fa676ea8bda0cc703cd18272e80aa54bc318d3350ca976193f0bb7389d8a10e75d254f80b384d646e7
+EBUILD harfbuzz-1.7.4.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild
new file mode 100644
index 000000000000..da388e5fba70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.7.4.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
+}