gentoo resync : 10.11.2019

4 files changed, 22 insertions, 3 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index eb1a50b72659..7a85a07aee08 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,11 @@
+AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.2.tar.xz 5769792 BLAKE2B 8ab4f76e858cb6d120b59c62fcda783fb331ec750ed9e4a74ceea448cafab9aff814d8599442d8939d41d0b5cc176724753b16c7cd42d6d314a08ce27d6856f5 SHA512 0a98c2b49650d66cf11f3395504cba3b18aaca43482924d9b58babd2ccb986b74ed7478bef5c4c1937d7782b7b278504854eaa04a62b329df08d91d30fc879d5
 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.1.ebuild 3045 BLAKE2B 2ed39b3268d0112bb3414581793d12bce4b0aba5c310ce97a03b3405c59b4c159eef2ab3912d477fd5db845befbc02578df2b1fa9d2f071e1108f099eb51bc69 SHA512 c38051a305c7a3a9a955424a78482c31941dea63224f26068ae22b55fe72fa71917c997ec1a82d96c0a80429994551e24393555104521b8f1e83b4305df1a070
 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-2.6.4.ebuild 3010 BLAKE2B 9cf71a1cfc50d97c73ca7bbf2bea02a0e4fc711af5c6dae1ea65715a16c704ab88effef0ffb73da6780f2369f949ad7bac96b1a497c4de46bca1eab0cf108bce SHA512 bb4d086880b8be99a8832e703da723e3cfc92057df8bbd2b81462248d4ad0baa29a0819fb4efe739dfec5cec66ad66909887ba99bed6a536d850be7fa2c32581
 EBUILD harfbuzz-9999.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
new file mode 100644
index 000000000000..c16fedd6d9d6
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
@@ -0,0 +1,14 @@
+Fix build failure on gcc-9. It's a slightly less invasive
+version of upstream's commit 2dce85ed06a8cc7ca
+("[icu] Remove HB_ICU_STMT (#1993)")
+--- a/src/hb-icu.cc
++++ b/src/hb-icu.cc
+@@ -53,7 +53,7 @@
+ 
+ /* ICU doesn't do-while(0) around their statements.  Ugh!
+  * https://unicode-org.atlassian.net/browse/CLDR-13027 */
+-#define HB_ICU_STMT(S) do { S } while (0)
++#define HB_ICU_STMT(S) do { S; } while (0)
+ 
+ hb_script_t
+ hb_icu_script_to_script (UScriptCode script)
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index d8eb3a9c8943..87e7095493c9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -48,6 +48,10 @@ if [[ ${PV} = 9999 ]] ; then
 	"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-9.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	if ! use debug ; then
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 8f3d354b0b08..8a65acfa8537 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.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.xz"
-	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"
+	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"