gentoo resync : 03.11.2019

4 files changed, 4 insertions, 116 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 16055dd66f75..eb1a50b72659 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,10 @@
-DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
-DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
-DIST harfbuzz-2.6.0.tar.xz 5736808 BLAKE2B 3dcdf71cce8cdb4596d6e622f6fbaeae1a36cf17c219a1bafe077a472f9d25f0a8b8ea7eb36a1e20558d982b36479ce5d3e19f022a5b7dadd563a017b5037767 SHA512 ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.2.tar.xz 5769792 BLAKE2B 8ab4f76e858cb6d120b59c62fcda783fb331ec750ed9e4a74ceea448cafab9aff814d8599442d8939d41d0b5cc176724753b16c7cd42d6d314a08ce27d6856f5 SHA512 0a98c2b49650d66cf11f3395504cba3b18aaca43482924d9b58babd2ccb986b74ed7478bef5c4c1937d7782b7b278504854eaa04a62b329df08d91d30fc879d5
-EBUILD harfbuzz-2.3.1.ebuild 3001 BLAKE2B 3e7f72d1fb68244813bfa7f575d8de02686a9a6f1a2ab93037f8ba34fddb2640a2592e78d931add449b2f9abbe487475f313f22256fd88cfac422539f9b3c72d SHA512 ee10be52b3b28892838e3b1ef0cd0a67c19bdac897f3600b7734ca82305275a58eaf31e5e487ed3b34f7aa1fc0e70b7437a14f20cccfe17720af6945b852a753
-EBUILD harfbuzz-2.5.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
-EBUILD harfbuzz-2.6.0.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+DIST harfbuzz-2.6.3.tar.xz 5811320 BLAKE2B 84f6f8346574c881b41c47561b983d0714d2754a40955cbb8fb9687cfa0cd2dea965aad1eac417ad1cb5270cd5ced27225c710f0743a408f367902e7c326b24e SHA512 ed387c551c01305d419dab186e3760959ac31abec761dde407142ad3619db918a5b79cc1e0737004f5da3437f7eabb8d796f770f0e7eba60d3a4496995453444
+DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 EBUILD harfbuzz-2.6.1.ebuild 3000 BLAKE2B 97049127af537a9041db8b3b0fb2eb5317acf7b2f79bf8c69f94ee6ca2c843826ccd1d1748d3bdf03d3ff6e872d4493e8f9961d768e7fe5a0f7601b5c2fce13d SHA512 1e5207a9e6c666ba2eb7a2e3d6742640b0d90766e9fc397c2f54eccdf9436f18d24a7dd2ab6f638ceb46e744eb8e98f7f3e2dbc28ba0fecc9baa0cb0a7de3438
 EBUILD harfbuzz-2.6.2.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.4.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 EBUILD harfbuzz-9999.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
deleted file mode 100644
index 79639b9b885e..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	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}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	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-fontconfig #609300
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(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-2.5.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
index 8f3d354b0b08..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.3.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 8f3d354b0b08..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild