diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe
deleted file mode 100644
index 0165e428a..000000000
--- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe
+++ /dev/null
@@ -1,154 +0,0 @@
-SUMMARY="The Noto font for CJK languages"
-DESCRIPTION="The Noto fonts have superseded the Droid fonts, which were \
-originally designed for the use in Google's Android. Noto's aim is to be a \
-free for everyone, with beautiful glyphs for all languages, looking good \
-especially when multiple styles and weights and even languages are mixed on \
-a page.
-
-This package supports Japanese, Korean and simple/traditional Chinese.
-Included are various weights and two 'monospaced' typefaces ('regular' and \
-'bold')."
-HOMEPAGE="https://www.google.com/get/noto/"
-COPYRIGHT="2012 Google Inc."
-LICENSE="SIL Open Font License v1.1"
-REVISION="2"
-baseURL="https://raw.githubusercontent.com/googlei18n/noto-cjk"
-srcGitRev="f36eda03dfa5582a6d49abbfb5c83d0209584158"
-# Japanese
-SOURCE_URI="$baseURL/$srcGitRev/NotoSansCJKjp-Black.otf#noarchive"
-CHECKSUM_SHA256="30bd064f624484ddc4ed77e2baab834b762078b8c3140a406eb7c42436beb7c3"
-SOURCE_DIR=""
-SOURCE_URI_2="$baseURL/$srcGitRev/NotoSansCJKjp-Bold.otf#noarchive"
-CHECKSUM_SHA256_2="9ca911f033c616162bc2d2f1d61c6739df8bc7a9bd027df0ed57c96029b33a7a"
-SOURCE_URI_3="$baseURL/$srcGitRev/NotoSansCJKjp-DemiLight.otf#noarchive"
-CHECKSUM_SHA256_3="8c7692687ac032cd98cfbcd14392d87d301a766ebd1317550542f7826775ee46"
-SOURCE_URI_4="$baseURL/$srcGitRev/NotoSansCJKjp-Light.otf#noarchive"
-CHECKSUM_SHA256_4="8a27ee3bccde01b4d084ff2c51f34e37f7f420fda52a2c035fa4a2f4cfb3fbac"
-SOURCE_URI_5="$baseURL/$srcGitRev/NotoSansCJKjp-Medium.otf#noarchive"
-CHECKSUM_SHA256_5="bcda0bcc22bab28ea4fedae800bfbf9ec76d71cc3b9f851779a35b7e438a839d"
-SOURCE_URI_6="$baseURL/$srcGitRev/NotoSansCJKjp-Regular.otf#noarchive"
-CHECKSUM_SHA256_6="f18253affd968c8ea592d8df6d84b1d4c5d3a46d267e53a1f6749e6c4f76a23d"
-SOURCE_URI_7="$baseURL/$srcGitRev/NotoSansCJKjp-Thin.otf#noarchive"
-CHECKSUM_SHA256_7="d6d322494b97484247fb7d9deaaeb8593bac81eedfdc627968414b2dc6295a94"
-SOURCE_URI_8="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Bold.otf#noarchive"
-CHECKSUM_SHA256_8="206addf6fada3766e9fee5d03e51d3be3e683a2e730cf6baec5460ce4c3c18dc"
-SOURCE_URI_9="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Regular.otf#noarchive"
-CHECKSUM_SHA256_9="4b97c72f9e7d5ebaa83ece66968908027dd30c3e54f468ead74731ab0508bf45"
-# Korean
-SOURCE_URI_10="$baseURL/$srcGitRev/NotoSansCJKkr-Black.otf#noarchive"
-CHECKSUM_SHA256_10="089a475a2c348daa81cdd8c9261036841f5711f6cce9e0932beb6fd9e348c94d"
-SOURCE_URI_11="$baseURL/$srcGitRev/NotoSansCJKkr-Bold.otf#noarchive"
-CHECKSUM_SHA256_11="f14686e17455ba0b0f691fa58c6ddd8b146544bae2f1729e495dbb51043d424b"
-SOURCE_URI_12="$baseURL/$srcGitRev/NotoSansCJKkr-DemiLight.otf#noarchive"
-CHECKSUM_SHA256_12="6913976f7c49070ca536c2f0a9e2e33dacd904311e38b1d8770996a0520e25b7"
-SOURCE_URI_13="$baseURL/$srcGitRev/NotoSansCJKkr-Light.otf#noarchive"
-CHECKSUM_SHA256_13="fa383799c2a97b8a38d8e0e74fbeed94935fb4d4ab6acc9b31821ad03715e851"
-SOURCE_URI_14="$baseURL/$srcGitRev/NotoSansCJKkr-Medium.otf#noarchive"
-CHECKSUM_SHA256_14="4bf8e8b95b40747ddb0c3e210a07efd1cc75a4b227ebc0320eb179c8a5594ce1"
-SOURCE_URI_15="$baseURL/$srcGitRev/NotoSansCJKkr-Regular.otf#noarchive"
-CHECKSUM_SHA256_15="d4be2f9ead6e512cb3da51a339ecd7ed2684d2474b376181be9389cbedd85a38"
-SOURCE_URI_16="$baseURL/$srcGitRev/NotoSansCJKkr-Thin.otf#noarchive"
-CHECKSUM_SHA256_16="2cd8ed727c39181c9b2c3948ae56ea55d014290b14de6d3534e1e2c456d6dde3"
-SOURCE_URI_17="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Bold.otf#noarchive"
-CHECKSUM_SHA256_17="0720bdc4d06d0314380fe74646effc16effba7d4698231b7eeed1e1460cb989b"
-SOURCE_URI_18="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Regular.otf#noarchive"
-CHECKSUM_SHA256_18="509b1a3aec34c02f86d1b73cc1aa9594b863142021e6441af407dcb4a7cf9029"
-# Simple Chinese
-SOURCE_URI_19="$baseURL/$srcGitRev/NotoSansCJKsc-Black.otf#noarchive"
-CHECKSUM_SHA256_19="4f64a0adc660f0066baf25a361cb5f2206952d3e71d05dcade25088c89857c4d"
-SOURCE_URI_20="$baseURL/$srcGitRev/NotoSansCJKsc-Bold.otf#noarchive"
-CHECKSUM_SHA256_20="9cd6c106d54cec938405ae19388cb4bc685ad2ff0270d03358bf61aa67e1ccb9"
-SOURCE_URI_21="$baseURL/$srcGitRev/NotoSansCJKsc-DemiLight.otf#noarchive"
-CHECKSUM_SHA256_21="4f9015dfba78ae3e0b5c307e71731dabd075eb10b19183af8cb73caa27a830eb"
-SOURCE_URI_22="$baseURL/$srcGitRev/NotoSansCJKsc-Light.otf#noarchive"
-CHECKSUM_SHA256_22="9ebc2050fc73480c2806df9d2ac35dd5cec2ad67d48a7d8c8d4df9378c25294c"
-SOURCE_URI_23="$baseURL/$srcGitRev/NotoSansCJKsc-Medium.otf#noarchive"
-CHECKSUM_SHA256_23="0d01ee04b015315b457dfacdd3442e305d5bb183a9f355c0afda501f6fef39c6"
-SOURCE_URI_24="$baseURL/$srcGitRev/NotoSansCJKsc-Regular.otf#noarchive"
-CHECKSUM_SHA256_24="1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd"
-SOURCE_URI_25="$baseURL/$srcGitRev/NotoSansCJKsc-Thin.otf#noarchive"
-CHECKSUM_SHA256_25="53850c9e3d21f83b249b1acaad701156d4053f61f52cda7169c420c9072680c9"
-SOURCE_URI_26="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Bold.otf#noarchive"
-CHECKSUM_SHA256_26="9ccb57035e388a53f9fb6c1a4385b83e824ff6b781dbe55cf0657ae2205247a0"
-SOURCE_URI_27="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Regular.otf#noarchive"
-CHECKSUM_SHA256_27="2b1dbdc50df666a00c50ecd77377e2394c6babd35a71e37505ab411ff55c7906"
-# Traditional Chinese
-SOURCE_URI_28="$baseURL/$srcGitRev/NotoSansCJKtc-Black.otf#noarchive"
-CHECKSUM_SHA256_28="203cf8985ba88adbe5e315f931ca61b9f053c5e5f358bf0c91576eb380597ac5"
-SOURCE_URI_29="$baseURL/$srcGitRev/NotoSansCJKtc-Bold.otf#noarchive"
-CHECKSUM_SHA256_29="977833121efae44b1c2115282724383b3201bdc104064d7bb2c1c92da928aafc"
-SOURCE_URI_30="$baseURL/$srcGitRev/NotoSansCJKtc-DemiLight.otf#noarchive"
-CHECKSUM_SHA256_30="4afca0a8f81a4c149d307a24c44403fe23c5e84e9fa745ac9f0d9d9a6097fede"
-SOURCE_URI_31="$baseURL/$srcGitRev/NotoSansCJKtc-Light.otf#noarchive"
-CHECKSUM_SHA256_31="baf3e2718c919472af2b2c107d79d71abf4ce6fb2bd46e45f2e2b6acf686f83c"
-SOURCE_URI_32="$baseURL/$srcGitRev/NotoSansCJKtc-Medium.otf#noarchive"
-CHECKSUM_SHA256_32="07aaf9190313301b18bda707c4db7ac75eaae6ef222eb5c38f97ed78700fd4f2"
-SOURCE_URI_33="$baseURL/$srcGitRev/NotoSansCJKtc-Regular.otf#noarchive"
-CHECKSUM_SHA256_33="f57e46120a3dd025ac993801981849622405d1359b32093b1f046490f7885711"
-SOURCE_URI_34="$baseURL/$srcGitRev/NotoSansCJKtc-Thin.otf#noarchive"
-CHECKSUM_SHA256_34="a78bd02326203aad6efcd1bd51ba8ae20db8252f2d4244180178a7e42a626d3c"
-SOURCE_URI_35="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Bold.otf#noarchive"
-CHECKSUM_SHA256_35="a7d6d87c73884e666ddb847e0a4992a58f85b56f4f0064842d8288730083b44c"
-SOURCE_URI_36="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Regular.otf#noarchive"
-CHECKSUM_SHA256_36="bce991d5a4132bd389b899a7c654fe50fe7ec9acedd93f47e9d77f4a728dacff"
-
-ARCHITECTURES="any"
-DISABLE_SOURCE_PACKAGE="yes"
-
-# noto_sans_cjk-$portVersion-any.hpkg is intentionally empty and can be removed.
-PROVIDES="
-	noto_sans_cjk=$portVersion	# empty. ToDo: prevent creating empty hpkg
-	"
-REQUIRES=""
-
-SUMMARY_jp="The Noto font for CJK languages (default Japanese)"
-PROVIDES_jp="
-	noto_sans_cjk_jp=$portVersion	# Japanese default
-	"
-REQUIRES_jp=""
-
-SUMMARY_kr="The Noto font for CJK languages (default Korean)"
-PROVIDES_kr="
-	noto_sans_cjk_kr=$portVersion	# Korean default
-	"
-REQUIRES_kr=""
-
-SUMMARY_sc="The Noto font for CJK languages (default Simple Chinese)"
-PROVIDES_sc="
-	noto_sans_cjk_sc=$portVersion	# Simple Chinese default
-	"
-REQUIRES_sc=""
-
-SUMMARY_tc="The Noto font for CJK languages (default Traditional Chinese)"
-PROVIDES_tc="
-	noto_sans_cjk_tc=$portVersion	# Traditional Chinese default
-	"
-REQUIRES_tc=""
-
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES=""
-
-BUILD()
-{
-	true
-}
-
-INSTALL()
-{
-	FONTDIR=$fontsDir/otfonts
-	mkdir -p ${FONTDIR}
-
-	cp ../sources*/*.otf ${FONTDIR}
-
-	packageEntries jp \
-		${FONTDIR}/*CJKjp*.otf
-
-	packageEntries kr \
-		${FONTDIR}/*CJKkr*.otf
-
-	packageEntries sc \
-		${FONTDIR}/*CJKsc*.otf
-
-	packageEntries tc \
-		${FONTDIR}/*CJKtc*.otf
-}
diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-2.004.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-2.004.recipe
new file mode 100644
index 000000000..1019d8ae9
--- /dev/null
+++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-2.004.recipe
@@ -0,0 +1,110 @@
+SUMMARY="The Noto font for CJK languages"
+DESCRIPTION="The Noto fonts have superseded the Droid fonts, which were \
+originally designed for the use in Google's Android. Noto's aim is to be a \
+free for everyone, with beautiful glyphs for all languages, looking good \
+especially when multiple styles and weights and even languages are mixed on \
+a page.
+
+This package supports Japanese, Korean and simple/traditional Chinese.
+Included are various weights and two 'monospaced' typefaces ('regular' and \
+'bold')."
+HOMEPAGE="https://www.google.com/get/noto/"
+COPYRIGHT="2012 Google Inc."
+LICENSE="SIL Open Font License v1.1"
+REVISION="1"
+# Japanese
+SOURCE_URI="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/06_NotoSansCJKjp.zip"
+CHECKSUM_SHA256="bf5b26feb83ee02533d4eb4a127bd90ed9d42bdd7ca7cb6e4030b2f21ef55cc5"
+SOURCE_DIR=""
+SOURCE_URI_2="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/11_NotoSansMonoCJKjp.zip"
+CHECKSUM_SHA256_2="6c8faf475ce78fa37486dd5d8920e4bb4450b1b0f3c497edf3ba2d25cf52ab78"
+# Korean
+SOURCE_URI_3="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/07_NotoSansCJKkr.zip"
+CHECKSUM_SHA256_3="e26fcf98e75176d24984875377ab921dbb46055b88ed4a39454d91d6146c5654"
+SOURCE_URI_4="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/12_NotoSansMonoCJKkr.zip"
+CHECKSUM_SHA256_4="8c1368d3faac3c43991a91392fb73d985409ffe078cb731c7e303e226e4fd619"
+# Simplified Chinese
+SOURCE_URI_5="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/08_NotoSansCJKsc.zip"
+CHECKSUM_SHA256_5="a927e56f53bd6c3b920bc139c0b94aa36c7d9ad0cf009b159437a1a003581140"
+SOURCE_URI_6="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/13_NotoSansMonoCJKsc.zip"
+CHECKSUM_SHA256_6="e252c39994f8a278676507600a955663c23c24a7827dc63a4300b2f7b427cd5d"
+# Traditional Chinese
+SOURCE_URI_7="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/09_NotoSansCJKtc.zip"
+CHECKSUM_SHA256_7="8ea0d6feb8e092c250710cdc75c138090832ddaa98d8ccb37cd89b03b72c331b"
+SOURCE_URI_8="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/14_NotoSansMonoCJKtc.zip"
+CHECKSUM_SHA256_8="0126cbeef724edf21fbaeb113739adf392679fd90a2897c76159d1141df9e8c6"
+# Traditional Chinese Hongkong
+SOURCE_URI_9="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/10_NotoSansCJKhk.zip"
+CHECKSUM_SHA256_9="f2a8ebfdb737a3dbfbbc501c2ad70a835b1c43c19f785d86bd5024607e069346"
+SOURCE_URI_10="https://github.com/googlefonts/noto-cjk/releases/download/Sans$portVersion/15_NotoSansMonoCJKhk.zip"
+CHECKSUM_SHA256_10="09a4df63660eee4ef0d1841566d9b4d63142f570847b965101d06ed8d67ded41"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+# noto_sans_cjk-$portVersion-any.hpkg is intentionally empty and can be removed.
+PROVIDES="
+	noto_sans_cjk=$portVersion	# empty. ToDo: prevent creating empty hpkg
+	"
+REQUIRES=""
+
+SUMMARY_jp="The Noto font for CJK languages (default Japanese)"
+PROVIDES_jp="
+	noto_sans_cjk_jp=$portVersion	# Japanese default
+	"
+REQUIRES_jp=""
+
+SUMMARY_kr="The Noto font for CJK languages (default Korean)"
+PROVIDES_kr="
+	noto_sans_cjk_kr=$portVersion	# Korean default
+	"
+REQUIRES_kr=""
+
+SUMMARY_sc="The Noto font for CJK languages (default Simplified Chinese)"
+PROVIDES_sc="
+	noto_sans_cjk_sc=$portVersion	# Simplified Chinese default
+	"
+REQUIRES_sc=""
+
+SUMMARY_tc="The Noto font for CJK languages (default Traditional Chinese)"
+PROVIDES_tc="
+	noto_sans_cjk_tc=$portVersion	# Traditional Chinese default
+	"
+REQUIRES_tc=""
+
+SUMMARY_hk="The Noto font for CJK languages (default Traditional Chinese Hongkong)"
+PROVIDES_hk="
+	noto_sans_cjk_hk=$portVersion	# Traditional Chinese Hongkong default
+	"
+REQUIRES_hk=""
+
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES=""
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	FONTDIR=$fontsDir/otfonts
+	mkdir -p ${FONTDIR}
+
+	cp ../sources*/*.otf ${FONTDIR}
+
+	packageEntries jp \
+		${FONTDIR}/*CJKjp*.otf
+
+	packageEntries kr \
+		${FONTDIR}/*CJKkr*.otf
+
+	packageEntries sc \
+		${FONTDIR}/*CJKsc*.otf
+
+	packageEntries tc \
+		${FONTDIR}/*CJKtc*.otf
+
+	packageEntries hk \
+		${FONTDIR}/*CJKhk*.otf
+}
diff --git a/media-fonts/noto_serif_cjk/noto_serif_cjk-1.001.recipe b/media-fonts/noto_serif_cjk/noto_serif_cjk-1.001.recipe
deleted file mode 100644
index 6ae5e3f41..000000000
--- a/media-fonts/noto_serif_cjk/noto_serif_cjk-1.001.recipe
+++ /dev/null
@@ -1,138 +0,0 @@
-SUMMARY="The Noto serif font for CJK languages"
-DESCRIPTION="The Noto serif fonts have superseded the Droid fonts, which were \
-originally designed for the use in Google's Android. Noto's aim is to be a \
-free for everyone, with beautiful glyphs for all languages, looking good \
-especially when multiple styles and weights and even languages are mixed on \
-a page.
-
-This package supports Japanese, Korean and simple/traditional Chinese.
-Included are various weights and two 'monospaced' typefaces ('regular' and \
-'bold')."
-HOMEPAGE="https://www.google.com/get/noto/"
-COPYRIGHT="2017 Google Inc."
-LICENSE="SIL Open Font License v1.1"
-REVISION="2"
-baseURL="https://raw.githubusercontent.com/googlei18n/noto-cjk"
-srcGitRev="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
-# Japanese
-SOURCE_URI="$baseURL/$srcGitRev/NotoSerifCJKjp-Black.otf#noarchive"
-CHECKSUM_SHA256="0db4bdcfe6e0a7cf0fd4fa532d1dd7c33cb2de90197f5c1fcaa33d5ffa1bd1f7"
-SOURCE_DIR=""
-SOURCE_URI_2="$baseURL/$srcGitRev/NotoSerifCJKjp-Bold.otf#noarchive"
-CHECKSUM_SHA256_2="58934baab3edc7196d7e2b79a07c8e0377699fa61708b87be8711315dbc2ccf3"
-SOURCE_URI_3="$baseURL/$srcGitRev/NotoSerifCJKjp-ExtraLight.otf#noarchive"
-CHECKSUM_SHA256_3="c1e56e2ad421217782e6cb18ef88533efb0d99523249b6ebd987c3f958bd8e92"
-SOURCE_URI_4="$baseURL/$srcGitRev/NotoSerifCJKjp-Light.otf#noarchive"
-CHECKSUM_SHA256_4="485ec27ad7c2ae6eb44af1a6b5f0a603577a886b04f8cc4c0e5db219e2978715"
-SOURCE_URI_5="$baseURL/$srcGitRev/NotoSerifCJKjp-Medium.otf#noarchive"
-CHECKSUM_SHA256_5="481cec1d1c2b12c8c2504134393e480b6c0a34af0120c130603c55dc0ba938f0"
-SOURCE_URI_6="$baseURL/$srcGitRev/NotoSerifCJKjp-Regular.otf#noarchive"
-CHECKSUM_SHA256_6="79c0247b9bd2bcb68d011b0b32d00f575743cb69b308c57625371c1b457cdf88"
-SOURCE_URI_7="$baseURL/$srcGitRev/NotoSerifCJKjp-SemiBold.otf#noarchive"
-CHECKSUM_SHA256_7="5a60025b47c0583ba4f0977c8c8da66a586b547365af6ef9776b720a027821da"
-# Korean
-SOURCE_URI_8="$baseURL/$srcGitRev/NotoSerifCJKkr-Black.otf#noarchive"
-CHECKSUM_SHA256_8="f88873f4dc9b5b5a6322a80907631a89d3b27cbd8b629e9dd6fc4dcc704e91f8"
-SOURCE_URI_9="$baseURL/$srcGitRev/NotoSerifCJKkr-Bold.otf#noarchive"
-CHECKSUM_SHA256_9="814199fd4c0485718ba875127761e23b6354ea06eef64933653c17d183f89106"
-SOURCE_URI_10="$baseURL/$srcGitRev/NotoSerifCJKkr-ExtraLight.otf#noarchive"
-CHECKSUM_SHA256_10="9f289c30695cb954908196413945768398ea9b2695dd1dd0d444e4a59fa63bed"
-SOURCE_URI_11="$baseURL/$srcGitRev/NotoSerifCJKkr-Light.otf#noarchive"
-CHECKSUM_SHA256_11="145efe5cade8c89c414eb8132bee6630368bcedf651e638f1230d782e3bf78a9"
-SOURCE_URI_12="$baseURL/$srcGitRev/NotoSerifCJKkr-Medium.otf#noarchive"
-CHECKSUM_SHA256_12="1a74f3677937eb4849c4cff1cb350aaedda36cbf2f5567fea48ce3632910ff2d"
-SOURCE_URI_13="$baseURL/$srcGitRev/NotoSerifCJKkr-Regular.otf#noarchive"
-CHECKSUM_SHA256_13="ee9243aeddaf064265b106fe0e0da221ab76638daf73fe83ce7419d001739c3e"
-SOURCE_URI_14="$baseURL/$srcGitRev/NotoSerifCJKkr-SemiBold.otf#noarchive"
-CHECKSUM_SHA256_14="16111ec2c4b49dc4a8f1a944952e64be8cc9589b05fe123275961c70ca6fa466"
-# Simple Chinese
-SOURCE_URI_15="$baseURL/$srcGitRev/NotoSerifCJKsc-Black.otf#noarchive"
-CHECKSUM_SHA256_15="94ef86d2807b81a0db8f596ff0e50130b9744da61b71000e77087aaf38418c02"
-SOURCE_URI_16="$baseURL/$srcGitRev/NotoSerifCJKsc-Bold.otf#noarchive"
-CHECKSUM_SHA256_16="2dcb7dd34444afc79fce6c2f67afe018b6bbe87af98bf0918d7316c58416157b"
-SOURCE_URI_17="$baseURL/$srcGitRev/NotoSerifCJKsc-ExtraLight.otf#noarchive"
-CHECKSUM_SHA256_17="2cc0582da264c9038c75a766a78bf645567c8c552f36b98901b3c43b11bd8fa5"
-SOURCE_URI_18="$baseURL/$srcGitRev/NotoSerifCJKsc-Light.otf#noarchive"
-CHECKSUM_SHA256_18="e5880b655a78ab15ef0ebd807b6d0f049d5668674c11f49ca3473aedb3e0cadc"
-SOURCE_URI_19="$baseURL/$srcGitRev/NotoSerifCJKsc-Medium.otf#noarchive"
-CHECKSUM_SHA256_19="3405a99c1fc545672b919d55acc61ff749dd54e577a893b43a4dc99d11b4c6cf"
-SOURCE_URI_20="$baseURL/$srcGitRev/NotoSerifCJKsc-Regular.otf#noarchive"
-CHECKSUM_SHA256_20="efa5e49879a789c1ecad8f07e1813c7f9aa6c4b951fdbb5791d85d67345632d7"
-SOURCE_URI_21="$baseURL/$srcGitRev/NotoSerifCJKsc-SemiBold.otf#noarchive"
-CHECKSUM_SHA256_21="e3e030ed7420c96c465a6afccfecfa83739797d7854f8e3c89f6ac4d73af0338"
-# Traditional Chinese
-SOURCE_URI_22="$baseURL/$srcGitRev/NotoSerifCJKtc-Black.otf#noarchive"
-CHECKSUM_SHA256_22="6d2a669ae86781b3b0e166f47d13771d501c77529f1f6243e9db5cd95936078d"
-SOURCE_URI_23="$baseURL/$srcGitRev/NotoSerifCJKtc-Bold.otf#noarchive"
-CHECKSUM_SHA256_23="d6bc09d324004b38207898f86deb298cc4eb0527bc40916f25ba9d3ba07226f9"
-SOURCE_URI_24="$baseURL/$srcGitRev/NotoSerifCJKtc-ExtraLight.otf#noarchive"
-CHECKSUM_SHA256_24="4fce4e673651164c88ddb9c6954df943b4ce9965fdac38d84ac945aa8f74a363"
-SOURCE_URI_25="$baseURL/$srcGitRev/NotoSerifCJKtc-Light.otf#noarchive"
-CHECKSUM_SHA256_25="8ef5a29508a19f36abfdd0dd489f2185c1b7025dd511de496115df9397a4d514"
-SOURCE_URI_26="$baseURL/$srcGitRev/NotoSerifCJKtc-Medium.otf#noarchive"
-CHECKSUM_SHA256_26="774ffd487e9012b39a869ad4267b6a732c426ee1df4000418bb0ec57ff86d986"
-SOURCE_URI_27="$baseURL/$srcGitRev/NotoSerifCJKtc-Regular.otf#noarchive"
-CHECKSUM_SHA256_27="c93523479cdebe549052a36beafeeb004801796d72c958d5f8e3e61546220d1a"
-SOURCE_URI_28="$baseURL/$srcGitRev/NotoSerifCJKtc-SemiBold.otf#noarchive"
-CHECKSUM_SHA256_28="f401ae658b085d2ff6626a34a6fcfe649233527a8d3f255a34bac25253a9ffd2"
-
-ARCHITECTURES="any"
-DISABLE_SOURCE_PACKAGE="yes"
-
-# noto_serif_cjk-$portVersion-any.hpkg is intentionally empty and can be removed.
-PROVIDES="
-	noto_serif_cjk=$portVersion	# empty. ToDo: prevent creating empty hpkg
-	"
-REQUIRES=""
-
-SUMMARY_jp="The Noto serif font for CJK languages (default Japanese)"
-PROVIDES_jp="
-	noto_serif_cjk_jp=$portVersion	# Japanese default
-	"
-REQUIRES_jp=""
-
-SUMMARY_kr="The Noto serif font for CJK languages (default Korean)"
-PROVIDES_kr="
-	noto_serif_cjk_kr=$portVersion	# Korean default
-	"
-REQUIRES_kr=""
-
-SUMMARY_sc="The Noto serif font for CJK languages (default Simple Chinese)"
-PROVIDES_sc="
-	noto_serif_cjk_sc=$portVersion	# Simple Chinese default
-	"
-REQUIRES_sc=""
-
-SUMMARY_tc="The Noto serif font for CJK languages (default Traditional Chinese)"
-PROVIDES_tc="
-	noto_serif_cjk_tc=$portVersion	# Traditional Chinese default
-	"
-REQUIRES_tc=""
-
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES=""
-
-BUILD()
-{
-	true
-}
-
-INSTALL()
-{
-	FONTDIR=$fontsDir/otfonts
-	mkdir -p ${FONTDIR}
-
-	cp ../sources*/*.otf ${FONTDIR}
-
-	packageEntries jp \
-		${FONTDIR}/*CJKjp*.otf
-
-	packageEntries kr \
-		${FONTDIR}/*CJKkr*.otf
-
-	packageEntries sc \
-		${FONTDIR}/*CJKsc*.otf
-
-	packageEntries tc \
-		${FONTDIR}/*CJKtc*.otf
-}
diff --git a/media-fonts/noto_serif_cjk/noto_serif_cjk-2.002.recipe b/media-fonts/noto_serif_cjk/noto_serif_cjk-2.002.recipe
new file mode 100644
index 000000000..65b2f3692
--- /dev/null
+++ b/media-fonts/noto_serif_cjk/noto_serif_cjk-2.002.recipe
@@ -0,0 +1,102 @@
+SUMMARY="The Noto serif font for CJK languages"
+DESCRIPTION="The Noto serif fonts have superseded the Droid fonts, which were \
+originally designed for the use in Google's Android. Noto's aim is to be a \
+free for everyone, with beautiful glyphs for all languages, looking good \
+especially when multiple styles and weights and even languages are mixed on \
+a page.
+
+This package supports Japanese, Korean and simple/traditional Chinese.
+Included are various weights and two 'monospaced' typefaces ('regular' and \
+'bold')."
+HOMEPAGE="https://www.google.com/get/noto/"
+COPYRIGHT="2017 Google Inc."
+LICENSE="SIL Open Font License v1.1"
+REVISION="1"
+# Japanese
+SOURCE_URI="https://github.com/googlefonts/noto-cjk/releases/download/Serif$portVersion/07_NotoSerifCJKjp.zip"
+CHECKSUM_SHA256="166a03cc7725f4d52a0533f4137991089e55d1d417b9d7e15197a9d483b41de3"
+SOURCE_DIR=""
+# Korean
+SOURCE_URI_2="https://github.com/googlefonts/noto-cjk/releases/download/Serif$portVersion/08_NotoSerifCJKkr.zip"
+CHECKSUM_SHA256_2="4df44fb37250f09d7f0382b70e389c400cbb2f4b783ac65c262e8bfa26c64fc1"
+# Simplified Chinese
+SOURCE_URI_3="https://github.com/googlefonts/noto-cjk/releases/download/Serif$portVersion/09_NotoSerifCJKsc.zip"
+CHECKSUM_SHA256_3="eeede72f5b88655a3630f18661155028578afc88aa9e67e55db45a8b5be46789"
+# Traditional Chinese
+SOURCE_URI_4="https://github.com/googlefonts/noto-cjk/releases/download/Serif$portVersion/10_NotoSerifCJKtc.zip"
+CHECKSUM_SHA256_4="bd14b808431c5058c69f999c3c6d898b9f37d96962ec26f7212fb34c2d49ea5c"
+# Traditional Chinese Hongkong
+SOURCE_URI_5="https://github.com/googlefonts/noto-cjk/releases/download/Serif$portVersion/11_NotoSerifCJKhk.zip"
+CHECKSUM_SHA256_5="7f02747e29f8aeb1988d3f3a41166bf309d3c1f27ab263d760e48ac9857c37e7"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+# noto_serif_cjk-$portVersion-any.hpkg is intentionally empty and can be removed.
+PROVIDES="
+	noto_serif_cjk=$portVersion	# empty. ToDo: prevent creating empty hpkg
+	"
+REQUIRES=""
+
+SUMMARY_jp="The Noto serif font for CJK languages (default Japanese)"
+PROVIDES_jp="
+	noto_serif_cjk_jp=$portVersion	# Japanese default
+	"
+REQUIRES_jp=""
+
+SUMMARY_kr="The Noto serif font for CJK languages (default Korean)"
+PROVIDES_kr="
+	noto_serif_cjk_kr=$portVersion	# Korean default
+	"
+REQUIRES_kr=""
+
+SUMMARY_sc="The Noto serif font for CJK languages (default Simplified Chinese)"
+PROVIDES_sc="
+	noto_serif_cjk_sc=$portVersion	# Simplified Chinese default
+	"
+REQUIRES_sc=""
+
+SUMMARY_tc="The Noto serif font for CJK languages (default Traditional Chinese)"
+PROVIDES_tc="
+	noto_serif_cjk_tc=$portVersion	# Traditional Chinese default
+	"
+REQUIRES_tc=""
+
+SUMMARY_hk="The Noto serif font for CJK languages (default Traditional Chinese Hongkong)"
+PROVIDES_hk="
+	noto_serif_cjk_hk=$portVersion	# Traditional Chinese Hongkong default
+	"
+REQUIRES_tc=""
+
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES=""
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	FONTDIR=$fontsDir/otfonts
+	mkdir -p ${FONTDIR}
+
+	cp ../sources*/*/*/*.otf ${FONTDIR}
+
+	packageEntries jp \
+		${FONTDIR}/*CJKjp*.otf
+
+	packageEntries kr \
+		${FONTDIR}/*CJKkr*.otf
+
+	packageEntries sc \
+		${FONTDIR}/*CJKsc*.otf
+
+	packageEntries tc \
+		${FONTDIR}/*CJKtc*.otf
+
+	packageEntries hk \
+		${FONTDIR}/*CJKhk*.otf
+
+	rm -rf $dataDir
+}