gentoo resync : 25.08.2018

3 files changed, 2 insertions, 113 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index c3040225283e..7a3b9d2d43ed 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,13 +1,11 @@
 AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f10b2c506e1f0c303f2b52302d1c32e7cb282a8a0544b91689da9fe1bfc6d07c2ab5d56698377af83752d4939f582536cd SHA512 87184db1f0a8e7bdf66fdabb1b556e2fdeb44c26ae7dc215e2a8a8808116274822e08d71f47c21fc3f027bae1bb15010404881ce36c053143e447fe252df9e40
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
-DIST harfbuzz-1.8.5.tar.bz2 3859514 BLAKE2B 6e44de23d81e68ccbe69008f852f5d29fbac8c255808a8330c47d47703035065cf4b48e4d3ce06b50d83d5d3412c3300d0010806b5fed251450d7a7dd0d1395d SHA512 81e4df32d848d52b27413ddf4551bbaa16c04e2cc98f4e2318359b611a725cd55099138106344babcc912a662e6c70354370615452b0d69c38bfa419e063b1a9
-DIST harfbuzz-1.8.6.tar.bz2 3864337 BLAKE2B 166425cfec185b23c3d5bb210d88e0b32a9d58c66d38947e0a3366939a5dcd27a047e800b1d1b3cba2597e2034f60efecce5d90f819319e1790e0d4adb793fac SHA512 7412b0f046ef30346358c9321d25fddd98ad44e4cf403f68b77c41b29b9369b5ab9e94164262cea3f487c185786bbdd7813d481896df221f4ab2461d7d43e834
 DIST harfbuzz-1.8.7.tar.bz2 3863545 BLAKE2B fac6a6b198fc8cc4d92ae128f9064a3c5ae71ba55891e80cbedd51e91a7df5bd1190f9d51051613a704a3c005b0a8eb850b387ca15b5ff09321ad9df23c70fab SHA512 8654b148fa6fcc34a0e2a981493901a5d93c46934861655c070a228baf136e5ed231cd8a5268948b6ff12ab551870f37d7270d9be649d35d515130540d0eeefa
+DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
 EBUILD harfbuzz-1.8.1.ebuild 3207 BLAKE2B 1dd250ac33c8b6ec4fa9fff4ba6d1746d2881cc18a6510b2848ea06b20e70fcf8b00b03e01defe0fe8888627004e4440083e611a79476856a5a40e2042715591 SHA512 30763dd7704d2b41d2b3d85aec21c9fa3ead4ab11cacea58bca739cfa3c1d0801fbb6aeec0565e25e0d8b812c51c9f57edff2d93fbcfc8f2fd360ccd18a9f68a
-EBUILD harfbuzz-1.8.5.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
-EBUILD harfbuzz-1.8.6.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-1.8.7.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.8.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild
deleted file mode 100644
index c723137a7e55..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.8.6.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~arm-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
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# 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
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild
index c723137a7e55..c723137a7e55 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.8.ebuild