gentoo resync : 22.01.2019

5 files changed, 16 insertions, 20 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index aeaedde7c32b..0adad81b9d23 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,9 @@ DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e
 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
-EBUILD harfbuzz-2.0.2.ebuild 3035 BLAKE2B 88cd54eb65eae9a9f8706442a575582fdbd5cbea84918b78bc5673a2629424a70e577ca379596374424aad0c64bbc03591cbce2885794a474c84af4c6dc887e5 SHA512 79927e8c424371d6cc76370ab8ce2643b38b6027dd43a57259ebe5b84952a19a266889e65b6e535952bdbd4c173cc6a08010c56133111035eb594e113a807eca
-EBUILD harfbuzz-2.1.3.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
-EBUILD harfbuzz-2.2.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
-EBUILD harfbuzz-2.3.0.ebuild 3102 BLAKE2B f89b14e1ee258dac3bc7b244f73b1193d7e79ec83db5658c62ac7e0141a364ff4dccf6ab7d3ae01ab02937d61464775502dbc31e607665490756397b77d21793 SHA512 3783380ca41f356ac40f84c01ce31d1cd484160a868bc32ca14e1bbcd7e6b9ba06a632a1014acebea40ceedf01462f6c5b51e20789777ef8fef6572d2e8d1ad7
+EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B a4521347729a2533a10ef6e28c54d91c93a93198db6f1199fc3534503780a74e6888fb370b59f85df07c057dc4d51983c54fc3cac86e1f18031ad3302fbdf2ea SHA512 6f824127087d1e5dfbc3f13dc23b06292feae1ade55715e5318ce6329ff15f087ac7cb0d69606f77408a3616df5f35ed08f9d2f8faa0beb0a58974519a9ce807
+EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 83bf6f358e3799d0cdff7e5c7becbdd00c3fb34466552d427c42b9129c379990064b917d0ffa9d7b40d3e68a1730b5b2059052dadc2f1af2607cf841adc03f3c SHA512 158d7bbb98b60a8ce9a860538671a4fa64e1c9620b91da68126b0db0ab19658a668de4f2d436c22056b193e0b2256cba9ae66dfc14f7a71f4e19913b4bfc6063
 EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
index 1674c2a5bed1..2cfc66808b22 100644
--- a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,11 @@ 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)
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
index 85491d783cd9..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,11 @@ 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)
diff --git a/media-libs/harfbuzz/harfbuzz-2.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
index 85491d783cd9..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,11 @@ 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)
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
index ab1a514c9752..08348f2ec48e 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,11 @@ 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)