gentoo resync : 27.03.2021

4 files changed, 16 insertions, 53 deletions

diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 0721874f3e31..ac678816ee20 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -1,11 +1,6 @@
-DIST source-han-sans-ja-1.001.tar.xz 22688484 BLAKE2B f7f0ff84010c33a225f99b42ffa85552019bdc2fc535688a1d99814f5887213d0948fec6fa0fdc0a4600856528108080025a800d7ef246a3fee96b2ed1b57336 SHA512 fe9b36b1f7f5cbf546e63a8e5bd410cf95c2194a19f037b856f1888bd08dcf42e54dac1160b2654ed73ea54a41d9bced2c186b5153e77b0be8fc93163ab9784c
 DIST source-han-sans-ja-1.004.zip 26865889 BLAKE2B 26a735dc6d2e5de21cfb52a29d61ca1e85c3fcdb75ed50792a27ffce59acdf9d4a74261bc74981729d584c13a14e1beae1460d3f2a27aaaf0ffd128f37cd745e SHA512 ae310b2e8eb46935b26f53f8177188e26e4a55909a4ad96ff54682d250e661ca5042f76814b97c800f23bd2e55127f8957ccd42c8c55f2bb1333be7903a9d11a
-DIST source-han-sans-ko-1.001.tar.xz 20867288 BLAKE2B 3dae12f461b7f82d65dd96fc43c903974e6118a757f101cf3fcd9658609f1ae3c4a975437efe57da9ce260c48891cc009b5aa5c1e5c12c662d1b9c8babbf5afa SHA512 3a2e305051190babf00271572e7fec23451f19836144a356d76ce9a97f010807b5a5fb0ae7ecf8d2a8de2e1c0f38fc3fc55be8dca9dfc859c23cbf577b6314f9
 DIST source-han-sans-ko-1.004.zip 25290327 BLAKE2B de915dc85c84e584e1a6325b35e176c21f7d009653e2b5d8fe24c68df02dac594e64a1d0684a2a65b291a797b4400e4b0e3823deb0f92a473620703c4f8513a7 SHA512 c2a3cfe06254ea05e15c4858d7e6d5759088b41d5ba0f801769681d05eb57c2c981b2a4525a124d4a6c4945360d9bb0e687515d8b8d4c5831565972642298aa1
-DIST source-han-sans-zh_CN-1.001.tar.xz 41018072 BLAKE2B 65bed1b889545ff7474b670e1880f07753f45b873b43a63f5d24e616f7c342c7143ce4eb81d005af130859a1eabd33921bed609df9b87daea5c55a2f8f092afc SHA512 bdcccc7b16b0b83adfeb6dcf9040792b3ec835e18e63328c3e30b501f2771a0d3232fc4f0c10899107c40f990d3153951e6103979fa222fc68a93a608fcac3a9
 DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3b60a235f9bfe171f143b2b1dc3658abdc4731a5478f2edb8d0931b4df13d60f7fc77601078386ab5c4ec2d9e97a4217e11c385 SHA512 9a38ea7907fdc118e4fa420c976e255120a2f9176c33ea8ce06dbc09f46f95224675178e45c854b674f4a46642123e41a3f3f8f6e9f043e8dcc0322e05a70282
-DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
-EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
-EBUILD source-han-sans-1.004.ebuild 1434 BLAKE2B 84adbfec84eefc96362021003db661cb903d63c980777401d2d03d3a405d135fcdf4a2685acb9ea934ae7d19d3899be216f6bbe48b3c0375eea08e332c928fda SHA512 18c7437e340cce1c456eb86bd007cc4423e6118d71c4162fcdb5dc6f009a6d57873875fca1ae0e7d7802df798b1ffcaa7a66832b3777bed6a68f453a1092aa79
-MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
+EBUILD source-han-sans-1.004.ebuild 1437 BLAKE2B 852c598cdc674bca4aa8edbf4f99f8828458eb229bf2699dea4330241a310ee699ea71693348af6d2da7544bdbe81f67bd03614b20cf3e1278a0d0b1af67ea8f SHA512 9868b8f3426c71c039b158cf479d12c329a46161b914ee65f5a9f7b67618b7af1a761859cc9b98e5caaeba7569c1f8bff1aa479ba5f35f2d25af90609ffc2a84
+MISC metadata.xml 354 BLAKE2B e581ec18e1c98499ea8e709a632b0d3e59b83dc04294e3beaf77973112db4a04e036733dc323e568c6fcab9302fb4ad834929f3680642bbd79107c094ddc39a3 SHA512 a6c7818d11edaba928054eef070af8aca6dcc91bbdf131ed8c71dd612f48f00212ca8f0ca8ec05c793eb9ff7d2cc12881818c8be71bcb1ac286827bf8cfe39f0
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index a2973be3b850..0f4c11f008f9 100644
--- a/media-fonts/source-han-sans/metadata.xml
+++ b/media-fonts/source-han-sans/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">adobe-fonts/source-han-sans</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">adobe-fonts/source-han-sans</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
deleted file mode 100644
index 02d0d4834be5..000000000000
--- a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-# Note to maintainers:
-# The upstream tarball is huge (over 780 MB), so we repackage the
-# regional subset OTF fonts per region, for the user's convenience.
-
-DESCRIPTION="Pan-CJK OpenType/CFF font family"
-HOMEPAGE="https://github.com/adobe-fonts/source-han-sans/"
-SRC_URI="l10n_ja? ( https://dev.gentoo.org/~jstein/dist/${PN}-ja-${PV}.tar.xz )
-	l10n_ko? ( https://dev.gentoo.org/~jstein/dist/${PN}-ko-${PV}.tar.xz )
-	l10n_zh-CN? ( https://dev.gentoo.org/~jstein/dist/${PN}-zh_CN-${PV}.tar.xz )
-	l10n_zh-TW? ( https://dev.gentoo.org/~jstein/dist/${PN}-zh_TW-${PV}.tar.xz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
-REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
-RESTRICT="binchecks strip"
-
-src_install() {
-	local l
-	for l in ja ko zh-CN zh-TW; do
-		use l10n_${l} && FONT_S="${S}/source-han-sans-${l//-/_}-${PV}" font_src_install
-	done
-	dodoc source-han-sans-*-${PV}/*md source-han-sans-*-${PV}/*pdf
-}
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 462971468a8a..29eb7ae1eb4c 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 # Note to maintainers:
@@ -15,18 +16,18 @@ SRC_URI="
 	l10n_ko? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansKR.zip -> ${PN}-ko-${PV}.zip )
 	l10n_zh-CN? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansCN.zip -> ${PN}-zh_CN-${PV}.zip )
 	l10n_zh-TW? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansTW.zip -> ${PN}-zh_TW-${PV}.zip )"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
+RESTRICT="binchecks strip"
 
-S=${WORKDIR}
 FONT_SUFFIX="otf"
-RESTRICT="binchecks strip"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	use l10n_ja && FONT_S="${S}/SourceHanSansJP" font_src_install