gentoo resync : 18.12.2020

5 files changed, 5 insertions, 42 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index a8f776bd089b..bb4f87b16807 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 9e28f37f9b3e..01c5a5df0470 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,7 +1,3 @@
-DIST cascadia-code-1909.16.tar.gz 338681 BLAKE2B a31c643773a5c51f2cd803c26ab0001c0d3272137d1679e7c2f77c05f9a35751bcd6c9f7ea6c23575d28d1312e6a3a69d6e0c64f1691817599606115ec2d54f5 SHA512 fcb2cb28250e7007e024b57d6cce8b0424b02eff016312397e25fb236e73813ba48a3561ff01c6aa2235c990aae2428ad08d49e1c2f97c0b8ea01498b3c9ec36
-DIST cascadia-code-1910.04.tar.gz 442050 BLAKE2B 61612a310b9f74cbededf060d826978d6f8c3af101e85380a4938bcaecbb0be11bb1975663d80009b14599a04f739d0aedf1d02e5467c4ed5b38708760d446e5 SHA512 2594f8bd01956cc594012746b33a5def6d68e1c365fb5ca43ee21ba19d295e3960e2434849cbb9be6d1a4b39920357b38cacd0480d7543585f616f39d6378379
-DIST cascadia-code-2004.30.zip 1003328 BLAKE2B 91eda6dffef3ba188fd1bc510f26e5043a4aea8c4c78b3bfc14c7292dfce2895785adc2e100593d4d5cec2d6db8ec35409a5ee75064b2717a900bbbee580cdd8 SHA512 f2bb331daa095926bb3fd0777f78ad5f5d483a7b4f181c9a617fb341983eefbc67116cc530f722a46c59555575384bb604fc2410452f9a9e2cbdc0aa67ca7529
-EBUILD cascadia-code-1909.16.ebuild 404 BLAKE2B 5c0e9fbadc0da470f4a3b940c775238d9633218d4015ae6cf80f9d3d82b3879eedb2827ab1b86d87ccbbbdf9cca8dd6e918965ac57217764fbadbd56fe35308d SHA512 acaff6c81543a971d69408931958e93f70ecaadf9ce968e9235b1d4ca7a94d586cf68781efd86cd8de61d0ac00b94834751c73426244f00fca8eb7c29db2605e
-EBUILD cascadia-code-1910.04.ebuild 454 BLAKE2B c5a93f789e3b9ee5095ee8594716d05a4d4269288799a61795478ed9a4498f5de5a09238809a4bceb8e16d3159a2b4644f718e28ed3878fff2349e461cbb63d5 SHA512 3dd7abc697d66cc210b8172518247922f59e4ab423c1e26ff6069b450a303d1160897d25349adc08a1a2ea68e19ecc60c16f7bfc9383726cae9901991084f08c
-EBUILD cascadia-code-2004.30.ebuild 522 BLAKE2B dc51a7ce77b5afda3224f7dd0ffc451a756849dafa74bbd52e1c9b2258620c47ce56317d07adc5d848d65862074fba194ca60b11bc46f7a7e1b6b07bdee1ee18 SHA512 432732c24b8bbf142f843b85da4aa9eb33aaa5f642f69c5f3d8f968b97a58b0cac542188bdbce55c957764e644fc286aa70fa682276c17b506a82dec18224ae0
+DIST cascadia-code-2009.22.zip 8217333 BLAKE2B 0c3e4cb95cae4869c911ea93e16b496e249778150fc208a04c392cd6321245e2de822953ed79346201e73dd8ad3359f6ec99b3f156f33b49b9f698413d5be568 SHA512 3ddc0b243b10fa36ffb89d7f63cce50b39bdc6b263ab124c9c34840eb7e775fc84366dffc1785b3b5cd48b1fda045f5f90d8e0301ffac754a0b7b9d8063b3d04
+EBUILD cascadia-code-2009.22.ebuild 521 BLAKE2B b56d561d133a1c12ae4a73bf56608f72506a21b6f2202ade0716e028c768e8b536a4c5e9d82e4e48470d6067466d69f30cf1f86c1033664aaee150439cec135d SHA512 22713cf2f49b39d0163e7309fa70d468bd5e17d1ea82fb0e7d908af7050ded1236f9980bdea2682298adf64ffad6a6763b3e6ecfc18e25d9736e12cbabed64d6
 MISC metadata.xml 642 BLAKE2B 48b342f9f8e818fa5b1f48d7124c9c38eab178c08e54f228e1474c0ba59248d528cf491f7e94db93f468a5128755ca814e1790560c760ecdaf2ef16e48e9205d SHA512 59d1bce26c031793c04023b8011f044f76c7d647774e3c6c4f12280d60201994a70c0d95f7c64de2518f86e9050a200456a9ee2373fe6941a642f7471109b70d
diff --git a/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild b/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild
deleted file mode 100644
index ee27bbcc4a30..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild b/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
deleted file mode 100644
index 79feac20af1f..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/cascadia-code/cascadia-code-2004.30.ebuild b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
index c1e4245535c6..ac79209160a2 100644
--- a/media-fonts/cascadia-code/cascadia-code-2004.30.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=7
 
+FONT_SUFFIX="ttf"
 inherit font
 
 DESCRIPTION="A monospaced font developed for Windows Terminal"
 HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode_${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode-${PV}.zip -> ${P}.zip"
+S="${WORKDIR}/ttf"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/ttf"
-FONT_SUFFIX="ttf"