gentoo resync : 14.05.2020

4 files changed, 19 insertions, 14 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 888937951ab9..228bafd37898 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,17 +1,17 @@
 AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee20681e1e15ec24ee4468627e3e4f19f3a8fcd2ea89402292db24efffae3a3a0293c929f5e06bac3c87e6762d380b74d68a7ef71a SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc
 AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863
-DIST freetype-2.10.0.tar.bz2 2743740 BLAKE2B def3e6393a4a26cd063df1cdfa676677547a9f68a95b8f246c79a7ff88d3da842b214770cd60e359d42692d6c002ba4effab03905034aa67a841af4c5d7a7157 SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
 DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
+DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
-DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f9755686e504d099c53b76faefd9b38d207222c092ea549b25c7842956f13067a09cce460d33cfff1aace537f0044df627ac SHA512 e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6
 DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
+DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
-DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
+DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.0.ebuild 6721 BLAKE2B c64b739cfd8ff41910a2261bc94144e28de92d3681c8b0cd408d05bfc39843b3397517f05b44e72c6daa024a85fa1e4d12c2fbbf80a5ba29eeade344fbca4844 SHA512 498e09ef79dbf88a4c59c8f15a4cac1939568b4d777b42c91cd2edbb0f4cad9346332a8edae9eb86a43a08a70e814e286605e37b80e5c35b855c7dc351d0d1a4
 EBUILD freetype-2.10.1.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
+EBUILD freetype-2.10.2-r1.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
 EBUILD freetype-2.9.1-r3.ebuild 6659 BLAKE2B e60afd962ec321996c11b948912e3d809a9842fad9ffb9e126028eb93640a35a22b918cbd38a977828ace531721aa2e0d0946aae44a1d82ceca2c4c618751ad0 SHA512 70b9bf7943f2e095e1b4e226831d026c0c80fd48c425140927a568cdecb7cafccfc9c9ab68f904514a4542cb08ceff18a4c9ecc624bd5954e5780a6bf5315c53
 EBUILD freetype-2.9.1-r4.ebuild 6669 BLAKE2B dadd3c7643ee9da87dabfce17e5ea8ce9bc2b106385708031e2b2483f64c90620d6f35a0ccaf12174ed4ac33e23841d4a17c6a7db0c7d686e85eaa799156b896 SHA512 1fcece6d60327b7dec038b7e368b18941dfde5527caa41639f78140423be2250518098680137e7b28121e2e65f66ec98122da3724e8cd413a2c0a3f1c2a291bc
-EBUILD freetype-9999.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
-MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
+EBUILD freetype-9999.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
+MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.2-r1.ebuild
index b7e3f1a48692..37247e155193 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.2-r1.ebuild
@@ -7,15 +7,15 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
-		mirror://nongnu/freetype/${P/_/}.tar.bz2
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
@@ -28,6 +28,7 @@ RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -168,6 +169,7 @@ multilib_src_configure() {
 		--disable-freetype-config
 		--enable-biarch-config
 		--enable-shared
+		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
 		$(use_with png)
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index d6f5e68744d3..37247e155193 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -28,6 +28,7 @@ RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -168,6 +169,7 @@ multilib_src_configure() {
 		--disable-freetype-config
 		--enable-biarch-config
 		--enable-shared
+		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
 		$(use_with png)
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 39066b8a1a07..8ee62c35ac89 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
+		<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
 		<flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
 			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
 		<flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>