gentoo resync : 13.11.2021

4 files changed, 45 insertions, 14 deletions

diff --git a/media-fonts/nanumfont/Manifest b/media-fonts/nanumfont/Manifest
index 3da2b8aa0fac..e48ee47c6af6 100644
--- a/media-fonts/nanumfont/Manifest
+++ b/media-fonts/nanumfont/Manifest
@@ -1,3 +1,5 @@
 DIST NanumGothicCoding-2.0.zip 2038498 BLAKE2B 965cea0994f106d44d68a2f348c72d76d3d943b068380fcadb2ea81db22354a84a301c452b596e7e2da2542cb3a6172a0dffdfc760c36aca7a782c0211486d74 SHA512 c69cf0dc2d72cac4f38a9ddfa90fb268b0d6673a9b74d728bf3fd08811d5cc8599cb17dae2a0e63e064aca0b733a56da27ae2fcc1efe2b02da631b14a54e1f3f
-EBUILD nanumfont-2.0-r2.ebuild 684 BLAKE2B 88f879d9dce27472c63cb455effc25f054503f5c1373c271e52f1427f636922629fdc4a0e31784579854fd5e911c509e9bba89bee8c849752be9113e9254b1fb SHA512 8d2f5ef90ab6723b17a19d002bdd67b0bc4d1432312e137a48fb82a79aa72ea008775be281d68d5511e948e490373798e11dda402bc0b2b6ce1f0905db48225e
-MISC metadata.xml 334 BLAKE2B a295aa1e9467fe05704add7a3026d025b76558ffaa7c6651bebbde4b5cecc1e8bb9048bbfaeb1eee82b97b1a2a70176a94b43058d2cd0e06cb05f4c42d3bf0a2 SHA512 4a27ee90294c5d51fe23eba660da4e34eb8d21a6306b4886d4993be547889af54573b755e2e618c8031f305b5fd63ca50f3b17ff6f627de56aedf8a9737fd009
+DIST NanumGothicCoding-2.5.zip 1707449 BLAKE2B 234e422470e8288c794e1ea484b9f6166dd8d1d813bdde6c9a1f86d60cffde617764d80db2ddbe136da96da9c6852addc1cad7e739bd216c7d1b9f228c77f12e SHA512 126e90586ab2ec7bcdc07d3c0fbe75b8aa6df4ebf79032ff0bef344a5a133286356ec6cdfe7958c8ef24c086dd6d6505687fd0c1f11f4b8bff979d199ba4e1b3
+EBUILD nanumfont-2.0-r2.ebuild 787 BLAKE2B 9e3c9fd222e12f0c480c6d861e9460da68b12e6ef347ec0a47de34510ea187c72be1400351a929dbf245bfdb555f749a9a0a19a522bf86201e2b84ed068e050b SHA512 eea6da25bd1f3fb2119b8985eac5f536dab9e1332bf8084b54c94a2cea9062b12ae0c00c670f5886ba91b39e9471877519feb40772e25e60c63bbc9fec296fc9
+EBUILD nanumfont-2.5.ebuild 490 BLAKE2B 2344c03826d8154db071e3dd75fd3db1a4c55ffcc73c22d9749e4066eb293754629d2055978d1990d96f56b76fecf24699b0d02e0c6d5bfc29d086dfded22414 SHA512 ff383b3e147b985dab062ec2390dc01e80aca287f7c06b5b64c427cfa543820af53bac0ee9252fec655f927b72ee80b54f5f4635830ff3220d1e9ff9fc88b1f8
+MISC metadata.xml 414 BLAKE2B 238925929ae14fe868f8bb00424f24f74ae67a37d3b5d5ccfe64d697dbb60a082d4388ca0e6b9afa170fa6fcff93b622ceb931c501ac32ff6ef0e8795530285f SHA512 6627927f24d5c38d95f4c1d49b68b7d6083b4fbd61a3f14209ebd6aec592c4c3ad57adf780ba9473698ebd4360075c7455bf24da725cfdbe271c6b9ed6ee68f9
diff --git a/media-fonts/nanumfont/metadata.xml b/media-fonts/nanumfont/metadata.xml
index 2244c53d8726..97ede45093d5 100644
--- a/media-fonts/nanumfont/metadata.xml
+++ b/media-fonts/nanumfont/metadata.xml
@@ -9,4 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">naver/nanumfont</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
index 8237555a800c..2312663368b6 100644
--- a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
+++ b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
@@ -5,28 +5,31 @@ EAPI=7
 
 inherit font
 
-DESCRIPTION="Korean monospace font distributed by NHN"
-HOMEPAGE="https://developers.naver.com/projects/nanumfont"
-SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-${PV}.zip"
-S="${WORKDIR}"
+MY_PN="NanumGothicCoding"
+
+DESCRIPTION="Korean monospace font distributed by Naver"
+HOMEPAGE="https://github.com/naver/nanumfont"
+SRC_URI="https://github.com/naver/${PN}/releases/download/VER${PV}/${MY_PN}-${PV}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
-
-# Only installs fonts
 RESTRICT="strip binchecks"
 
 BDEPEND="app-arch/unzip"
+S="${WORKDIR}"
 
 FONT_SUFFIX="ttf"
 
-src_prepare() {
-	default
+src_unpack() {
+	if has_version -b "app-arch/unzip[natspec]"; then
+		unzip -qO CP949 "${DISTDIR}"/${A} || die
+	else
+		default
+	fi
 	# Rename names in cp949 encoding, bug #322041
-	mkdir recode || die
-	mv *-Bold.ttf recode/${PN}-Bold.ttf || die
-	mv *.ttf recode/${PN}.ttf || die
-	mv recode/* . || die
+	mv *-Bold.ttf "${T}"/${MY_PN}-Bold.ttf || die
+	mv *.ttf      "${T}"/${MY_PN}.ttf      || die
+	mv "${T}"/*.ttf . || die
 }
diff --git a/media-fonts/nanumfont/nanumfont-2.5.ebuild b/media-fonts/nanumfont/nanumfont-2.5.ebuild
new file mode 100644
index 000000000000..19b71c4e9096
--- /dev/null
+++ b/media-fonts/nanumfont/nanumfont-2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+MY_PN="NanumGothicCoding"
+
+DESCRIPTION="Korean monospace font distributed by Naver"
+HOMEPAGE="https://github.com/naver/nanumfont"
+SRC_URI="https://github.com/naver/${PN}/releases/download/VER${PV}/${MY_PN}-${PV}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip binchecks"
+
+BDEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"