gentoo resync : 05.04.2019

6 files changed, 8 insertions, 233 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a8be6c048aab..5e13398d3dd4 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,8 @@
 DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
-DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
-DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
-DIST harfbuzz-2.3.0.tar.bz2 17909479 BLAKE2B 32ea08ac60ca3c6b91a41b17d857bcabfd6f13785b674ceaf7006cd0616e1799d1d5f390f5b8d37e2bb22ac5506f00a6fc5c9a6a5263c23760ffe0e0677fe44e SHA512 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
+DIST harfbuzz-2.4.0.tar.bz2 17922003 BLAKE2B 7fd1cde76f8587ca08043c54b967bc1f5162fef8b02cb69f30ffd3bfce36d67471109f1c38641c733dbb9a86248f9e2501d51e353a5f7f4fca91223e17bb3e76 SHA512 88919576ac23f1ba36705212c3bd1cd3c91294f99234c076f13c6cb1f5c78447638c5cfb1bb397f5948db799e6b343667aab2f631fe35295c3d10d10783fd12a
 EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B 0a57e126a32b29bc80e1e9c21b7f41f65e7b802674254ac7873d3ff74a6f76afa1133d4a13db2d909a25175d6e8978f1701e4d9811e13da2845f9a991e05cd0d SHA512 087a6d939fdbba2a3c57c6a0ded302a2ebb27b8776a3a16431c624ffda8a8742a71d4d8e105f87f9354eb7c13c82badd4b50841475324d33855692ffef106f6b
-EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
-EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
-EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
-EBUILD harfbuzz-2.3.1.ebuild 3031 BLAKE2B 9661cb45752c88e610c780ad9ec8ed27e4a639915a71c283981f9ed04cdeeb69619fd2453e95518ad2f20f064443ce997a67ec8c3a58ee6966dc40cf5dd530d4 SHA512 813d6f4e5b532681eed47e4963af490ee33982b6c3ed7f53a466496c77aab045c673c467bd2b84102dcb909f5cc7ff7faedc70be1f2bdfe325e5e700c5ca5d92
-EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B afca3dbe2f59a7bf02bab5f81f00589f05080ef91ec346372a44aa7f47982a3efa70e26c61180de0517763ffde83aca10fc125997f8a1c8942520c26fcfdb511 SHA512 7b1c896402721aa66521165db457a254114d7c544fd1b67b42fc1667239d82b855f71bc04b4aa0693af26066a340bc67a196413e512defbff619ed97cc31bbe0
+EBUILD harfbuzz-2.3.1.ebuild 3025 BLAKE2B a41399029598ce6b82176a518db0be0b879d917bbab4aa1383b0f71a4947a7730991d137b3be1e79d15f7a014c431a6755ce3babba27bbbaf48144d46194e69c SHA512 8104111566f0543677059ea81776241cb6e97cbc8d06359f216319262beeb6cf1c696f7972551d7332db1abb9d66066a9129292df378922bfaa43a0d8f3e18aa
+EBUILD harfbuzz-2.4.0.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
+EBUILD harfbuzz-9999.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
deleted file mode 100644
index da5f35a6a967..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.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-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 +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.2.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
deleted file mode 100644
index da5f35a6a967..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.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-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 +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.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index 74fbb4200e84..b4e7019fafc4 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.1.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.4.0.ebuild
index 072663ae41e8..072663ae41e8 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.4.0.ebuild
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index cb8c95a6e525..072663ae41e8 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,18 +15,17 @@ 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 ~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 fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +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}] )
@@ -87,10 +86,10 @@ 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 fontconfig)
 		$(use_with glib)
 		$(use_with introspection gobject)
 		$(use_with graphite graphite2)