summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-fonts')
-rw-r--r--media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild12
-rw-r--r--media-fonts/Humor-Sans/metadata.xml4
-rw-r--r--media-fonts/ahem/ahem-1.0.ebuild11
-rw-r--r--media-fonts/alee-fonts/alee-fonts-13-r1.ebuild8
-rw-r--r--media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild11
-rw-r--r--media-fonts/alegreya-serif/Manifest1
-rw-r--r--media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild21
-rw-r--r--media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild11
-rw-r--r--media-fonts/andika/andika-5.000.ebuild17
-rw-r--r--media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild14
-rw-r--r--media-fonts/aquafont/aquafont-2.7-r4.ebuild2
-rw-r--r--media-fonts/aquapfont/aquapfont-2.6-r2.ebuild2
-rw-r--r--media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild17
-rw-r--r--media-fonts/arkpandora/arkpandora-2.04.ebuild16
-rw-r--r--media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild81
-rw-r--r--media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch12
-rw-r--r--media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild2
-rw-r--r--media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild4
-rw-r--r--media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild20
-rw-r--r--media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild16
-rw-r--r--media-fonts/cantarell/Manifest2
-rw-r--r--media-fonts/cantarell/cantarell-0.111.ebuild53
-rw-r--r--media-fonts/cantarell/cantarell-0.201.ebuild49
-rw-r--r--media-fonts/cantarell/cantarell-0.301.ebuild2
-rw-r--r--media-fonts/cascadia-code/Manifest2
-rw-r--r--media-fonts/cascadia-code/cascadia-code-2102.25.ebuild (renamed from media-fonts/cascadia-code/cascadia-code-2009.22.ebuild)7
-rw-r--r--media-fonts/cascadia-code/metadata.xml4
-rw-r--r--media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild4
-rw-r--r--media-fonts/clearsans/clearsans-1.00.ebuild10
-rw-r--r--media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild9
-rw-r--r--media-fonts/comic-neue/Manifest1
-rw-r--r--media-fonts/comic-neue/comic-neue-2.2.ebuild18
-rw-r--r--media-fonts/comic-neue/comic-neue-2.3.ebuild13
-rw-r--r--media-fonts/comic-neue/metadata.xml9
-rw-r--r--media-fonts/corefonts/corefonts-1-r7.ebuild8
-rw-r--r--media-fonts/courier-prime/courier-prime-1.203.ebuild10
-rw-r--r--media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild4
-rw-r--r--media-fonts/croscorefonts/Manifest1
-rw-r--r--media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild25
-rw-r--r--media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild13
-rw-r--r--media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild12
-rw-r--r--media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild10
-rw-r--r--media-fonts/culmus/culmus-0.120-r6.ebuild (renamed from media-fonts/culmus/culmus-0.120-r5.ebuild)141
-rw-r--r--media-fonts/culmus/culmus-0.133-r1.ebuild (renamed from media-fonts/culmus/culmus-0.133.ebuild)151
-rw-r--r--media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch191
-rw-r--r--media-fonts/dejavu/Manifest2
-rw-r--r--media-fonts/dejavu/dejavu-2.35.ebuild75
-rw-r--r--media-fonts/dejavu/dejavu-2.37.ebuild27
-rw-r--r--media-fonts/dina/dina-2.93.ebuild19
-rw-r--r--media-fonts/droid/droid-113-r5.ebuild14
-rw-r--r--media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild16
-rw-r--r--media-fonts/eb-garamond/eb-garamond-0.016.ebuild12
-rw-r--r--media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild4
-rw-r--r--media-fonts/encodings/encodings-1.0.5-r1.ebuild2
-rw-r--r--media-fonts/essays1743/Manifest1
-rw-r--r--media-fonts/essays1743/essays1743-2.100.ebuild20
-rw-r--r--media-fonts/essays1743/metadata.xml12
-rw-r--r--media-fonts/exo/exo-2.ebuild9
-rw-r--r--media-fonts/fantasque-sans-mono/Manifest2
-rw-r--r--media-fonts/fantasque-sans-mono/fantasque-sans-mono-1.8.0.ebuild18
-rw-r--r--media-fonts/fantasque-sans-mono/fantasque-sans-mono-2014.07.ebuild21
-rw-r--r--media-fonts/fantasque-sans-mono/metadata.xml11
-rw-r--r--media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild2
-rw-r--r--media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild6
-rw-r--r--media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild9
-rw-r--r--media-fonts/fira-code/fira-code-4.ebuild7
-rw-r--r--media-fonts/fira-code/fira-code-5.2.ebuild18
-rw-r--r--media-fonts/fira-code/metadata.xml2
-rw-r--r--media-fonts/fira-mono/Manifest2
-rw-r--r--media-fonts/fira-mono/fira-mono-3.205.ebuild23
-rw-r--r--media-fonts/fira-mono/fira-mono-4.202.ebuild39
-rw-r--r--media-fonts/fira-mono/metadata.xml4
-rw-r--r--media-fonts/fira-sans/Manifest3
-rw-r--r--media-fonts/fira-sans/fira-sans-4.002.ebuild23
-rw-r--r--media-fonts/fira-sans/fira-sans-4.105.ebuild23
-rw-r--r--media-fonts/fira-sans/fira-sans-4.202.ebuild39
-rw-r--r--media-fonts/fira-sans/metadata.xml13
-rw-r--r--media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-alias/font-alias-1.0.4.ebuild2
-rw-r--r--media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild4
-rw-r--r--media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild2
-rw-r--r--media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild4
-rw-r--r--media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-util/font-util-1.3.2-r1.ebuild2
-rw-r--r--media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/fontawesome/Manifest1
-rw-r--r--media-fonts/fontawesome/fontawesome-5.15.2.ebuild33
-rw-r--r--media-fonts/fontawesome/metadata.xml4
-rw-r--r--media-fonts/fonts-meta/fonts-meta-1-r2.ebuild103
-rw-r--r--media-fonts/fonts-meta/metadata.xml (renamed from media-fonts/infinality-ultimate-meta/metadata.xml)9
-rw-r--r--media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild4
-rw-r--r--media-fonts/freefont/freefont-20120503.ebuild13
-rw-r--r--media-fonts/freefonts/freefonts-0.10-r4.ebuild4
-rw-r--r--media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild2
-rw-r--r--media-fonts/gidole/gidole-2.0.2.ebuild10
-rw-r--r--media-fonts/hack/hack-3.003.ebuild18
-rw-r--r--media-fonts/hermit/Manifest1
-rw-r--r--media-fonts/hermit/hermit-1.1.ebuild17
-rw-r--r--media-fonts/hermit/hermit-1.21.ebuild11
-rw-r--r--media-fonts/heuristica/heuristica-1.0.2.ebuild13
-rw-r--r--media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild4
-rw-r--r--media-fonts/ibm-plex/Manifest1
-rw-r--r--media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild61
-rw-r--r--media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild14
-rw-r--r--media-fonts/inconsolata-lgc/metadata.xml4
-rw-r--r--media-fonts/inconsolata/inconsolata-20140821.ebuild12
-rw-r--r--media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild95
-rw-r--r--media-fonts/intlfonts/Manifest1
-rw-r--r--media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild4
-rw-r--r--media-fonts/intlfonts/intlfonts-1.4.1.ebuild33
-rw-r--r--media-fonts/iosevka/iosevka-1.14.1.ebuild10
-rw-r--r--media-fonts/ipaex/ipaex-002.01.ebuild19
-rw-r--r--media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild4
-rw-r--r--media-fonts/ja-ipafonts/Manifest1
-rw-r--r--media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild28
-rw-r--r--media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild13
-rw-r--r--media-fonts/ja-ipafonts/metadata.xml17
-rw-r--r--media-fonts/jetbrains-mono/Manifest3
-rw-r--r--media-fonts/jetbrains-mono/jetbrains-mono-2.001.ebuild19
-rw-r--r--media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild (renamed from media-fonts/jetbrains-mono/jetbrains-mono-2.210.ebuild)2
-rw-r--r--media-fonts/jetbrains-mono/metadata.xml4
-rw-r--r--media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild16
-rw-r--r--media-fonts/jomolhari/jomolhari-0.003c.ebuild10
-rw-r--r--media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild14
-rw-r--r--media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild16
-rw-r--r--media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild2
-rw-r--r--media-fonts/konfont/konfont-0.1.ebuild4
-rw-r--r--media-fonts/koruri/Manifest2
-rw-r--r--media-fonts/koruri/koruri-20180915.ebuild (renamed from media-fonts/koruri/koruri-20161105.ebuild)16
-rw-r--r--media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild4
-rw-r--r--media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild4
-rw-r--r--media-fonts/liberation-fonts/Manifest4
-rw-r--r--media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild6
-rw-r--r--media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild (renamed from media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild)11
-rw-r--r--media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild25
-rw-r--r--media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild15
-rw-r--r--media-fonts/lklug/lklug-0.6-r1.ebuild16
-rw-r--r--media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild16
-rw-r--r--media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild16
-rw-r--r--media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild16
-rw-r--r--media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild2
-rw-r--r--media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild16
-rw-r--r--media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild16
-rw-r--r--media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild16
-rw-r--r--media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild16
-rw-r--r--media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild17
-rw-r--r--media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild16
-rw-r--r--media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild16
-rw-r--r--media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild16
-rw-r--r--media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild16
-rw-r--r--media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild16
-rw-r--r--media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild4
-rw-r--r--media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild4
-rw-r--r--media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild4
-rw-r--r--media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild18
-rw-r--r--media-fonts/monafont/monafont-2.90-r2.ebuild20
-rw-r--r--media-fonts/monoid/monoid-0.61.ebuild10
-rw-r--r--media-fonts/montecarlo/montecarlo-0-r1.ebuild20
-rw-r--r--media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild25
-rw-r--r--media-fonts/mplus-outline-fonts/Manifest1
-rw-r--r--media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild45
-rw-r--r--media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild22
-rw-r--r--media-fonts/nanum/nanum-3.0.ebuild12
-rw-r--r--media-fonts/nanumfont/nanumfont-2.0-r2.ebuild16
-rw-r--r--media-fonts/noto-cjk/metadata.xml4
-rw-r--r--media-fonts/noto-cjk/noto-cjk-20190416.ebuild17
-rw-r--r--media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild2
-rw-r--r--media-fonts/noto-emoji/noto-emoji-20200916.ebuild2
-rw-r--r--media-fonts/noto-emoji/noto-emoji-20201214.ebuild4
-rw-r--r--media-fonts/noto/Manifest3
-rw-r--r--media-fonts/noto/noto-20190524.ebuild43
-rw-r--r--media-fonts/noto/noto-20201226.ebuild (renamed from media-fonts/noto/noto-20200308.ebuild)12
-rw-r--r--media-fonts/nunito/nunito-1.0-r1.ebuild12
-rw-r--r--media-fonts/nuosu-sil/Manifest2
-rw-r--r--media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild20
-rw-r--r--media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild20
-rw-r--r--media-fonts/ohsnap/ohsnap-1.8.0.ebuild10
-rw-r--r--media-fonts/oldstandard/oldstandard-2.2.ebuild12
-rw-r--r--media-fonts/open-sans/metadata.xml9
-rw-r--r--media-fonts/open-sans/open-sans-1-r1.ebuild13
-rw-r--r--media-fonts/open-sans/open-sans-1.ebuild19
-rw-r--r--media-fonts/opendesktop-fonts/metadata.xml17
-rw-r--r--media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild15
-rw-r--r--media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild26
-rw-r--r--media-fonts/paratype-astra/paratype-astra-1001.ebuild11
-rw-r--r--media-fonts/paratype/paratype-2.5.ebuild13
-rw-r--r--media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild4
-rw-r--r--media-fonts/pigiarniq/pigiarniq-2.ebuild10
-rw-r--r--media-fonts/polarsys-b612-fonts/metadata.xml4
-rw-r--r--media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003-r1.ebuild (renamed from media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild)7
-rw-r--r--media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008-r1.ebuild (renamed from media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild)9
-rw-r--r--media-fonts/pothana2k/pothana2k-2006-r1.ebuild5
-rw-r--r--media-fonts/powerline-symbols/Manifest1
-rw-r--r--media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild20
-rw-r--r--media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild13
-rw-r--r--media-fonts/qomolangma/qomolangma-2012.05.ebuild10
-rw-r--r--media-fonts/quivira/Manifest5
-rw-r--r--media-fonts/quivira/quivira-4.0.ebuild35
-rw-r--r--media-fonts/quivira/quivira-4.1.ebuild12
-rw-r--r--media-fonts/ricty/ricty-3.2.0-r2.ebuild23
-rw-r--r--media-fonts/roboto/roboto-2.138.ebuild15
-rw-r--r--media-fonts/sazanami/sazanami-20040629.ebuild2
-rw-r--r--media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild4
-rw-r--r--media-fonts/shinonome/shinonome-0.9.11.ebuild4
-rw-r--r--media-fonts/signika/signika-1.001.ebuild7
-rw-r--r--media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild13
-rw-r--r--media-fonts/sil-arabicfonts/Manifest2
-rw-r--r--media-fonts/sil-arabicfonts/metadata.xml41
-rw-r--r--media-fonts/sil-arabicfonts/sil-arabicfonts-3.000.ebuild (renamed from media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild)16
-rw-r--r--media-fonts/sil-charis/sil-charis-5.000-r1.ebuild26
-rw-r--r--media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild23
-rw-r--r--media-fonts/sil-ezra/sil-ezra-2.51.ebuild4
-rw-r--r--media-fonts/sil-galatia/sil-galatia-2.1.ebuild4
-rw-r--r--media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild22
-rw-r--r--media-fonts/sil-padauk/Manifest1
-rw-r--r--media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild16
-rw-r--r--media-fonts/sil-padauk/sil-padauk-4.000.ebuild21
-rw-r--r--media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild17
-rw-r--r--media-fonts/source-han-sans/Manifest4
-rw-r--r--media-fonts/source-han-sans/metadata.xml15
-rw-r--r--media-fonts/source-han-sans/source-han-sans-1.001.ebuild34
-rw-r--r--media-fonts/source-han-sans/source-han-sans-1.004.ebuild13
-rw-r--r--media-fonts/source-pro/Manifest6
-rw-r--r--media-fonts/source-pro/source-pro-20141211.ebuild42
-rw-r--r--media-fonts/source-pro/source-pro-20160608.ebuild43
-rw-r--r--media-fonts/source-pro/source-pro-20170111.ebuild17
-rw-r--r--media-fonts/stix-fonts/Manifest5
-rw-r--r--media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild24
-rw-r--r--media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild27
-rw-r--r--media-fonts/stix-fonts/stix-fonts-2.11.ebuild36
-rw-r--r--media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild4
-rw-r--r--media-fonts/terminus-font/Manifest1
-rw-r--r--media-fonts/terminus-font/terminus-font-4.48-r2.ebuild128
-rw-r--r--media-fonts/terminus-font/terminus-font-4.49.ebuild4
-rw-r--r--media-fonts/termsyn/termsyn-1.8.7.ebuild7
-rw-r--r--media-fonts/tex-gyre/Manifest1
-rw-r--r--media-fonts/tex-gyre/tex-gyre-2.005.ebuild18
-rw-r--r--media-fonts/tex-gyre/tex-gyre-2.501.ebuild4
-rw-r--r--media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild4
-rw-r--r--media-fonts/thaifonts-scalable/Manifest2
-rw-r--r--media-fonts/thaifonts-scalable/metadata.xml9
-rw-r--r--media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild43
-rw-r--r--media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild40
-rw-r--r--media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild2
-rw-r--r--media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild17
-rw-r--r--media-fonts/umeplus-fonts/Manifest2
-rw-r--r--media-fonts/umeplus-fonts/metadata.xml3
-rw-r--r--media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild (renamed from media-fonts/umeplus-fonts/umeplus-fonts-20160402.ebuild)8
-rw-r--r--media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild4
-rw-r--r--media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild4
-rw-r--r--media-fonts/unifont/Manifest1
-rw-r--r--media-fonts/unifont/files/10.0.06-make.patch26
-rw-r--r--media-fonts/unifont/metadata.xml4
-rw-r--r--media-fonts/unifont/unifont-10.0.06.ebuild65
-rw-r--r--media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild2
-rw-r--r--media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild23
-rw-r--r--media-fonts/viga/viga-1.ebuild7
-rw-r--r--media-fonts/vlgothic/vlgothic-20141206.ebuild4
-rw-r--r--media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild24
-rw-r--r--media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild30
-rw-r--r--media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch4
-rw-r--r--media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild24
-rw-r--r--media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild33
-rw-r--r--media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild14
-rw-r--r--media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild4
294 files changed, 1823 insertions, 2515 deletions
diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
index a840cf3146d..dd9c650af00 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A sanserif typeface in the style of xkcd"
+DESCRIPTION="Sans-serif typeface in the style of xkcd"
HOMEPAGE="http://antiyawn.com/uploads/humorsans.html"
SRC_URI="http://www.antiyawn.com/uploads/${P}.ttf"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}"
-
-FONT_S="${S}"
FONT_SUFFIX="ttf"
src_unpack() {
- cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}" || die
+ cp "${DISTDIR}/${A}" "${S}/${PN}.${FONT_SUFFIX}" || die
}
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index 15a01a677fe..0f83e01f8c1 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>bertrand@jacquin.bzh</email>
<name>Bertrand Jacquin</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/ahem/ahem-1.0.ebuild b/media-fonts/ahem/ahem-1.0.ebuild
index 096fbd9cf5b..a896e7c135b 100644
--- a/media-fonts/ahem/ahem-1.0.ebuild
+++ b/media-fonts/ahem/ahem-1.0.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A font developed to help test writers develop predictable tests"
+DESCRIPTION="Font to help test writers develop predictable tests"
HOMEPAGE="https://github.com/Kozea/Ahem"
SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/a/A}"
LICENSE="CC0-1.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
-
-S="${WORKDIR}/${P/a/A}"
-FONT_S=${S}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 09e726335aa..fa62324e3d6 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A Lee's Hangul truetype fonts"
+DESCRIPTION="Lee's Hangul truetype fonts"
HOMEPAGE="https://screenshots.debian.net/package/ttf-alee"
SRC_URI="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
+S="${WORKDIR}/ttf-alee-${PV}"
LICENSE="Artistic"
SLOT="0"
@@ -15,6 +16,3 @@ KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-li
IUSE=""
FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/ttf-alee-${PV}"
-
-S=${FONT_S}
diff --git a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
index 8693611571b..fb4ddf45dcb 100644
--- a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
+++ b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="Alegreya-Sans"
inherit font
-DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
+DESCRIPTION="Humanist sans-serif typeface with a calligraphic, dynamic feeling"
HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-sans-ht"
SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
+DOCS=( CONTRIBUTORS.txt README.md )
+
FONT_S="${S}/fonts/ttf"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/alegreya-serif/Manifest b/media-fonts/alegreya-serif/Manifest
index cb9f507a458..8483c8e1cba 100644
--- a/media-fonts/alegreya-serif/Manifest
+++ b/media-fonts/alegreya-serif/Manifest
@@ -1,2 +1 @@
-DIST alegreya-serif-2.007.tar.gz 14729050 BLAKE2B ccf4dd3827e6b3c32b1009de273723a2bd63aee992710676b20ef3a0dbb17a5608046d7d5955d5d38a6a11a4268ffb0985f5fb8044239de5a42ab5b5fd06efb3 SHA512 7220aaf9f9861ed4f3104aeb16f33267b5cc2139b91ddafbd7ff86f94faeb37bca558c642a03108094d0a60f9db77167c19996fdaeeca3fcac0346205ba4e785
DIST alegreya-serif-2.008.tar.gz 14982944 BLAKE2B 1a8261d987bb7f2c24b5edf1b5e220909e8596634df03c86646742bca6445802b053f850430e98581d2ef2b02b68bf9a1a2d9b7f54dcf28775232c7147d9223d SHA512 ca4b9e7ccdd1568e841bb7bda60d184776ca36266567eef1fdf9ae44f7c688474bd91df93a8a3f59c45e22c02fc7e231bd6bfd0b5763932df8b0f933cdb127e8
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
deleted file mode 100644
index 84a71f8e333..00000000000
--- a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Alegreya"
-inherit font
-
-DESCRIPTION="Alegreya serif type family"
-HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
-SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}/fonts/otf"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
index b975cc926d2..248fe18c98c 100644
--- a/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
+++ b/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="Alegreya"
inherit font
@@ -9,13 +9,14 @@ inherit font
DESCRIPTION="Alegreya serif type family"
HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
+DOCS=( CONTRIBUTORS.txt README.md )
+
FONT_S="${S}/fonts/otf"
FONT_SUFFIX="otf"
diff --git a/media-fonts/andika/andika-5.000.ebuild b/media-fonts/andika/andika-5.000.ebuild
index 36050f219a0..365b6af119a 100644
--- a/media-fonts/andika/andika-5.000.ebuild
+++ b/media-fonts/andika/andika-5.000.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Sans-serif font designed for literacy use"
-HOMEPAGE="http://scripts.sil.org/Andika"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Andika-${PV}.zip&filename=Andika-${PV}.zip -> ${P}.zip"
+HOMEPAGE="https://software.sil.org/andika/"
+SRC_URI="https://software.sil.org/downloads/r/${PN}/${P^}.zip -> ${P}.zip"
+S="${WORKDIR}/${P^}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 x86"
IUSE=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S="${WORKDIR}/Andika-${PV}"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
-DOCS="documentation/* OFL-FAQ.txt"
+
+DOCS=( documentation/{Andika-features.{odt,pdf},DOCUMENTATION.txt} OFL-FAQ.txt )
diff --git a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
index 1f1a6c073c1..d264c3fcc58 100644
--- a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
+++ b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
+MY_P="AnonymousPro-${PV}"
inherit font
-MY_PN="AnonymousPro"
-MY_P="${MY_PN}-${PV}"
DESCRIPTION="Monospaced truetype font designed with coding in mind"
HOMEPAGE="https://www.marksimonson.com/fonts/view/anonymous-pro"
SRC_URI="https://www.marksimonson.com/assets/content/fonts/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}.001"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
IUSE=""
-DEPEND="app-arch/unzip"
RESTRICT="binchecks strip"
-S="${WORKDIR}/${MY_P}.001"
-FONT_S="${S}"
+BDEPEND="app-arch/unzip"
+
FONT_SUFFIX="ttf"
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index cc2a5116ca4..1f85f7b6a17 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.geocities.jp/teardrops_in_aquablue/fnt/${MY_P}.zip"
LICENSE="aquafont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="X"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index a03a0952e0a..c4f6b055f11 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
LICENSE="aquafont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
index 817c60059d8..5791ca8f0da 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit font
+EAPI=7
MY_PN="ae_fonts"
-S="${WORKDIR}"/${MY_PN}_${PV}
+inherit font
DESCRIPTION="Arabeyes Arabic TrueType fonts"
HOMEPAGE="https://www.arabeyes.org/Khotot#2.0"
SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
-LICENSE="GPL-2"
+S="${WORKDIR}/${MY_PN}_${PV}"
+LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~s390 sparc x86"
-FONT_SUFFIX="ttf"
+DOCS=( README ChangeLog )
-DOCS="README ChangeLog"
+FONT_SUFFIX="ttf"
src_install() {
local d
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index b0906c702d8..b8405ba6368 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit font
+EAPI=7
MY_P="ttf-${P}"
-S="${WORKDIR}/${MY_P}"
+inherit font
-DESCRIPTION="Arkpandora MS-TTF replacement font pack"
+DESCRIPTION="Replacement fonts for Microsoft's Arial, Times, and Verdana fonts"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" # upstream vanished
SRC_URI="mirror://gentoo/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
IUSE=""
-FONT_S="${S}"
+DOCS=( CHANGELOG.TXT local.conf.arkpandora )
+
FONT_SUFFIX="ttf"
-DOCS="CHANGELOG.TXT local.conf.arkpandora"
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index e2f80f9e5cd..80e59d5e619 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils font xdg-utils
+EAPI=7
+
+inherit font xdg-utils
DESCRIPTION="Chinese TrueType Arphic Fonts"
HOMEPAGE="http://www.arphic.com.tw/
@@ -13,67 +14,65 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz
mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_${PV}.orig.tar.gz
mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_${PV}.orig.tar.gz"
+S="${WORKDIR}"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="media-gfx/fontforge"
+# No binaries, only fonts
+RESTRICT="strip binchecks"
-S="${WORKDIR}"
+BDEPEND="media-gfx/fontforge"
-#No binaries, only fonts
-RESTRICT="strip binchecks"
+PATCHES=( "${FILESDIR}"/${P}-fontconfig.patch )
-FONT_S="${S}"
+FONT_CONF=(
+ ukai/25-ttf-arphic-ukai-render.conf
+ ukai/35-ttf-arphic-ukai-aliases.conf
+ ukai/41-ttf-arphic-ukai.conf
+ ukai/75-ttf-arphic-ukai-select.conf
+ ukai/90-ttf-arphic-ukai-embolden.conf
+ uming/25-ttf-arphic-uming-bitmaps.conf
+ uming/25-ttf-arphic-uming-render.conf
+ uming/35-ttf-arphic-uming-aliases.conf
+ uming/41-ttf-arphic-uming.conf
+ uming/64-ttf-arphic-uming.conf
+ uming/90-ttf-arphic-uming-embolden.conf
+)
FONT_SUFFIX="ttc ttf"
-FONT_CONF=( "25-ttf-arphic-ukai-render.conf"
- "35-ttf-arphic-ukai-aliases.conf"
- "41-ttf-arphic-ukai.conf"
- "75-ttf-arphic-ukai-select.conf"
- "90-ttf-arphic-ukai-embolden.conf"
- "25-ttf-arphic-uming-bitmaps.conf"
- "25-ttf-arphic-uming-render.conf"
- "35-ttf-arphic-uming-aliases.conf"
- "41-ttf-arphic-uming.conf"
- "64-ttf-arphic-uming.conf"
- "90-ttf-arphic-uming-embolden.conf" )
+# ensure that we don't overwrite one font's docs with another's
src_unpack() {
- #All of this is to ensure that we don't overwrite one font's docs
- #with another's.
-
unpack {gk,bk}ai00mp.ttf.gz {bsmi,gbsn}00lp.ttf.gz
- mkdir "${WORKDIR}"/{uming,ukai}
-
- cd "${WORKDIR}"/uming
- unpack ttf-arphic-uming_${PV}.orig.tar.gz
- cd "${WORKDIR}"/ukai
- unpack ttf-arphic-ukai_${PV}.orig.tar.gz
+ do_unpack() {
+ mkdir ${1} || die
+ pushd ${1} > /dev/null || die
+ unpack ttf-arphic-${1}_${PV}.orig.tar.gz
+ popd > /dev/null || die
+ mv ${1}/${1}.ttc . || die
+ }
+ do_unpack ukai
+ do_unpack uming
}
src_prepare() {
- cd "${WORKDIR}"
- find "${WORKDIR}" -mindepth 2 -maxdepth 2 -name '*.ttc' -exec mv {} . \;
- find "${WORKDIR}" -name '*.conf' -exec mv "{}" . \;
- epatch "${FILESDIR}"/${P}-fontconfig.patch
+ default
xdg_environment_reset
fontforge -script "${FILESDIR}"/${P}.pe b*.ttf || die
}
src_install() {
- local myfont doc
- for myfont in ukai uming
- do
- cd "${WORKDIR}"/${myfont}
- docinto ${myfont}
+ font_src_install
+
+ do_doc() {
for doc in FONTLOG KNOWN_ISSUES TODO README README.Bitmap NEWS CONTRIBUTERS
do
- [ -f ${doc} ] && dodoc ${doc}
+ [[ -f ${1}/${doc} ]] && newdoc ${1}/${doc} ${1}.${doc}
done
- done
- cd "${S}"
- font_src_install
+ }
+ do_doc ukai
+ do_doc uming
}
diff --git a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
index 5c5738a3bdf..1f984f28e2c 100644
--- a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
+++ b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
@@ -1,5 +1,5 @@
---- a/41-ttf-arphic-ukai.conf
-+++ b/41-ttf-arphic-ukai.conf
+--- a/ukai/41-ttf-arphic-ukai.conf
++++ b/ukai/41-ttf-arphic-ukai.conf
@@ -5,13 +5,28 @@
<!--
Sans-serif faces
@@ -38,8 +38,8 @@
+ <default><family>sans-serif</family></default>
+ </alias>
</fontconfig>
---- a/41-ttf-arphic-uming.conf
-+++ b/41-ttf-arphic-uming.conf
+--- a/uming/41-ttf-arphic-uming.conf
++++ b/uming/41-ttf-arphic-uming.conf
@@ -7,10 +7,25 @@
-->
<alias>
@@ -120,8 +120,8 @@
<family>AR PL UMing TW MBE</family>
<default><family>monospace</family></default>
</alias>
---- a/25-ttf-arphic-uming-bitmaps.conf
-+++ b/25-ttf-arphic-uming-bitmaps.conf
+--- a/uming/25-ttf-arphic-uming-bitmaps.conf
++++ b/uming/25-ttf-arphic-uming-bitmaps.conf
@@ -5,25 +5,65 @@
<match target="font">
<test name="family">
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index dbf0cfa2b15..20fa21bab7a 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwizaleczapka/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
DOCS="AUTHORS BUGS ChangeLog NEWS README VERSION"
FONT_SUFFIX="pcf"
diff --git a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
index 59351d420af..e5bcdf2df8b 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwiz-latin1/${P}.tgz"
LICENSE="GPL-2"
SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
S="${WORKDIR}/${PN}"
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 67486d2aa09..ff3f555b193 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -1,38 +1,36 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-
-inherit font font-ebdftopcf
+EAPI=7
BDF_P="${P/fonts/bdf}"
TTF_P="${P/fonts/ttf}"
UNI_P="${PN/fonts/unicode-bdf}-20020418"
+inherit font font-ebdftopcf
DESCRIPTION="Korean Baekmuk Font"
-HOMEPAGE="http://kldp.net/baekmuk/"
-SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
- http://kldp.net/${PN/-*}/release/865-${TTF_P}.tar.gz -> ${TTF_P}.tar.gz
+HOMEPAGE="https://kldp.net/baekmuk/"
+SRC_URI="https://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
+ https://kldp.net/${PN/-*}/release/865-${TTF_P}.tar.gz -> ${TTF_P}.tar.gz
unicode? ( mirror://gentoo/${UNI_P}.tar.bz2 )"
+S="${WORKDIR}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="unicode"
RESTRICT="binchecks strip"
-S="${WORKDIR}"
-
src_unpack() {
unpack ${BDF_P}.tar.gz ${TTF_P}.tar.gz
if use unicode; then
- cd "${WORKDIR}"/${BDF_P}/bdf
+ cd ${BDF_P}/bdf || die
unpack ${UNI_P}.tar.bz2
fi
}
src_compile() {
- cd ${BDF_P}/bdf
+ cd ${BDF_P}/bdf || die
font-ebdftopcf_src_compile
}
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
index dd46e6e5976..dced0c4d5d1 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Cyberbit Unicode (including CJK) font"
HOMEPAGE="http://www.bitstream.com/"
-SRC_URI="http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> ${P}.zip https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip"
-LICENSE="BitstreamCyberbit"
+SRC_URI="http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> ${P}.zip
+ https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip
+ http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip"
+S="${WORKDIR}"
+LICENSE="BitstreamCyberbit"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
RESTRICT="bindist mirror"
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
+
FONT_SUFFIX="ttf"
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index cba03ef1d20..39acfb053f4 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,3 +1 @@
-DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
-DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
deleted file mode 100644
index 88be417fd97..00000000000
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org meson
-
-DESCRIPTION="Default fontset for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-# appstream-glib provided .loc and .its files required by gettext msgfmt for translation of .metainfo.xml
-DEPEND="
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
-FONT_S="${S}/prebuilt"
-FONT_SUFFIX="otf"
-
-src_prepare() {
- # Leave prebuilt font installation to font.eclass
- sed -e "/subdir('prebuilt')/d" -i meson.build || die
-
- default
-}
-
-src_configure() {
- local emesonargs=(
- -Dfontsdir=${FONTDIR}
- -Duseprebuilt=true
- -Dbuildappstream=true
- )
- meson_src_configure
-}
-
-src_install() {
- local DOCS=( NEWS README.md )
- meson_src_install
- font_src_install
-}
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
deleted file mode 100644
index ff27a99bd65..00000000000
--- a/media-fonts/cantarell/cantarell-0.201.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org meson
-
-DESCRIPTION="Default fontset for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="
- >=sys-devel/gettext-0.20
- virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_S="${S}/prebuilt"
-FONT_SUFFIX="otf"
-
-src_prepare() {
- # Leave prebuilt font installation to font.eclass
- sed -e "/subdir('prebuilt')/d" -i meson.build || die
-
- default
-}
-
-src_configure() {
- local emesonargs=(
- -Dfontsdir=${FONTDIR}
- -Duseprebuilt=true
- -Dbuildappstream=true
- )
- meson_src_configure
-}
-
-src_install() {
- font_src_install
- local DOCS=( NEWS README.md )
- meson_src_install
-}
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
index bb9863617ad..6b6e1bf355b 100644
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ b/media-fonts/cantarell/cantarell-0.301.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index ede503121eb..c4695b04e27 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1 +1 @@
-DIST cascadia-code-2009.22.zip 8217333 BLAKE2B 0c3e4cb95cae4869c911ea93e16b496e249778150fc208a04c392cd6321245e2de822953ed79346201e73dd8ad3359f6ec99b3f156f33b49b9f698413d5be568 SHA512 3ddc0b243b10fa36ffb89d7f63cce50b39bdc6b263ab124c9c34840eb7e775fc84366dffc1785b3b5cd48b1fda045f5f90d8e0301ffac754a0b7b9d8063b3d04
+DIST cascadia-code-2102.25.zip 8666729 BLAKE2B 86e11e003fcad686f0ad9ee38af488447fd0a6c95b0f9a89e945ca173c44385af0090a50e26b355ea8019c7e33ca45edcdfa7cfddcc0734fe224c96c8d941acf SHA512 4b0b1168bf3f1adbff362ed2d7fa1f548643e5c9506866e12dc26aefb8e807b7515e0c49705f03faf1a44c037d414ba3ab3f2189d29491711d6e802035914002
diff --git a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
index ac79209160a..3726a28cc6c 100644
--- a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
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"
-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"
diff --git a/media-fonts/cascadia-code/metadata.xml b/media-fonts/cascadia-code/metadata.xml
index 6e92b8e773c..cda11dbe595 100644
--- a/media-fonts/cascadia-code/metadata.xml
+++ b/media-fonts/cascadia-code/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>gentoo@taujhe.de</email>
<name>Jan Henke</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index d7cee7c5e45..28a1b84e1d0 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
index d8195af05a1..dcf5264b489 100644
--- a/media-fonts/clearsans/clearsans-1.00.ebuild
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="OpenType font optimized for readability on small screens"
HOMEPAGE="https://01.org/clear-sans"
SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/${P}.zip"
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
+
RESTRICT="binchecks strip"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
FONT_S="${S}/TTF"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild b/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
index 07bd331d58f..32d10001d69 100644
--- a/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
+++ b/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Computer Modern Unicode fonts"
-HOMEPAGE="http://cm-unicode.sourceforge.net/"
+HOMEPAGE="https://cm-unicode.sourceforge.io/"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-ttf.tar.xz"
LICENSE="OFL-1.1"
@@ -14,5 +14,6 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
+DOCS=( Changes FAQ FontLog.txt README )
+
FONT_SUFFIX="ttf"
-DOCS="Changes FAQ FontLog.txt README"
diff --git a/media-fonts/comic-neue/Manifest b/media-fonts/comic-neue/Manifest
index f51f71b5e75..4ab2cc629b9 100644
--- a/media-fonts/comic-neue/Manifest
+++ b/media-fonts/comic-neue/Manifest
@@ -1,2 +1 @@
-DIST comic-neue-2.2.zip 1547231 BLAKE2B 3c28d2ada0c9c634084b67694b83ae765594d7e732c870bf6db538967b922146863b023e5bf1407b08f8e9f77b264d867175fe5dbfe1f6a7e53a6fcc2e83f16d SHA512 4c13a764a8a5f1fb23bfb47b1840249286fded918d243227d360ae8005165de2e0e02cafca59a82a306129689d67347950d47ad5d8ae49bb165c0d4a18bd2d91
DIST comic-neue-2.3.zip 2093174 BLAKE2B 80b345e3c61839d1abb803cc8a97d3b03bdf906408a9eb96aafed9e67d3b0f4a99ed82adef528b7fa4eecf9e1c2443efbedc32ba8c08e5731cd3ad180bdf3aa7 SHA512 37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5
diff --git a/media-fonts/comic-neue/comic-neue-2.2.ebuild b/media-fonts/comic-neue/comic-neue-2.2.ebuild
deleted file mode 100644
index 8b38ba34365..00000000000
--- a/media-fonts/comic-neue/comic-neue-2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Typographically savvy casual script typeface"
-HOMEPAGE="http://comicneue.com/"
-SRC_URI="http://comicneue.com/${P}.zip"
-
-LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-
-FONT_SUFFIX="otf"
-FONT_S=${S}/OTF
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 07fbb94be27..0361c1b3ed9 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -1,23 +1,20 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
DESCRIPTION="Typographically savvy casual script typeface"
HOMEPAGE="http://comicneue.com"
SRC_URI="http://comicneue.com/${P}.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
SLOT="0"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
FONT_SUFFIX="otf"
FONT_S=${S}/OTF
-
-src_unpack() {
- mkdir "${S}" && cd "${S}"
- unpack ${A}
-}
diff --git a/media-fonts/comic-neue/metadata.xml b/media-fonts/comic-neue/metadata.xml
index d0f1df7c94c..8b3b4d92532 100644
--- a/media-fonts/comic-neue/metadata.xml
+++ b/media-fonts/comic-neue/metadata.xml
@@ -1,8 +1,9 @@
<?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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 3ccd868ec99..19b38d3077f 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Microsoft's TrueType core fonts"
@@ -15,16 +16,15 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
mirror://sourceforge/corefonts/impact32.exe
mirror://sourceforge/corefonts/webdin32.exe
mirror://sourceforge/corefonts/wd97vwr32.exe"
+S="${WORKDIR}"
LICENSE="MSttfEULA"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X tahoma"
-DEPEND="app-arch/cabextract"
+BDEPEND="app-arch/cabextract"
-S=${WORKDIR}
-FONT_S=${WORKDIR}
FONT_SUFFIX="ttf"
src_unpack() {
diff --git a/media-fonts/courier-prime/courier-prime-1.203.ebuild b/media-fonts/courier-prime/courier-prime-1.203.ebuild
index 7ca9a8d859d..65e14708520 100644
--- a/media-fonts/courier-prime/courier-prime-1.203.ebuild
+++ b/media-fonts/courier-prime/courier-prime-1.203.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="A redesign of Courier"
+DESCRIPTION="Redesign of Courier"
HOMEPAGE="https://www.quoteunquoteapps.com/courierprime/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
@@ -12,5 +13,6 @@ LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
+DOCS=( README-CourierPrime.txt README-CourierPrimeSans.txt README-CourierPrimeSource.txt )
+
FONT_SUFFIX="ttf"
-DOCS="README-CourierPrime.txt README-CourierPrimeSans.txt README-CourierPrimeSource.txt"
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index 7a8bfebf723..4e67ad4061d 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
S="${WORKDIR}/${MY_P//_/-}.orig"
diff --git a/media-fonts/croscorefonts/Manifest b/media-fonts/croscorefonts/Manifest
index a9114ab1cb4..bd9d68df01e 100644
--- a/media-fonts/croscorefonts/Manifest
+++ b/media-fonts/croscorefonts/Manifest
@@ -1,2 +1 @@
-DIST croscorefonts-1.23.0.tar.gz 2696327 BLAKE2B 915ce0e294fbab5687c3021912985e2806f066684a16b68f41a04fdd66ba2a3af494f62ab548cee48a734891faf59b19aa5d9e33a56f41d99e00f2a58717d7d4 SHA512 069444d57a59bd21d5b30c4b9d32a0e7b649126b2f1d10d992155c08adefb1d30119deda7818e388bb184aadb3f8dd20ee0f26c9d14b3e53bfda7fd682acf3d5
DIST croscorefonts-1.31.0.tar.bz2 3223864 BLAKE2B 4fc011557f81c19d4bc79f014c438868d2a63fe8932140a51523fe582a62a07ee1e51799bb3b13cb801a6ac0af72f23abade4cacccbc4adb3523f3a8d440ea8d SHA512 dcd5ebb854f78353a1d91bb74a5ac7b5e237040994c7e2a69cf68511f06b10006fc3a490840d48c12ee7f862d2dfa3106c9e1787a726a4b158eaea5cd5ba8842
diff --git a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
deleted file mode 100644
index 04735a01288..00000000000
--- a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Arimo
- https://www.google.com/webfonts/specimen/Cousine
- https://www.google.com/webfonts/specimen/Tinos"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-RESTRICT="binchecks strip test"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
- "${FILESDIR}/62-croscore-arimo.conf"
- "${FILESDIR}/62-croscore-cousine.conf"
- "${FILESDIR}/62-croscore-symbolneu.conf"
- "${FILESDIR}/62-croscore-tinos.conf" )
diff --git a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
index 60efcf5cf45..a0689b4926c 100644
--- a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
+++ b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts"
HOMEPAGE="https://www.google.com/webfonts/specimen/Arimo
https://www.google.com/webfonts/specimen/Cousine
https://www.google.com/webfonts/specimen/Tinos"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
RESTRICT="binchecks strip test"
-FONT_SUFFIX="ttf"
FONT_CONF=(
"${FILESDIR}/62-croscore-arimo.conf"
"${FILESDIR}/62-croscore-cousine.conf"
"${FILESDIR}/62-croscore-symbolneu.conf"
- "${FILESDIR}/62-croscore-tinos.conf" )
+ "${FILESDIR}/62-croscore-tinos.conf"
+)
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
index 14028bd0bb9..43739eac52b 100644
--- a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
+++ b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+MY_P=${P/-caladea/}
inherit font
-MY_P=${P/-caladea/}
DESCRIPTION="Open licensed serif font metrically compatible with Cambria"
HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=168879"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="0"
@@ -17,6 +18,5 @@ IUSE=""
RESTRICT="binchecks strip test"
-S="${WORKDIR}/${MY_P}"
-FONT_SUFFIX="ttf"
FONT_CONF=( "${FILESDIR}"/62-crosextra-caladea.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
index 3b4bc45916f..37dbf0c56ab 100644
--- a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
+++ b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Open licensed sans-serif font metrically compatible with Calibri"
-HOMEPAGE="http://code.google.com/p/chromium/issues/detail?id=280557"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
+HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=280557"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
LICENSE="OFL"
SLOT="0"
@@ -16,5 +16,5 @@ IUSE=""
RESTRICT="binchecks strip test"
-FONT_SUFFIX="ttf"
FONT_CONF=( "${FILESDIR}"/62-crosextra-carlito.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r6.ebuild
index 95a55a83564..6d0109d856b 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit font
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
+S="${WORKDIR}"
# Some fonts are available in otf format too. Do we need them?
# http://culmus.sourceforge.net/fancy/anka-otf.zip
@@ -36,19 +37,18 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ancient fancy fontforge taamey"
-FONT_CONF=( "${T}/65-culmus.conf" )
-
RDEPEND="!media-fonts/culmus-ancient"
# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
-DEPEND="${RDEPEND}
+BDEPEND="
app-arch/unzip
>=x11-apps/mkfontscale-1.0.9-r1
- fontforge? ( media-gfx/fontforge )"
+ fontforge? ( media-gfx/fontforge )
+"
-S=${WORKDIR}
+FONT_CONF=( "${T}/65-culmus.conf" )
# Put all fonts, generated or not here
FONT_S=${S}/FONTS
@@ -62,15 +62,15 @@ src_unpack() {
if use fancy; then
unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
- mv TTF/* .
+ mv TTF/* . || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- mkdir ${font}
- pushd ${font}
+ mkdir ${font} || die
+ pushd ${font} || die
unpack ${font}.zip
- popd >/dev/null
+ popd >/dev/null || die
done
fi
}
@@ -83,65 +83,88 @@ src_prepare() {
src_compile() {
mkdir -p "${FONT_S}"
if use fontforge; then
- pushd ${P}
- mv *.afm *.pfa "${FONT_S}"
- rm *.ttf
- popd >/dev/null
+ pushd ${P} || die
+
+ mv *.afm *.pfa "${FONT_S}" || die
+ rm *.ttf || die
+
+ popd >/dev/null || die
+
+ pushd ${PN}-type1-${TYPE1_PV} || die
+
+ mv *.afm *.pfa "${FONT_S}" || die
+
+ popd >/dev/null || die
- pushd ${PN}-type1-${TYPE1_PV}
- mv *.afm *.pfa "${FONT_S}"
- popd >/dev/null
+ pushd ${PN}-src-${PV} || die
- pushd ${PN}-src-${PV}
for f in *.sfd; do
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
done
- popd >/dev/null
+
+ popd >/dev/null || die
if use ancient; then
- pushd ${MY_A_P}/src
+ pushd ${MY_A_P}/src || die
+
export FONTFORGE_LANGUAGE=ff
- make clean
- make all || die "Failed to build fonts"
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+
+ emake clean
+ emake all
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd >/dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- rm -rf ${font}/TTF
- pushd ${font}/SFD
+ rm -rf ${font}/TTF || die
+
+ pushd ${font}/SFD || die
+
for f in *.sfd; do
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
done
- popd >/dev/null
+
+ popd >/dev/null || die
done
fi
else
- pushd ${P}
- mv *.afm *.pfa *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${P} || die
- pushd ${PN}-type1-${TYPE1_PV}
- mv *.afm *.pfa "${FONT_S}"
- popd >/dev/null
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die
+
+ popd >/dev/null || die
+
+ pushd ${PN}-type1-${TYPE1_PV} || die
+
+ mv *.afm *.pfa "${FONT_S}" || die
+
+ popd >/dev/null || die
if use ancient; then
- pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts || die
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd >/dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- pushd ${font}/TTF
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${font}/TTF || die
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd >/dev/null || die
done
fi
fi
- use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
+ if use fancy; then
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die
+ fi
}
src_install() {
@@ -150,31 +173,37 @@ src_install() {
FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
font_src_install
- rm -rf "${FONT_S}"
+ rm -rf "${FONT_S}" || die
find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
while read font; do
- ewarn "QA: missed font file: ${font}"
+ eqawarn "Missed font file: ${font}"
done
- pushd ${PN}$(use fontforge && echo -src)-${PV}
+ pushd ${PN}$(use fontforge && echo -src)-${PV} || die
+
dodoc CHANGES
- popd >/dev/null
+
+ popd >/dev/null || die
if use ancient; then
- pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
- newdoc CHANGES{,.ancient} || die
- newdoc README{,.ancient} || die
- popd >/dev/null
+ pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" || die
+
+ newdoc CHANGES{,.ancient}
+ newdoc README{,.ancient}
+
+ popd >/dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- pushd ${font}
- [[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
- newdoc README{,.${font}} || die
- insinto /usr/share/doc/${PF}/${font}
- doins -r Samples
- popd >/dev/null
+ pushd ${font} || die
+
+ [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+ newdoc README{,.${font}}
+ docinto ${font}
+ dodoc -r Samples
+
+ popd >/dev/null || die
done
fi
}
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild
index 9d57b2ead28..1c2c789c19f 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit font
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
+S="${WORKDIR}"
# Some fonts are available in otf format too. Do we need them?
# http://culmus.sourceforge.net/fancy/anka-otf.zip
@@ -36,112 +37,136 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ancient fancy fontforge taamey"
-FONT_CONF=( "${T}/65-culmus.conf" )
-
RDEPEND="!media-fonts/culmus-ancient"
# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
-DEPEND="${RDEPEND}
+BDEPEND="
app-arch/unzip
>=x11-apps/mkfontscale-1.0.9-r1
- fontforge? ( media-gfx/fontforge )"
+ fontforge? ( media-gfx/fontforge )
+"
-S=${WORKDIR}
+FONT_CONF=( "${T}"/65-culmus.conf )
# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
+FONT_S="${S}/FONTS"
+
+PATCHES=( "${FILESDIR}/${P}-fontconfig-test.patch" ) # bug 695708
src_unpack() {
unpack ${P}.tar.gz # For type1 fonts...
unpack ${PN}-type1-${TYPE1_PV}.tar.gz
- use fontforge && unpack ${PN}-src-${PV}.tar.gz
- use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
+ use fontforge && unpack ${PN}-src-${PV}.tar.gz
+ use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz
if use fancy; then
unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
- mv TTF/* .
+ mv TTF/* . || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- mkdir ${font}
- pushd ${font}
+ mkdir ${font} || die
+
+ pushd ${font} > /dev/null || die
+
unpack ${font}.zip
- popd >/dev/null
+
+ popd > /dev/null || die
done
fi
}
src_prepare() {
default
- cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
+ cp "${P}"/culmus.conf "${T}"/65-culmus.conf || die
}
src_compile() {
- mkdir -p "${FONT_S}"
+ mkdir -p "${FONT_S}" || die
+
if use fontforge; then
- pushd ${P}
- mv *.afm *.pfa "${FONT_S}"
- rm *.ttf
- popd >/dev/null
+ pushd ${P} > /dev/null || die
- pushd ${PN}-type1-${TYPE1_PV}
- mv *.afm *.pfa "${FONT_S}"
- popd >/dev/null
+ mv *.afm *.pfa "${FONT_S}" || die
+ rm *.ttf || die
+
+ popd > /dev/null || die
+
+ pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
+
+ mv *.afm *.pfa "${FONT_S}" || die
+
+ popd > /dev/null || die
+
+ pushd ${PN}-src-${PV} > /dev/null || die
- pushd ${PN}-src-${PV}
for f in *.sfd; do
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
done
- popd >/dev/null
+
+ popd > /dev/null || die
if use ancient; then
- pushd ${MY_A_P}/src
+ pushd ${MY_A_P}/src > /dev/null || die
+
export FONTFORGE_LANGUAGE=ff
- make clean
- make all || die "Failed to build fonts"
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+
+ emake clean
+ emake all
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd > /dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- rm -rf ${font}/TTF
- pushd ${font}/SFD
+ rm -rf ${font}/TTF || die
+
+ pushd ${font}/SFD > /dev/null || die
+
for f in *.sfd; do
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
done
- popd >/dev/null
+
+ popd > /dev/null || die
done
fi
else
- pushd ${P}
- mv *.afm *.pfa *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${P} > /dev/null || die
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die
+ popd >/dev/null || die
- pushd ${PN}-type1-${TYPE1_PV}
- mv *.afm *.pfa "${FONT_S}"
- popd >/dev/null
+ pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
+ mv *.afm *.pfa "${FONT_S}" || die
+ popd > /dev/null || die
if use ancient; then
- pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd > /dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- pushd ${font}/TTF
- mv *.ttf "${FONT_S}"
- popd >/dev/null
+ pushd ${font}/TTF > /dev/null || die
+
+ mv *.ttf "${FONT_S}" || die
+
+ popd > /dev/null || die
done
fi
fi
- use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
+ if use fancy; then
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die
+ fi
}
src_install() {
@@ -150,31 +175,35 @@ src_install() {
FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
font_src_install
- rm -rf "${FONT_S}"
+ rm -rf "${FONT_S}" || die
find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
while read font; do
- ewarn "QA: missed font file: ${font}"
+ eqawarn "Missed font file: ${font}"
done
- pushd ${PN}$(use fontforge && echo -src)-${PV}
+ pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die
dodoc CHANGES
- popd >/dev/null
+ popd > /dev/null || die
if use ancient; then
- pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
- newdoc CHANGES{,.ancient} || die
- newdoc README{,.ancient} || die
- popd >/dev/null
+ pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die
+
+ newdoc CHANGES{,.ancient}
+ newdoc README{,.ancient}
+
+ popd > /dev/null || die
fi
if use taamey; then
for font in ${TAAMEY_FONTS}; do
- pushd ${font}
- [[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
- newdoc README{,.${font}} || die
- insinto /usr/share/doc/${PF}/${font}
- doins -r Samples
- popd >/dev/null
+ pushd ${font} > /dev/null || die
+
+ docinto ${font}
+ [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+ newdoc README{,.${font}}
+ dodoc -r Samples
+
+ popd > /dev/null || die
done
fi
}
diff --git a/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
new file mode 100644
index 00000000000..17d35e82347
--- /dev/null
+++ b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
@@ -0,0 +1,191 @@
+ Description: Fix incorrect syntax for disjunction in fontconfig .conf file.
+ Author: Benjamin Drung <bdrung@ubuntu.com>
+ Bug-Ubuntu: https://launchpad.net/bugs/1034928
+
+--- a/culmus-0.133/culmus.conf
++++ b/culmus-0.133/culmus.conf
+@@ -8,6 +8,16 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Guttman Adii</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>David CLM</string>
++ </edit>
++ <edit mode="assign" binding="same" name="slant" >
++ <const>italic</const>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Adii-Light</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -30,6 +40,13 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Guttman Stam</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Stam Ashkenaz CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Stam1</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -40,6 +57,13 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Guttman Hodes</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Hadasim CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Monotype Hadassah</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -50,7 +74,21 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Aharoni</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Aharoni CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Aharoni</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Aharoni CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman-Aharoni</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -61,7 +99,21 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>FrankRuehl</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Frank Ruehl CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Frank</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Frank Ruehl CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Frnew</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -72,7 +124,21 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>David</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>David CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>David Transparent</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>David CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman David</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -83,8 +149,29 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Fixed Miriam Transparent</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam Mono CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Myamfix</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam Mono CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman-CourMir</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam Mono CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Miriam Fixed</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -95,8 +182,29 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Guttman Miryam</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Levenim MT</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Miriam</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Miriam CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Miriam Transparent</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
+@@ -107,6 +215,13 @@
+ <match target="pattern" >
+ <test name="family" >
+ <string>Guttman Drogolin</string>
++ </test>
++ <edit mode="append" binding="same" name="family" >
++ <string>Drugulin CLM</string>
++ </edit>
++ </match>
++ <match target="pattern" >
++ <test name="family" >
+ <string>Guttman Vilna</string>
+ </test>
+ <edit mode="append" binding="same" name="family" >
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 504c8a29526..e1d640bf179 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,4 +1,2 @@
-DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc19092d1dbe3cf5c8d02f22affe70cdcb5e0d5d2b787917c43bedfb9b8ac37d1537e3d79a9f6e948baf0c4415ac78b00b SHA512 a00ad39b3f02dc3866b54b522b299d65a571bf7c0625b8aa4f7095fa15010cebecb8b2a51a3716336c48531acf617b557dd4114b670910560e69d2b315715cb4
DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
-DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
deleted file mode 100644
index 8a36bc5c310..00000000000
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
-HOMEPAGE="https://dejavu-fonts.github.io/"
-
-# If you want to test snapshot from dejavu.sf.net/snapshots/
-# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
-snapv=${snapv/./-}
-MY_BP=${PN}-fonts-ttf-${MY_PV}
-MY_SP=${PN}-fonts-${MY_PV}
-
-if [[ -z ${snapv} ]]; then
- SRC_URI="!fontforge? ( mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
- fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
-else
- SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}-${snapv}.tar.bz2 )
- fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}-${snapv}.tar.bz2 )"
-fi
-
-LICENSE="BitstreamVera"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="fontforge"
-
-DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
- >=media-gfx/fontforge-20080429
- dev-perl/Font-TTF
- app-i18n/unicode-data
- >media-libs/fontconfig-2.6.0 )"
-
-FONT_CONF=(
- fontconfig/20-unhint-small-dejavu-sans-mono.conf
- fontconfig/20-unhint-small-dejavu-sans.conf
- fontconfig/20-unhint-small-dejavu-serif.conf
- fontconfig/57-dejavu-sans-mono.conf
- fontconfig/57-dejavu-sans.conf
- fontconfig/57-dejavu-serif.conf
-)
-
-FONT_S="ttf"
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
-
-src_unpack() {
- default
- if use fontforge; then
- mv "${MY_SP}" "${P}" || die
- else
- mv "${MY_BP}" "${P}" || die
- fi
-}
-
-src_compile() {
- if use fontforge; then
- emake -j1 \
- BUILDDIR=ttf \
- BLOCKS=/usr/share/unicode-data/Blocks.txt \
- UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
- FC-LANG=/usr/share/fc-lang \
- full sans
- fi
-}
-
-src_install() {
- font_src_install
- if use fontforge; then
- dodoc ttf/*.txt
- fi
-}
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 0b1bf5416c9..17d2bac9cd9 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font versionator xdg-utils
+EAPI=7
+
+inherit font xdg-utils
DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
HOMEPAGE="https://dejavu-fonts.github.io/"
# If you want to test snapshot from dejavu.sf.net/snapshots/
# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
+MY_PV=$(ver_cut 1-2)
+snapv=$(ver_cut 3-4)
snapv=${snapv/./-}
MY_BP=${PN}-fonts-ttf-${MY_PV}
MY_SP=${PN}-fonts-${MY_PV}
@@ -25,17 +26,21 @@ fi
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="fontforge"
-DEPEND="fontforge? (
- >=x11-apps/mkfontscale-1.2.0
- >=media-gfx/fontforge-20080429
- dev-perl/Font-TTF
+BDEPEND="
+ fontforge? (
app-i18n/unicode-data
- >media-libs/fontconfig-2.6.0:1.0 )
+ dev-perl/Font-TTF
+ >=media-gfx/fontforge-20080429
+ >media-libs/fontconfig-2.6.0:1.0
+ >=x11-apps/mkfontscale-1.2.0
+ )
"
+DOCS=( AUTHORS NEWS README.md status.txt langcover.txt unicover.txt )
+
FONT_CONF=(
fontconfig/20-unhint-small-dejavu-sans-mono.conf
fontconfig/20-unhint-small-dejavu-sans.conf
@@ -44,10 +49,8 @@ FONT_CONF=(
fontconfig/57-dejavu-sans.conf
fontconfig/57-dejavu-serif.conf
)
-
FONT_S="ttf"
FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README.md status.txt langcover.txt unicover.txt"
src_unpack() {
default
diff --git a/media-fonts/dina/dina-2.93.ebuild b/media-fonts/dina/dina-2.93.ebuild
index 46aefaabe4c..c597de4ebb5 100644
--- a/media-fonts/dina/dina-2.93.ebuild
+++ b/media-fonts/dina/dina-2.93.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font font-ebdftopcf
-DESCRIPTION="A monospace bitmap font, primarily aimed at programmers"
-HOMEPAGE="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-SRC_URI="http://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> ${P}.zip"
+DESCRIPTION="Monospace bitmap font, primarily aimed at programmers"
+HOMEPAGE="https://www.dcmembers.com/jibsen/download/61/"
+SRC_URI="https://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> ${P}.zip"
+S="${WORKDIR}/BDF/"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
+RESTRICT="strip binchecks"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}/BDF/
-FONT_S=${S}/
FONT_SUFFIX="pcf.gz"
-RESTRICT="strip binchecks"
src_compile() {
font-ebdftopcf_src_compile
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
index 80a8f16631e..06a2a1d627c 100644
--- a/media-fonts/droid/droid-113-r5.ebuild
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit font
+EAPI=7
MY_PN="${PN/d/D}"
+inherit font
# $PV is a build number, use fontforge to find it out. 113 was taken from:
# https://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
DESCRIPTION="Font family from Google's Android project"
-HOMEPAGE="https://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
+HOMEPAGE="https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29"
SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
+S="${WORKDIR}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE=""
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
FONT_CONF=(
"${FILESDIR}/59-google-droid-sans-mono.conf"
"${FILESDIR}/59-google-droid-sans.conf"
"${FILESDIR}/59-google-droid-serif.conf"
)
+FONT_SUFFIX="ttf"
src_prepare() {
default
diff --git a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
index 1585b906ac1..c7301d0b47b 100644
--- a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
+++ b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government"
-HOMEPAGE="http://www.dit.gov.bt/downloads"
-SRC_URI="http://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> ${P}.zip"
+HOMEPAGE="https://www.dit.gov.bt/downloads"
+SRC_URI="https://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
+
RESTRICT="mirror bindist"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
src_unpack() {
diff --git a/media-fonts/eb-garamond/eb-garamond-0.016.ebuild b/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
index 6de7b6d096a..eaca370cef3 100644
--- a/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
+++ b/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Claude Garamont's humanist typeface from the mid-16th century"
HOMEPAGE="http://www.georgduffner.at/ebgaramond/"
SRC_URI="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${PV}.zip"
+S="${WORKDIR}/EBGaramond-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 x86"
IUSE=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S="${WORKDIR}/EBGaramond-${PV}"
FONT_SUFFIX="otf"
FONT_S="${S}/${FONT_SUFFIX}"
-DOCS="Changes README.markdown specimen/Specimen.pdf"
+
+DOCS=( Changes README.markdown specimen/Specimen.pdf )
diff --git a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
index 3b6c0686485..54496dfc60e 100644
--- a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
+++ b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://openlab.jp/efont/dist/unicode-bdf/${MY_P}.tar.bz2"
# naga10 has free-noncomm license
LICENSE="public-domain BAEKMUK BSD MIT HPND free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
index 6ba58462fc8..3e7bceb439a 100644
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-3
DESCRIPTION="X.Org font encodings"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
BDEPEND="x11-apps/mkfontscale
>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/essays1743/Manifest b/media-fonts/essays1743/Manifest
index bdfadfe099f..ab431cabcc7 100644
--- a/media-fonts/essays1743/Manifest
+++ b/media-fonts/essays1743/Manifest
@@ -1 +1,2 @@
+DIST essays1743-2.100-1-otf.tar.gz 3582487 BLAKE2B 787ac5015b3da3ddcbad4a988c2b683159cb176789a39033e6103dddc5a101562b310e438cc1cebfc99ca1dc7efc15e256d3fd02c6cc283ebef70bc1ef8c7a0c SHA512 f1d205e9ad77be119a32b105a36c0a8ec45eedd19451c64643dbe13add46a6407d7cad9444d16d096b648405b4abb04b70bb943767308bcf7b6512398c2e4df6
DIST essays1743-2.100-1-ttf.tar.gz 3107168 BLAKE2B b8c9b55b3bf0178bdcd4fd25e0fc151ecf5666052530b596bf22f6ae362464b5f9947a8e8e877dfa775acb9898a180b3dafb2fdbf4a5724a266088321a72b1ec SHA512 31885e430713e6931b1bf2f7ce307e964576f1f2909a60c4a0a9adfa6293fd1c02200155d3bd56d0714210c7e653ee1980425539a554b304c3a3c6fb6121bd2e
diff --git a/media-fonts/essays1743/essays1743-2.100.ebuild b/media-fonts/essays1743/essays1743-2.100.ebuild
index 962931d7eb9..8e23029b793 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="John Stracke's Essays 1743 font"
HOMEPAGE="https://www.thibault.org/fonts/essays/"
-SRC_URI="https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz"
+SRC_URI="otf? ( https://www.thibault.org/fonts/essays/${P}-1-otf.tar.gz )
+ ttf? ( https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz )"
+S="${WORKDIR}/${PN}"
LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x64-macos"
-IUSE=""
+IUSE="+otf ttf"
-DEPEND=""
-RDEPEND=""
+REQUIRED_USE="|| ( otf ttf )"
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
+src_install() {
+ local FONT_SUFFIX="$(usex otf otf '') $(usex ttf ttf '')"
+ font_src_install
+}
diff --git a/media-fonts/essays1743/metadata.xml b/media-fonts/essays1743/metadata.xml
index 13ee7931459..d8434021029 100644
--- a/media-fonts/essays1743/metadata.xml
+++ b/media-fonts/essays1743/metadata.xml
@@ -1,8 +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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <use>
+ <flag name="otf">Install the OpenType version of the font</flag>
+ <flag name="ttf">Install the TrueType version of the font</flag>
+ </use>
</pkgmetadata>
diff --git a/media-fonts/exo/exo-2.ebuild b/media-fonts/exo/exo-2.ebuild
index bcde786c944..7c5d86667ed 100644
--- a/media-fonts/exo/exo-2.ebuild
+++ b/media-fonts/exo/exo-2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="A geometric sans-serif font with a technological feel"
-HOMEPAGE="http://ndiscovered.com/exo-2/"
+DESCRIPTION="Geometric sans-serif font with a technological feel"
+HOMEPAGE="https://www.ndiscover.com/exo-2-0/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
# repackaged from two upstream zips (exo-2, exo condensed & expanded) + license
diff --git a/media-fonts/fantasque-sans-mono/Manifest b/media-fonts/fantasque-sans-mono/Manifest
index cb0904f7630..01272d8f67c 100644
--- a/media-fonts/fantasque-sans-mono/Manifest
+++ b/media-fonts/fantasque-sans-mono/Manifest
@@ -1 +1 @@
-DIST fantasque-sans-mono-2014.07.zip 1688873 BLAKE2B 2153db1c80de217bb7a4f6ba679f8f68f8002008d0d47d11a7a3aa0820ce51b613265e1c9c44ae3b5655d10176e9330057fdfe8c9500e8830060f76395b92b86 SHA512 3bc61700f98469d480da9d6c6b9b37194d8e148878724ccf92b7e348540b8ff963d3ed551f3de56e3d8a0d2b5c04f94ba53a3c0242818e0693a38cc0840147be
+DIST fantasque-sans-mono-1.8.0.tar.gz 1733798 BLAKE2B 93be1372341f8b64ea88146af369d5942615e132e760e83f0d111c2bd67afb03677f725023111e8fd64abfa951e78d4444ee083c0a99ad6df800e7df69ee4699 SHA512 3afbd441d192769ea44fd7730e728844d13c15b0dd52e3968e6e1659ffa11a173d21891c09ceb7465b83a0b8c923129df2554e159620c9611ee9bb6ff35c90c6
diff --git a/media-fonts/fantasque-sans-mono/fantasque-sans-mono-1.8.0.ebuild b/media-fonts/fantasque-sans-mono/fantasque-sans-mono-1.8.0.ebuild
new file mode 100644
index 00000000000..911704fdf35
--- /dev/null
+++ b/media-fonts/fantasque-sans-mono/fantasque-sans-mono-1.8.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="A font family with a great monospaced variant for programmers"
+HOMEPAGE="https://github.com/belluzj/fantasque-sans"
+SRC_URI="https://github.com/belluzj/fantasque-sans/releases/download/v${PV}/FantasqueSansMono-Normal.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+FONT_S="${S}/OTF"
+FONT_SUFFIX="otf"
diff --git a/media-fonts/fantasque-sans-mono/fantasque-sans-mono-2014.07.ebuild b/media-fonts/fantasque-sans-mono/fantasque-sans-mono-2014.07.ebuild
deleted file mode 100644
index f7681de7f8c..00000000000
--- a/media-fonts/fantasque-sans-mono/fantasque-sans-mono-2014.07.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Functional programming font designed with some handwriting-like fuzziness"
-HOMEPAGE="http://openfontlibrary.org/en/font/fantasque-sans-mono"
-SRC_URI="http://openfontlibrary.org/assets/downloads/${PN}/db52617ba875d08cbd8e080ca3d9f756/${PN}.zip -> ${P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
-DOCS="README.md"
diff --git a/media-fonts/fantasque-sans-mono/metadata.xml b/media-fonts/fantasque-sans-mono/metadata.xml
index d0f1df7c94c..879bf78880a 100644
--- a/media-fonts/fantasque-sans-mono/metadata.xml
+++ b/media-fonts/fantasque-sans-mono/metadata.xml
@@ -1,8 +1,11 @@
<?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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">belluzj/fantasque-sans</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index 8e1db37712b..39c0e5d1dc9 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.farsiweb.ir/font/farsifonts-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~ppc-macos"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
index 57ec937ae6b..7fd0ea01ead 100644
--- a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
+++ b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,10 +12,8 @@ SRC_URI="http://www.fgdc.gov/HSWG/symbol_downloads/ers_v${PV//./}.zip"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
S="${WORKDIR}/ersSymbolsVersion0202"
FONT_S="${S}"
diff --git a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
index 2458f54bb18..7bef413394f 100644
--- a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
+++ b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
OPENSUSE_RELEASE="12.2"
DESCRIPTION="Simplistic, technical sans serif - openSUSE font"
-HOMEPAGE="http://jimmac.musichall.cz/log/?p=439"
+HOMEPAGE="https://jimmac.eu/"
SRC_URI="https://api.opensuse.org/public/source/openSUSE:${OPENSUSE_RELEASE}/fifth-leg-font/opensuse-font-${P}.tar.bz2"
+S="${WORKDIR}"
LICENSE="OFL"
SLOT="0"
@@ -16,5 +17,3 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
FONT_SUFFIX="otf sfd"
-FONT_S="${WORKDIR}"
-S="${FONT_S}"
diff --git a/media-fonts/fira-code/fira-code-4.ebuild b/media-fonts/fira-code/fira-code-4.ebuild
index c9c8dbb7c8a..c12ec2c68c1 100644
--- a/media-fonts/fira-code/fira-code-4.ebuild
+++ b/media-fonts/fira-code/fira-code-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,15 +13,14 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
S="${WORKDIR}/FiraCode-${PV}"
FONT_S="${S}/distr/ttf"
FONT_SUFFIX="ttf otf"
-DOCS="README.md"
+DOCS=( README.md )
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
src_prepare() {
default
diff --git a/media-fonts/fira-code/fira-code-5.2.ebuild b/media-fonts/fira-code/fira-code-5.2.ebuild
index c9c8dbb7c8a..36371a22ab1 100644
--- a/media-fonts/fira-code/fira-code-5.2.ebuild
+++ b/media-fonts/fira-code/fira-code-5.2.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+S="${WORKDIR}/FiraCode-${PV}"
+FONT_S="${S}/distr/ttf"
+FONT_SUFFIX="ttf otf"
inherit font
DESCRIPTION="Monospaced font with programming ligatures"
HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
+SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/ttf"
-FONT_SUFFIX="ttf otf"
-DOCS="README.md"
+DOCS=( README.md )
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
src_prepare() {
default
diff --git a/media-fonts/fira-code/metadata.xml b/media-fonts/fira-code/metadata.xml
index d3698aac302..c97e44b664f 100644
--- a/media-fonts/fira-code/metadata.xml
+++ b/media-fonts/fira-code/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
diff --git a/media-fonts/fira-mono/Manifest b/media-fonts/fira-mono/Manifest
index 25cbab25898..d8bd86a6e4c 100644
--- a/media-fonts/fira-mono/Manifest
+++ b/media-fonts/fira-mono/Manifest
@@ -1 +1 @@
-DIST FiraMonoFonts3205.zip 1210827 BLAKE2B 99152a5b62ecf32369b84ba3b66662cb5db1662d0bac5f7c2d1cefb7e3cd0e72be13a2177f2d08e77cae30cebba2ad5c55b0b34235c55317f9f726dc774e82f9 SHA512 d1a05ed2610e6d1c688b5709bd30ff6de4597c93db99d049fca9f8a8b3e2bfd2faf2de2a6d23a5b24efaa502e0cb2f23f5239cadc0bb5cb709d04da1d37cba15
+DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
diff --git a/media-fonts/fira-mono/fira-mono-3.205.ebuild b/media-fonts/fira-mono/fira-mono-3.205.ebuild
deleted file mode 100644
index 777bda1a12f..00000000000
--- a/media-fonts/fira-mono/fira-mono-3.205.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraMonoFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default monospaced typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-1/"
-SRC_URI="http://www.carrois.com/downloads/fira_mono_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-mono/fira-mono-4.202.ebuild b/media-fonts/fira-mono/fira-mono-4.202.ebuild
new file mode 100644
index 00000000000..6a4e2221c27
--- /dev/null
+++ b/media-fonts/fira-mono/fira-mono-4.202.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+MY_PN="Fira"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Default monospaced typeface for FirefoxOS, designed for legibility"
+HOMEPAGE="https://mozilla.github.io/Fira"
+SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.md LICENSE )
+
+src_prepare() {
+ default
+
+ use ttf && { rm "${S}"/ttf/FiraSans-*.ttf || die; }
+ use otf && { rm "${S}"/otf/FiraSans*.otf || die; }
+}
+
+src_install() {
+ use otf && { FONT_S="${S}/otf"; FONT_SUFFIX="otf"; }
+ use ttf && { FONT_S="${S}/ttf"; FONT_SUFFIX="ttf"; }
+
+ font_src_install
+ einstalldocs
+}
diff --git a/media-fonts/fira-mono/metadata.xml b/media-fonts/fira-mono/metadata.xml
index d0f1df7c94c..4eb642804cf 100644
--- a/media-fonts/fira-mono/metadata.xml
+++ b/media-fonts/fira-mono/metadata.xml
@@ -5,4 +5,8 @@
<email>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
+ <use>
+ <flag name="otf">Install the OpenType version of the font</flag>
+ <flag name="ttf">Install the TrueType version of the font</flag>
+ </use>
</pkgmetadata>
diff --git a/media-fonts/fira-sans/Manifest b/media-fonts/fira-sans/Manifest
index 48405656ff7..d8bd86a6e4c 100644
--- a/media-fonts/fira-sans/Manifest
+++ b/media-fonts/fira-sans/Manifest
@@ -1,2 +1 @@
-DIST FiraFonts4002.zip 22975177 BLAKE2B 6dfc143568605ecd4fa956d8ef567ce4d86e187e985e9f43213dda41dd9de2d417e7e29dafcf27ab97ffff11ca6571f0cd5ca084e623fa6a6dd84297cf514013 SHA512 9ce5350cea8fddf5fc5282a23ffe3d142ddb6fb778a78308bf4083be50f036feb1faadf72ade5c0e62638302c26a1ead91692ca016e0220d152871294b467508
-DIST FiraFonts4105.zip 27227111 BLAKE2B c8ef15673735537c0d849c3e0dfa46a0b9cdcb7fff1d82d50d18b0119192282fa3956f57fa182420f71479f9479a4b8da5f87cddedea2469fd01562dc7bf8ee3 SHA512 f451e99d761ae9e714461e1ac244ee1c12af11751f61c94fa7ed10bf04bfa26520fbf50d1aeae55346348aec932481888780ae12df27349c966ba79a3eeae37d
+DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
diff --git a/media-fonts/fira-sans/fira-sans-4.002.ebuild b/media-fonts/fira-sans/fira-sans-4.002.ebuild
deleted file mode 100644
index e17cbbbf763..00000000000
--- a/media-fonts/fira-sans/fira-sans-4.002.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-0/"
-SRC_URI="http://www.carrois.com/downloads/fira_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/${MY_P/Fonts/Sans}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/fira-sans-4.105.ebuild b/media-fonts/fira-sans/fira-sans-4.105.ebuild
deleted file mode 100644
index 8d02c531913..00000000000
--- a/media-fonts/fira-sans/fira-sans-4.105.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-0/"
-SRC_URI="http://www.carrois.com/downloads/fira_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/fira-sans-4.202.ebuild b/media-fonts/fira-sans/fira-sans-4.202.ebuild
new file mode 100644
index 00000000000..3bb8e6d9663
--- /dev/null
+++ b/media-fonts/fira-sans/fira-sans-4.202.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+MY_PN="Fira"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Default monospaced typeface for FirefoxOS, designed for legibility"
+HOMEPAGE="https://mozilla.github.io/Fira"
+SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.md LICENSE )
+
+src_prepare() {
+ default
+
+ use ttf && { rm "${S}"/ttf/FiraMono-*.ttf || die; }
+ use otf && { rm "${S}"/otf/FiraMono*.otf || die; }
+}
+
+src_install() {
+ use otf && { FONT_S="${S}/otf"; FONT_SUFFIX="otf"; }
+ use ttf && { FONT_S="${S}/ttf"; FONT_SUFFIX="ttf"; }
+
+ font_src_install
+ einstalldocs
+}
diff --git a/media-fonts/fira-sans/metadata.xml b/media-fonts/fira-sans/metadata.xml
index d0f1df7c94c..6c111693e0f 100644
--- a/media-fonts/fira-sans/metadata.xml
+++ b/media-fonts/fira-sans/metadata.xml
@@ -1,8 +1,13 @@
<?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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <use>
+ <flag name="otf">Install the OpenType version of the font</flag>
+ <flag name="ttf">Install the TrueType version of the font</flag>
+ </use>
</pkgmetadata>
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
index 2672ca433a6..9d67d6bf9d5 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
index 52d39c26c7d..3b22c52fc74 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
index 8d3898dd1a7..b0c614fa875 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
index 8d3898dd1a7..b0c614fa875 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
index 474bb11c410..72e63034530 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index f8eb0272589..39335266b55 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
DESCRIPTION="X.Org font aliases"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
BDEPEND="x11-apps/mkfontscale
>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
index 6d30209c008..8e18d5ade23 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org arabic bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
index 1c1637dd3e2..0cdbae7c288 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
index 1c1637dd3e2..0cdbae7c288 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
index 21210c2e5da..7f555084350 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
index 21210c2e5da..7f555084350 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index 76c1d8e4c59..71265887b67 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index 2e4e51fa48a..6fee2e93fbe 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
index 4a57a66191a..5848dfb1b92 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
index 4a57a66191a..5848dfb1b92 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
index 2d1c2a853ec..a0bf00766b0 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="Bitstream Speedo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
index e99a081c447..c6b06c47793 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
index 0ea6344054a..991244b3dfb 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Cronyx cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
index 97a0ae4517e..fd023b1399d 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org cursor font"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
index 1ada6b708c6..76b4878a823 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Daewoo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
index feaf5b63777..aed6d6503d2 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org DEC fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
index 016d23994a3..18ed26c1168 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org IBM Courier font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
index f5420cc188b..12ef8c613e9 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
index ff470db3336..86b269579c0 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit xorg-3
DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
index 514f54eaa8f..3288407a72f 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org micro-misc font"
LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
index 85d4228eef0..155b004dc30 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org misc-cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
index 9c37d377dee..cc90bec8672 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="Miscellaneous Ethiopic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
XORG_CONFIGURE_OPTIONS=(
--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
index 6b7ef5c84d6..af71d1f13af 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,4 +8,4 @@ inherit xorg-3
DESCRIPTION="X.Org Syriac fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index ae84191bbd6..f1bff67b153 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org miscellaneous fonts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
index c4ad306a5fd..6b31f60b690 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org ClearlyU fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
index f4caf44c0de..5f5c4d835fc 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Schumacher fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
index d88de8254a8..64ce06800d8 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Screen cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
index 52d135d9c80..ba1cbafde19 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Sony fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
index 8fd3654fdfa..8b6012366f3 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Sun fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
index 4f18316ba31..ad6cf7ca5ce 100644
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
DESCRIPTION="X.Org font utilities"
HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
index 8729a7de05c..b76e244b552 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Winitzki cyrillic font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
index 471d046c230..2916ee92912 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org XFree86 Type 1 font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 122684340b3..a9932ee7db2 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,2 +1,3 @@
DIST fontawesome-5.14.0.tar.gz 11130737 BLAKE2B 0ae60cb0564ed89705d972f41084f2a3d28b630da82f055455686db5fad18709b440bf642743327369c2cc8d52b2a874a24f4a38b06d680768fa386246fb62a7 SHA512 a46679ae7758a94a4e52e0d24486aa2968d4ffa5fe0a583150847eeedc5703ad9cb47a0c71d074595ef7f44b91dae2b00abbe1c3e648447bfb5366daab99f6e3
DIST fontawesome-5.15.1.tar.gz 11277799 BLAKE2B a1f59fe6b6f3ae93bc1a818956ae0034ba7bbb9f3ce800e5296903fa5f19426496dc21245691ac83bcb0eca5ed5aae33c0942eccb1ce8c05143a9e8509c89aae SHA512 0dfef0ae11d032bf52ecdc5ea94ad258805e61b7b4e2aedcf7b0b4d2f0977466339af54310b796eefe3115ef2cb10d1537080d2d68746379ff83cfcbea5c377f
+DIST fontawesome-5.15.2.tar.gz 11274421 BLAKE2B 14a0cb2d8f444a26d0552f14fbdd9a51c8bc7903e19cc33271618af87db744539cd7954baba4e8870aff98b3ed311aba37c3d8bbe6903065292a92561363067d SHA512 c1577b90053285a77ecf1225c1bd534fb0d3b89a4b90e4abcd37bd36ad1b35967a4746fe164ff7129c8a90f1294fab947dd2ff203a5b826ac89d5f6b48a77a80
diff --git a/media-fonts/fontawesome/fontawesome-5.15.2.ebuild b/media-fonts/fontawesome/fontawesome-5.15.2.ebuild
new file mode 100644
index 00000000000..8301f85e2ab
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.15.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+ SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+ if use otf; then
+ FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+ fi
+ if use ttf; then
+ FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+ fi
+}
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index 795d5dc1653..42226d316ed 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild b/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
new file mode 100644
index 00000000000..42f893a9556
--- /dev/null
+++ b/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for fonts to cover most needs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+free +latin ms"
+
+LANGS="as bn bo brx doi dz gu hi ja km kn ko kok ks mai ml mr ne or pa
+ sa sat sd si syc ta te th zh"
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+done
+unset lang LANGS
+
+RDEPEND="media-libs/fontconfig
+ free? (
+ media-fonts/heuristica
+ media-fonts/liberation-fonts
+ media-fonts/noto
+ media-fonts/noto-emoji
+ media-fonts/wqy-microhei
+ latin? (
+ media-fonts/cantarell
+ media-fonts/courier-prime
+ media-fonts/dejavu
+ media-fonts/droid
+ media-fonts/font-bh-ttf
+ media-fonts/font-cursor-misc
+ media-fonts/hack
+ media-fonts/ibm-plex
+ media-fonts/open-sans
+ media-fonts/quivira
+ media-fonts/signika
+ media-fonts/source-pro
+ media-fonts/tex-gyre
+ media-fonts/ubuntu-font-family
+ media-fonts/urw-fonts
+ )
+ l10n_as? ( media-fonts/lohit-assamese )
+ l10n_bn? ( media-fonts/lohit-bengali )
+ l10n_bo? ( media-fonts/tibetan-machine-font )
+ l10n_brx? ( media-fonts/lohit-devanagari )
+ l10n_doi? ( media-fonts/lohit-devanagari )
+ l10n_dz? ( media-fonts/dzongkha-fonts )
+ l10n_gu? ( media-fonts/lohit-gujarati )
+ l10n_hi? ( media-fonts/lohit-devanagari )
+ l10n_ja? (
+ media-fonts/ipaex
+ media-fonts/ja-ipafonts
+ media-fonts/koruri
+ media-fonts/mplus-fonts
+ media-fonts/vlgothic
+ )
+ l10n_km? ( media-fonts/khmer )
+ l10n_kn? ( media-fonts/lohit-kannada )
+ l10n_ko? (
+ media-fonts/nanum
+ media-fonts/unfonts
+ )
+ l10n_kok? ( media-fonts/lohit-devanagari )
+ l10n_ks? ( media-fonts/lohit-devanagari )
+ l10n_mai? ( media-fonts/lohit-devanagari )
+ l10n_ml? ( media-fonts/lohit-malayalam )
+ l10n_mr? (
+ media-fonts/lohit-devanagari
+ media-fonts/lohit-marathi
+ )
+ l10n_ne? (
+ media-fonts/lohit-devanagari
+ media-fonts/lohit-nepali
+ )
+ l10n_or? ( media-fonts/lohit-odia )
+ l10n_pa? ( media-fonts/lohit-gurmukhi )
+ l10n_sa? ( media-fonts/lohit-devanagari )
+ l10n_sat? ( media-fonts/lohit-devanagari )
+ l10n_sd? ( media-fonts/lohit-devanagari )
+ l10n_si? ( media-fonts/lklug )
+ l10n_syc? ( media-fonts/font-misc-meltho )
+ l10n_ta? (
+ media-fonts/lohit-tamil
+ media-fonts/lohit-tamil-classical
+ )
+ l10n_te? ( media-fonts/lohit-telugu )
+ l10n_th? ( media-fonts/thaifonts-scalable )
+ l10n_zh? ( media-fonts/wqy-zenhei )
+ )
+ ms? (
+ media-fonts/corefonts
+ media-fonts/croscorefonts
+ media-fonts/crosextrafonts-caladea
+ media-fonts/crosextrafonts-carlito
+ media-fonts/dejavu
+ media-fonts/droid
+ media-fonts/inconsolata
+ media-fonts/open-sans
+ media-fonts/paratype
+ )"
diff --git a/media-fonts/infinality-ultimate-meta/metadata.xml b/media-fonts/fonts-meta/metadata.xml
index 75a0629ade7..6adfcf5baf3 100644
--- a/media-fonts/infinality-ultimate-meta/metadata.xml
+++ b/media-fonts/fonts-meta/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>alexey+gentoo@asokolov.org</email>
+ <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="person" proxied="proxy">
+ <email>juippis@gentoo.org</email>
+ <name>Joonas Niilola</name>
+ </maintainer>
<maintainer type="project">
<email>fonts@gentoo.org</email>
<name>Fonts</name>
@@ -8,7 +16,6 @@
<use>
<flag name="free">Install fonts for the "free" preset</flag>
<flag name="latin">Install additional latin fonts</flag>
- <flag name="minimal">Install a minimal set of fonts</flag>
<flag name="ms">Install (free) fonts for the "ms" preset</flag>
</use>
</pkgmetadata>
diff --git a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
index dfc1cf8bfa7..6508ee993bb 100644
--- a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
+++ b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 x86"
S="${WORKDIR}"
FONT_S="${S}"
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index 84f3a2fe234..25f27559441 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit font
@@ -15,9 +15,10 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="app-arch/unzip"
+RESTRICT="strip binchecks"
-FONT_SUFFIX="otf ttf"
-DOCS="AUTHORS ChangeLog CREDITS TROUBLESHOOTING USAGE"
+BDEPEND="app-arch/unzip"
-RESTRICT="strip binchecks"
+DOCS=( AUTHORS ChangeLog CREDITS TROUBLESHOOTING USAGE )
+
+FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/freefonts/freefonts-0.10-r4.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index e10798ed49f..11d9ac649d6 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
LICENSE="freedist free-noncomm all-rights-reserved"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="X"
RESTRICT="mirror bindist"
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index da8d7417027..7f4ec58189b 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/gidole/gidole-2.0.2.ebuild b/media-fonts/gidole/gidole-2.0.2.ebuild
index 0e02ce58ec5..a179302cbec 100644
--- a/media-fonts/gidole/gidole-2.0.2.ebuild
+++ b/media-fonts/gidole/gidole-2.0.2.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Open source modern DIN fonts"
HOMEPAGE="http://gidole.github.io/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
+S="${WORKDIR}/GidoleFont"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE=""
-DEPEND="app-arch/unzip"
-S="${WORKDIR}/GidoleFont"
+BDEPEND="app-arch/unzip"
+
FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/hack/hack-3.003.ebuild b/media-fonts/hack/hack-3.003.ebuild
index 5346bb339e2..3dc53dfb4c4 100644
--- a/media-fonts/hack/hack-3.003.ebuild
+++ b/media-fonts/hack/hack-3.003.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
-inherit font versionator
+inherit font
-DESCRIPTION="A typeface designed for source code"
+DESCRIPTION="Typeface designed for source code"
HOMEPAGE="https://github.com/source-foundry/Hack"
SRC_URI="https://github.com/source-foundry/Hack/releases/download/v${PV}/Hack-v${PV}-ttf.tar.xz"
+S="${WORKDIR}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~ppc64 x86"
IUSE=""
-RESTRICT="binchecks strip"
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
FONT_SUFFIX="ttf"
-
-src_unpack() {
- mkdir "${S}" && cd "${S}"
- unpack ${A}
-}
diff --git a/media-fonts/hermit/Manifest b/media-fonts/hermit/Manifest
index f747b469aad..d82d0b5e005 100644
--- a/media-fonts/hermit/Manifest
+++ b/media-fonts/hermit/Manifest
@@ -1,2 +1 @@
-DIST otf-hermit-1.1.tar.gz 15077 BLAKE2B 1435e521e2e6c50f910fe6eb7cf29513bc665766478a4584ea06455d64a70dfd81c80447eb2d282a511f13bd24fc6d119e0e57f0a4469dcd355a13e0920b76cb SHA512 ef87f69bfbdb0f84b16e42e06a950a351fb1203fe599dfb7cf6b0c69fb260d99e24b67c741d738f9250fcd1f14aa162c8f285fed7e6481ffd55e78a1f1617d58
DIST otf-hermit-1.21.tar.gz 42646 BLAKE2B c67dcaa34a5fc5f8280547107a817deb4a40db7c6b3a0b2edf8d92c2dc230576bd7fd194bff1943fe481a143a027eb56484fae30ebeab5c6a563d9bdb07011ac SHA512 5b980068d349e67d78a33a100d9b38eb24c374d0cf6ac69676df0e8dd441451acc0112089634c4b408f1afcb49501bb9f5940ec6c18910b5c11f7f7f31c739ac
diff --git a/media-fonts/hermit/hermit-1.1.ebuild b/media-fonts/hermit/hermit-1.1.ebuild
deleted file mode 100644
index dffd2a5cc5d..00000000000
--- a/media-fonts/hermit/hermit-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
-HOMEPAGE="https://pcaro.es/p/hermit/"
-SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/hermit/hermit-1.21.ebuild b/media-fonts/hermit/hermit-1.21.ebuild
index dffd2a5cc5d..449a4bb83c1 100644
--- a/media-fonts/hermit/hermit-1.21.ebuild
+++ b/media-fonts/hermit/hermit-1.21.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
+FONT_SUFFIX="otf"
inherit font
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
+DESCRIPTION="Monospace font designed to be clear, pragmatic and very readable"
HOMEPAGE="https://pcaro.es/p/hermit/"
SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
@@ -13,5 +15,4 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-S=${WORKDIR}
-FONT_SUFFIX="otf"
+S="${WORKDIR}"
diff --git a/media-fonts/heuristica/heuristica-1.0.2.ebuild b/media-fonts/heuristica/heuristica-1.0.2.ebuild
index 8bafb433572..7cfd65a10ef 100644
--- a/media-fonts/heuristica/heuristica-1.0.2.ebuild
+++ b/media-fonts/heuristica/heuristica-1.0.2.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A font based on Adobe Utopia"
-HOMEPAGE="https://heuristica.sourceforge.io/"
+DESCRIPTION="Font based on Adobe Utopia"
+HOMEPAGE="https://sourceforge.net/projects/heuristica/"
SRC_URI="mirror://sourceforge/heuristica/${PN}-ttf-${PV}.tar.xz
mirror://sourceforge/heuristica/${PN}-otf-${PV}.tar.xz
mirror://sourceforge/heuristica/${PN}-pfb-${PV}.tar.xz"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-S="${WORKDIR}"
+DOCS=( FontLog.txt )
FONT_SUFFIX="otf pfb ttf"
-FONT_S="${S}"
-DOCS="FontLog.txt"
diff --git a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
index d1c616d95bf..593b007733d 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hunkyfonts/${P}.tar.bz2"
LICENSE="BitstreamVera public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
DOCS="ChangeLog README"
FONT_S="${S}/TTF"
diff --git a/media-fonts/ibm-plex/Manifest b/media-fonts/ibm-plex/Manifest
index 0d65d9a57de..6001124c8e2 100644
--- a/media-fonts/ibm-plex/Manifest
+++ b/media-fonts/ibm-plex/Manifest
@@ -1,2 +1 @@
-DIST ibm-plex-2.0.0.tar.gz 77698418 BLAKE2B 01f058c285edf28618d2870b6021c3e77aef2719272d8c9a6e1eaa7f3863fb1dd9ac36b32e993e1591b25bd2a2c8bb4369b142d6cc81f866e756c8253f4d38ca SHA512 e76b8435606bf8f7dcaa330d2a861a60f3764886d04f88dceaf4a5a1dcda418df79fcbe9756541539181f35b853ee4ec9d43778338d1af1eb6e51a28cc514bb0
DIST ibm-plex-5.1.3.tar.gz 205796313 BLAKE2B e1ec5212189167203be8dfa7949390dc134f10b759ed90a1595a4266314e8fb2f44e2bb22ac495fa303c3e5f81e6a13c6d4be3b78ddcf47f5d05b932ca4aabc9 SHA512 78006a48b65dba22216dc8cb1fd17313969fac6ca75e139d3963efda2a4f4da2a869146c2c11da033c3119942ffafda027825d0b0cb624594774a409dcfc1266
diff --git a/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild b/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild
deleted file mode 100644
index fe016c87366..00000000000
--- a/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="The package of IBM's typeface"
-HOMEPAGE="https://github.com/IBM/plex"
-SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="otf +ttf"
-
-REQUIRED_USE="^^ ( otf ttf )"
-
-S="${WORKDIR}/${P/ibm-}"
-
-DOCS=( README.md )
-
-FONT_SUFFIX=""
-
-src_install() {
-
-if use otf; then
-
- FONT_SUFFIX+="otf"
-
- FONT_S="
- "${S}"/IBM-Plex-Arabic/fonts/complete/otf
- "${S}"/IBM-Plex-Devanagari/fonts/complete/otf
- "${S}"/IBM-Plex-Mono/fonts/complete/otf
- "${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
- "${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/otf
- "${S}"/IBM-Plex-Sans/fonts/complete/otf
- "${S}"/IBM-Plex-Serif/fonts/complete/otf
- "${S}"/IBM-Plex-Thai/fonts/complete/otf
- "${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/otf"
-fi
-
-if use ttf; then
-
- FONT_SUFFIX+="ttf"
-
- FONT_S="
- "${S}"/IBM-Plex-Arabic/fonts/complete/ttf
- "${S}"/IBM-Plex-Devanagari/fonts/complete/ttf
- "${S}"/IBM-Plex-Mono/fonts/complete/ttf
- "${S}"/IBM-Plex-Sans-Condensed/fonts/complete/ttf
- "${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/ttf
- "${S}"/IBM-Plex-Sans/fonts/complete/ttf
- "${S}"/IBM-Plex-Serif/fonts/complete/ttf
- "${S}"/IBM-Plex-Thai/fonts/complete/ttf
- "${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf"
-fi
-
-font_src_install
-
-}
diff --git a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
index 5c0ab15d593..ae623686c7c 100644
--- a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
+++ b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Hellenisation of the wonderful, monospace, open/free font Inconsolata"
-HOMEPAGE="http://www.cosmix.org/software/"
-SRC_URI="http://www.cosmix.org/software/files/InconsolataHellenic.zip -> ${P}.zip"
+HOMEPAGE="https://www.cosmix.org/software/"
+SRC_URI="https://www.cosmix.org/software/files/InconsolataHellenic.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_S=${S}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/inconsolata-lgc/metadata.xml b/media-fonts/inconsolata-lgc/metadata.xml
index 6614cda1761..9f3a027ee99 100644
--- a/media-fonts/inconsolata-lgc/metadata.xml
+++ b/media-fonts/inconsolata-lgc/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>kitsunenokenja@protonmail.ch</email>
<name>Rob Levitsky</name>
</maintainer>
@@ -9,7 +9,7 @@
<email>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index f087685ae96..61504df547e 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -1,11 +1,12 @@
# Copyright 2008-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="A sans-serif monotype font for code listings"
-HOMEPAGE="https://fonts.google.com/specimen/Inconsolata"
+DESCRIPTION="Sans-serif monotype font for code listings"
+HOMEPAGE="https://fonts.google.com/specimen/Inconsolata?preview.text_type=custom"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
LICENSE="OFL-1.1"
@@ -13,8 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc x86 ~ppc-macos ~x64-macos"
IUSE=""
-FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/${P}"
-
# Only installs fonts
RESTRICT="binchecks strip test"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
deleted file mode 100644
index c5e56719742..00000000000
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta package for infinality-ultimate with fonts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal +latin +free ms"
-
-LANGS="as bn bo brx doi dz gu hi ja km kn ko kok ks mai ml mr ne or pa
- sa sat sd si syc ta te zh"
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
-done
-unset lang LANGS
-
-RDEPEND="media-libs/fontconfig-ultimate
- free? (
- media-fonts/noto
- media-fonts/heuristica
- media-fonts/liberation-fonts
- media-fonts/wqy-microhei
- latin? (
- media-fonts/courier-prime
- media-fonts/dejavu
- media-fonts/signika
- media-fonts/tex-gyre
- !minimal? (
- media-fonts/cantarell
- media-fonts/droid
- media-fonts/font-bh-ttf
- media-fonts/font-cursor-misc
- media-fonts/open-sans
- media-fonts/source-pro
- media-fonts/ubuntu-font-family
- media-fonts/urw-fonts
- )
- )
- l10n_brx? ( media-fonts/lohit-devanagari )
- l10n_doi? ( media-fonts/lohit-devanagari )
- l10n_dz? ( media-fonts/dzongkha-fonts )
- l10n_hi? ( media-fonts/lohit-devanagari )
- l10n_ja? ( media-fonts/ja-ipafonts )
- l10n_km? ( media-fonts/khmer )
- l10n_ko? ( media-fonts/unfonts )
- l10n_kok? ( media-fonts/lohit-devanagari )
- l10n_ks? ( media-fonts/lohit-devanagari )
- l10n_mai? ( media-fonts/lohit-devanagari )
- l10n_mr? ( media-fonts/lohit-devanagari )
- l10n_ne? ( media-fonts/lohit-devanagari )
- l10n_or? ( media-fonts/lohit-odia )
- l10n_sa? ( media-fonts/lohit-devanagari )
- l10n_sat? ( media-fonts/lohit-devanagari )
- l10n_sd? ( media-fonts/lohit-devanagari )
- l10n_si? ( media-fonts/lklug )
- l10n_syc? ( media-fonts/font-misc-meltho )
- !minimal? (
- l10n_as? ( media-fonts/lohit-assamese )
- l10n_bn? ( media-fonts/lohit-bengali )
- l10n_bo? ( media-fonts/tibetan-machine-font )
- l10n_gu? ( media-fonts/lohit-gujarati )
- l10n_ja? (
- media-fonts/ipaex
- media-fonts/koruri
- media-fonts/mplus-fonts
- media-fonts/vlgothic
- )
- l10n_kn? ( media-fonts/lohit-kannada )
- l10n_ko? ( media-fonts/nanum )
- l10n_ml? ( media-fonts/lohit-malayalam )
- l10n_mr? ( media-fonts/lohit-marathi )
- l10n_ne? ( media-fonts/lohit-nepali )
- l10n_pa? ( media-fonts/lohit-gurmukhi )
- l10n_ta? (
- media-fonts/lohit-tamil
- media-fonts/lohit-tamil-classical
- )
- l10n_te? ( media-fonts/lohit-telugu )
- l10n_zh? ( media-fonts/wqy-zenhei )
- )
- )
- ms? (
- media-fonts/corefonts
- !minimal? (
- media-fonts/dejavu
- media-fonts/droid
- media-fonts/inconsolata
- media-fonts/open-sans
- media-fonts/paratype
- )
- )"
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 0d90f41c25c..1ec0361523c 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1 +1,2 @@
DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
+DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
index c22792604c3..93ee81bfb5c 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="public-domain HPND non-free? ( free-noncomm )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="bdf non-free"
DEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
new file mode 100644
index 00000000000..084c018b002
--- /dev/null
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="International X11 fixed fonts"
+HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain HPND GPL-3+-with-font-exception"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="bdf"
+
+BDEPEND="x11-apps/bdftopcf
+ >=x11-apps/mkfontscale-1.2.0"
+
+DOCS=( ChangeLog NEWS README Emacs.ap )
+
+src_configure() {
+ econf \
+ --with-fontdir=/usr/share/fonts/${PN} \
+ --enable-compress="gzip -9" \
+ $(use_with bdf)
+}
+
+src_install() {
+ emake install fontdir="${ED}/usr/share/fonts/${PN}"
+ einstalldocs
+ font_xfont_config
+}
diff --git a/media-fonts/iosevka/iosevka-1.14.1.ebuild b/media-fonts/iosevka/iosevka-1.14.1.ebuild
index c01355ebe22..cd0edc89cc0 100644
--- a/media-fonts/iosevka/iosevka-1.14.1.ebuild
+++ b/media-fonts/iosevka/iosevka-1.14.1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Slender typeface for code, from code"
-HOMEPAGE="https://be5invis.github.io/Iosevka/"
+HOMEPAGE="https://typeof.net/Iosevka/"
SRC_URI="https://github.com/be5invis/${PN}/releases/download/v${PV}/01-${P}.zip
https://github.com/be5invis/${PN}/releases/download/v${PV}/02-${PN}-term-${PV}.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
FONT_S="${S}/ttf"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
index 6ae7dc9a7d7..f3d97e5c607 100644
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ b/media-fonts/ipaex/ipaex-002.01.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit font
+EAPI=7
MY_P="IPAexfont${PV/.}"
+inherit font
DESCRIPTION="Japanese IPA extended TrueType fonts"
-HOMEPAGE="http://ipafont.ipa.go.jp/"
-SRC_URI="http://dl.ipafont.ipa.go.jp/IPAexfont/${MY_P}.zip"
+HOMEPAGE="https://ipafonts.osdn.jp/"
+SRC_URI="https://osdn.mirror.liquidtelecom.com/ipafonts/57330/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="IPAfont"
SLOT="0"
@@ -16,11 +17,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-lin
IUSE=""
RESTRICT="binchecks strip test"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-arch/unzip"
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
-DOCS=( "Readme_${MY_P}.txt" )
+FONT_SUFFIX="ttf"
+
+DOCS=( Readme_${MY_P}.txt )
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index bc498dddca8..294fbf88151 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/h
LICENSE="grass-ipafonts mplus-fonts public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="mirror"
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index bf3c776f1a4..d8f06fd1cd3 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -1,2 +1 @@
-DIST IPAfont00302.zip 20113208 BLAKE2B 25c6e483b08350347dd8ecceaa1ec04cd1e39d9aeaf988e9d4bfdd60614dbcb3b275ee07da1eb26699499b1e9ad661114cd0222fcb32ed183218b30024b212d4 SHA512 58dfbb6b7ae5114aed28588d05d48649a2f216011d7bd2798a62558f1f55c9b998ad510f7b7a0ab9d272f75bdc69de1110bd67205ac61d221b0ce8fd71583685
DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
deleted file mode 100644
index b0f5b1887b8..00000000000
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-MY_P="IPAfont${PV/.}"
-
-DESCRIPTION="TrueType fonts developed by Japanese Information-technology Promotion Agency"
-HOMEPAGE="http://ipafont.ipa.go.jp/"
-SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
-
-LICENSE="IPAfont"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
-
-DOCS=( "Readme_${MY_P}.txt" )
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 49d9a3d1c6f..3d8379098fd 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -1,15 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-
-inherit font
+EAPI=7
+FONT_SUFFIX="ttf"
MY_P="IPAfont${PV/.}"
+inherit font
DESCRIPTION="TrueType fonts developed by Japanese Information-technology Promotion Agency"
HOMEPAGE="http://ipafont.ipa.go.jp/"
SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="IPAfont"
SLOT="0"
@@ -17,12 +18,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
IUSE=""
RESTRICT="binchecks strip"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-arch/unzip"
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
DOCS=( "Readme_${MY_P}.txt" )
diff --git a/media-fonts/ja-ipafonts/metadata.xml b/media-fonts/ja-ipafonts/metadata.xml
index 99d94f24716..5386d971b6f 100644
--- a/media-fonts/ja-ipafonts/metadata.xml
+++ b/media-fonts/ja-ipafonts/metadata.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
-<maintainer type="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index eae2a074589..3986f1a3080 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,2 +1 @@
-DIST jetbrains-mono-2.001.zip 8351990 BLAKE2B cd0eff80f78752ddcd8b7c227dd530057d6e7533ad6b343f403e810f5cf8c6e32c09d503f40336bd926a6ee14b07b5fb8eae7efaaebf37c2e367a5fc9b288e46 SHA512 c47c257b01c50aa77561132993ef07f0b9f244e5040da7a8945c7d9dcdf740e89cd1a130bb81d7caa63d3a579ec74e4af9840c36b6d62601c094b33fdb5e4bb2
-DIST jetbrains-mono-2.210.zip 2664665 BLAKE2B 02e719b7d03d88df6098445dbc1b17735250184b60ba748ba83903b4ad4f59ac3a67cb472e7b6e10ef8351a8ab2ccf0d2188a39003ec8a9cd61f432b0bdb2af4 SHA512 1e0d98b7e8b3f6e115d7a5f3e519483b9d6b2c3e56b55916f4d6dce83f9f1e65303db2d7c44b35de8a7cb25f37d478f0975c874f2a21d44eb1be915be389b408
+DIST jetbrains-mono-2.225.zip 2981614 BLAKE2B 5ac8dff566378da7e9ac23218cdd696be8ff612a7f9b4f87668400c0c0bfb3a1fcff2a2a813a1c7527e1a105125c493e80abe4daefdbcd837ef59492d7bb3e5b SHA512 ce72c2d2a2f769c6b8a9ad70e7e09b82cf66a0928534f18556238e36fec690737c89077f6521a67850bfb0dc79bb2260b5c86ae4134d76b2210755d5053ade0f
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-2.001.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-2.001.ebuild
deleted file mode 100644
index a8bde574ac5..00000000000
--- a/media-fonts/jetbrains-mono/jetbrains-mono-2.001.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="A free and open-source typeface for developers"
-HOMEPAGE="https://www.jetbrains.com/lp/mono/"
-SRC_URI="https://github.com/JetBrains/JetBrainsMono/releases/download/v${PV}/JetBrains.Mono.${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/JetBrains Mono ${PV}/ttf"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-2.210.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild
index 5304e705364..2c294a87a4a 100644
--- a/media-fonts/jetbrains-mono/jetbrains-mono-2.210.ebuild
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-fonts/jetbrains-mono/metadata.xml b/media-fonts/jetbrains-mono/metadata.xml
index c4c2aa2c7ca..a2936dec442 100644
--- a/media-fonts/jetbrains-mono/metadata.xml
+++ b/media-fonts/jetbrains-mono/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>gentoo@taujhe.de</email>
<name>Jan Henke</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
index 59d1cc30fc7..bddc1d5c9c1 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
+FONT_PN="${PN/-fonts/}"
+FONTDIR="/usr/share/fonts/${FONT_PN}"
inherit font font-ebdftopcf
DESCRIPTION="Japanese fixed fonts that cover JIS0213 charset"
@@ -20,20 +22,16 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
mirror://gentoo/A12.bdf.gz
mirror://gentoo/jiskan24-2000-1.bdf.gz
mirror://gentoo/jiskan24-2000-2.bdf.gz"
+S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
RESTRICT="binchecks strip"
-S="${WORKDIR}"
-
-FONT_S="${S}"
-FONT_PN="${PN/-fonts/}"
-FONTDIR="/usr/share/fonts/${FONT_PN}"
-
pkg_postinst() {
+ font_pkg_postinst
if use X; then
elog "You need you add following line into 'Section \"Files\"' in"
elog "XF86Config and reboot X Window System, to use these fonts."
diff --git a/media-fonts/jomolhari/jomolhari-0.003c.ebuild b/media-fonts/jomolhari/jomolhari-0.003c.ebuild
index 3403c17bb32..36bb1740e6a 100644
--- a/media-fonts/jomolhari/jomolhari-0.003c.ebuild
+++ b/media-fonts/jomolhari/jomolhari-0.003c.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari"
-HOMEPAGE="http://chris.fynn.googlepages.com/jomolhari"
+HOMEPAGE="http://www.library.gov.bt/IT/fonts.html"
SRC_URI="mirror://nongnu/free-tibetan/${PN}/${PN}-alpha${PV:(-2)}.tar.gz"
+S="${WORKDIR}"
LICENSE="OFL"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
-S="${WORKDIR}"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
index 914b89f5e70..beacfb23565 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-MY_PN="KacstArabicFonts"
-S=${WORKDIR}/${MY_PN}-${PV}
-
DESCRIPTION="KACST Arabic TrueType Fonts"
-HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot"
+HOMEPAGE="https://www.arabeyes.org/Khotot https://gitlab.com/arabeyes-art/khotot"
SRC_URI="mirror://sourceforge/arabeyes/${P//-/_}.tar.bz2"
-LICENSE="GPL-2"
+S="${WORKDIR}/KacstArabicFonts-${PV}"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86"
IUSE=""
FONT_SUFFIX="ttf"
-
-FONT_S=${S}
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
index 98ca221fbc9..3257c5f73bb 100644
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
+++ b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
@@ -1,15 +1,14 @@
-# Copyright 2009-2019 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit font
-MY_P="KanjiStrokeOrders_v${PV}"
-
DESCRIPTION="Font for viewing stroke order diagrams for kanji, kana and other characters"
HOMEPAGE="https://sites.google.com/site/nihilistorguk/"
-SRC_URI="https://sites.google.com/site/nihilistorguk/${MY_P}.zip"
+SRC_URI="https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${PV}.zip"
+S="${WORKDIR}"
LICENSE="BSD"
SLOT="0"
@@ -17,11 +16,8 @@ KEYWORDS="amd64 arm64 x86"
IUSE=""
RESTRICT="binchecks"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
+DOCS=( readme_en_v${PV}.txt )
-FONT_S="${S}"
FONT_SUFFIX="ttf"
-DOCS="readme_en_v${PV}.txt"
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 2ffb968c5db..90a8a9d7945 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/konfont/konfont-0.1.ebuild b/media-fonts/konfont/konfont-0.1.ebuild
index 63f9462684d..888c3edff09 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/koruri/Manifest b/media-fonts/koruri/Manifest
index f2daa8b3f5a..9dc1b16d413 100644
--- a/media-fonts/koruri/Manifest
+++ b/media-fonts/koruri/Manifest
@@ -1 +1 @@
-DIST Koruri-20161105.tar.xz 4260452 BLAKE2B 1c243192583380e789b3ad02d7eb02c764a8bf963bed0a9d35a7fe0ad6c7fb20549ebbbab9f281e588933f3ca9196f44f9d3a431f96066089f1f43c2f63b08e7 SHA512 edf50be2084bd8b03a5162f5c3ae6e474e45b3b9f2a18ed0b65b1527470a22a2ecacc5b675e396de11d217c057bf8d9ea9842977b6db5d3ee06b0c1c08e472b6
+DIST Koruri-20180915.tar.xz 5185488 BLAKE2B e67e7e21dd6b9a0134f1419a924a264c2b491c1623ef748cdca6756ae4a88655ba6312ab58d0827e96f29e5a47d9aac6f13467289329d4bb0e2c939d70297a56 SHA512 0a78240e75782c07752e29e8591d5eab2b15fd0f784e569c60c438c2a1e49c462fa6e4e1734c1922d8bb0b1eb22fd4c74a71c0c0b7d127fb1d4c410835b98bd7
diff --git a/media-fonts/koruri/koruri-20161105.ebuild b/media-fonts/koruri/koruri-20180915.ebuild
index 4592f678cb8..855e0e29bfa 100644
--- a/media-fonts/koruri/koruri-20161105.ebuild
+++ b/media-fonts/koruri/koruri-20180915.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-MY_P="Koruri-${PV}"
DESCRIPTION="Japanese TrueType font based on M+ outline fonts and Open Sans"
-HOMEPAGE="http://sourceforge.jp/projects/koruri/"
-SRC_URI="mirror://sourceforge.jp/${PN}/66647/${MY_P}.tar.xz"
+HOMEPAGE="https://koruri.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN^}/releases/download/${P^}/${P^}.tar.xz"
+S="${WORKDIR}/${P^}"
LICENSE="mplus-fonts Apache-2.0"
SLOT="0"
@@ -16,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
# Only installs fonts
RESTRICT="binchecks strip"
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
+DOCS=( README{_{E,J}.mplus,_ja.md,.md} )
+
FONT_SUFFIX="ttf"
-DOCS="README*"
diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
index 0ca9ecfb3c0..c63a906d7f0 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
index 51a641d3a3c..19ed0e03a33 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index bf7b37ce351..0f8f340071a 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,4 +1,4 @@
-DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
-DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
+DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3cd75923bd77dca5d42ae3fa4fbe7be9fea104779caadcccaf2608dc6423bddb3abd199defcaae3161ecd997268078b6781e SHA512 826c002008c2c753957ae4228d8e5dac5b1de995eb7cf392e9cbef9a23bb438ff56303bb9e8ee45a52fb9797e5685b89749f6a689413537f9cc7ee8067dea463
DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
+DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
index 817ed2e44f8..9ea3d0c0017 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit font python-any-r1
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/${PN}-ttf-${PV}.tar.gz )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
SLOT="0"
LICENSE="OFL-1.1"
IUSE="fontforge X"
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index 3c52a413c6c..50e68dfeca1 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit font python-any-r1
DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178407/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178448/${P}.tar.gz )"
+SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/${P}.tar.gz )
+ !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
+"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
SLOT="0"
LICENSE="OFL-1.1"
IUSE="fontforge X"
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
deleted file mode 100644
index 44f9d6c23dd..00000000000
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_DATE=$(get_version_component_range 4)
-MY_PV=$(get_version_component_range 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
-MY_P_OTF="LinLibertineOTF_${MY_PV}"
-
-DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
-SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz"
-
-LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<x11-libs/pango-1.20.4"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
index a8f4468ac7d..f51440c557a 100644
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
+++ b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eapi7-ver font
+EAPI=7
MY_DATE=$(ver_cut 4)
MY_PV=$(ver_cut 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
MY_P_OTF="LinLibertineOTF_${MY_PV}"
MY_P_TTF="LinLibertineTTF_${MY_PV}"
+inherit font
+
DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
+HOMEPAGE="http://libertine-fonts.org/"
SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz
mirror://sourceforge/linuxlibertine/${MY_P_TTF}.tgz"
+S="${WORKDIR}"
LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
SLOT="0"
@@ -21,7 +23,6 @@ IUSE=""
RDEPEND="!<x11-libs/pango-1.20.4"
-S="${WORKDIR}"
-FONT_S="${S}"
+DOCS=( Bugs.txt ChangeLog.txt README Readme-TEX.txt )
+
FONT_SUFFIX="otf ttf"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
diff --git a/media-fonts/lklug/lklug-0.6-r1.ebuild b/media-fonts/lklug/lklug-0.6-r1.ebuild
index 956e033f45d..4baad572e76 100644
--- a/media-fonts/lklug/lklug-0.6-r1.ebuild
+++ b/media-fonts/lklug/lklug-0.6-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+MY_P="ttf-sinhala-${P}"
inherit font
-MY_P="ttf-sinhala-${P}"
-DESCRIPTION="Sinhala font"
-HOMEPAGE="http://sinhala.sourceforge.net"
+DESCRIPTION="Unicode Sinhala font"
+HOMEPAGE="http://sinhala.sourceforge.net/"
SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
IUSE=""
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
+DOCS=( README.fonts )
FONT_SUFFIX="ttf"
-
-DOCS="README.fonts"
diff --git a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
index 3e93523f739..10b7d1a0de6 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Assamese font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
index 78e6c4cecee..ce13de591d7 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Bengali font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
index e5f5e8cf1fd..7da3d3f1429 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Devanagari font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index c1300771e5d..35ead3b019c 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://pagure.io/lohit"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RDEPEND="
diff --git a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
index d4d31fedb1e..10e584ffc13 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Gujarati font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
index 0fe2a51e4f8..fca948b40ba 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Gurmukhi font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
index f415e1fb35a..3121fb2f599 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Kannada font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
index 24d092b2d27..3a42dfcaaa9 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Malayalam font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "67-${PN}.conf" )
diff --git a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
index cde480f7c8b..91a79b43c82 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -1,24 +1,23 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Marathi font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
-IUSE=""
-
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "65-0-${PN}.conf" )
diff --git a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
index ee6bf1238e3..97fbbcf1990 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Nepali font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "65-0-${PN}.conf" )
diff --git a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
index e7866074d34..802e5e4b9da 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Odia font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
index 0c12137d3e0..dc6d9b3252b 100644
--- a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
+++ b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Tamil Classical font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
index 9977147a272..58c60bd359c 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Tamil font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
index 4035906dae2..eb050ad6dc5 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
+
FONTDIR="/usr/share/fonts/indic/${PN}"
FONT_SUFFIX="ttf"
+inherit font
DESCRIPTION="The Lohit Telugu font"
HOMEPAGE="https://pagure.io/lohit"
SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
index eff41885b6c..7d5a9676fe9 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index 373b73b4a53..f380eda5d59 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P/-ttc/}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 3efd878526f..cb5f1c11dbe 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/mikachan/5513/${MY_PN}-${PV}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index da66cb1fc35..8ceffc47c53 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit font
+EAPI=7
MY_PV="${PV/_p/-}"
+inherit font
DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
+HOMEPAGE="https://mix-mplus-ipa.osdn.jp/"
SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1p-${MY_PV}.zip
mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2m-${MY_PV}.zip
@@ -16,21 +16,17 @@ SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1c-${MY_PV}.zip
mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1m-${MY_PV}.zip
mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-2m-${MY_PV}.zip"
+S="${WORKDIR}"
LICENSE="mplus-fonts IPAfont"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
src_prepare() {
default
- mv */*.${FONT_SUFFIX} "${FONT_S}" || die
+ mv */*.${FONT_SUFFIX} . || die
}
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index 4c5c61053b5..23269cffe90 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit font
-
MY_P="${P/_/}"
+inherit font
DESCRIPTION="Japanese bitmap and TrueType fonts suitable for browsing 2ch"
-HOMEPAGE="http://monafont.sourceforge.net"
+HOMEPAGE="http://monafont.sourceforge.net/"
SRC_URI="
mirror://sourceforge/${PN}/${MY_P}.tar.bz2
truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
+S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="truetype"
# Only installs fonts
RESTRICT="strip binchecks"
@@ -24,9 +24,8 @@ BDEPEND="
app-arch/unzip
dev-lang/perl
x11-apps/bdftopcf
- x11-apps/mkfontscale"
-
-S="${WORKDIR}/${MY_P}"
+ x11-apps/mkfontscale
+"
FONT_S="${WORKDIR}"
FONT_SUFFIX="ttf"
@@ -50,15 +49,16 @@ src_install() {
insinto "${FONTDIR}"
newins fonts.alias.mona fonts.alias
- dodoc README*
+ dodoc README.{ascii,euc}
if use truetype; then
- DOCS="${WORKDIR}/README-ttf.txt"
+ local DOCS=( ${WORKDIR}/README-ttf.txt )
font_src_install
fi
}
pkg_postinst() {
+ font_pkg_postinst
elog
elog "You need to add following line into 'Section \"Files\"' in"
elog "XF86Config and reboot X Window System, to use these fonts."
diff --git a/media-fonts/monoid/monoid-0.61.ebuild b/media-fonts/monoid/monoid-0.61.ebuild
index 3db014349c3..8f52ecfc8b7 100644
--- a/media-fonts/monoid/monoid-0.61.ebuild
+++ b/media-fonts/monoid/monoid-0.61.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
inherit font
@@ -13,10 +13,8 @@ LICENSE="MIT OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT="binchecks strip"
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
FONT_SUFFIX="ttf"
-DOCS="Readme.md"
+DOCS=( Readme.md )
diff --git a/media-fonts/montecarlo/montecarlo-0-r1.ebuild b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
index 7f66d5da210..f3a420781b3 100644
--- a/media-fonts/montecarlo/montecarlo-0-r1.ebuild
+++ b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+MY_PN="MonteCarlo"
inherit font
-MY_PN="MonteCarlo"
-DESCRIPTION="monospace font, created by programmers, for programmers"
-HOMEPAGE="http://www.bok.net/MonteCarlo/"
-SRC_URI="http://www.bok.net/${MY_PN}/downloads/${MY_PN}-PCF.tgz
- bdf? ( http://www.bok.net/${MY_PN}/downloads/${MY_PN}-BDF.tgz )"
+DESCRIPTION="Monospace font, created by programmers, for programmers"
+HOMEPAGE="https://www.bok.net/MonteCarlo/"
+SRC_URI="https://www.bok.net/${MY_PN}/downloads/${MY_PN}-PCF.tgz
+ bdf? ( https://www.bok.net/${MY_PN}/downloads/${MY_PN}-BDF.tgz )"
+S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bdf"
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
src_install() {
insinto /usr/share/fonts/${PN}/
doins "${MY_PN}"-PCF/*
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index fdaf4477a38..7df74fe1160 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-FONT_PN=mplus
-
-inherit font
+EAPI=7
+FONT_PN=mplus
MY_P="mplus_bitmap_fonts-${PV}"
+inherit font
DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
+HOMEPAGE="https://mplus-fonts.osdn.jp/about-en.html"
SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="mplus-fonts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="X"
-DEPEND=">=x11-apps/mkfontscale-1.2.0
- x11-apps/bdftopcf"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
# Only installs fonts
RESTRICT="strip binchecks"
+BDEPEND="
+ x11-apps/bdftopcf
+ >=x11-apps/mkfontscale-1.2.0
+"
+
src_install() {
DESTDIR="${D}${FONTDIR}" ./install_mplus_fonts || die
dodoc README* INSTALL*
diff --git a/media-fonts/mplus-outline-fonts/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index 4717c3253b5..a862cbd4b3f 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -1,2 +1 @@
-DIST mplus-TESTFLIGHT-063.tar.xz 10346584 BLAKE2B d053992dc6b1220361f91d9482eeea11bc32ec1989ef9b99e178f3f229c84f1d232111b7a97df195473bd957eccc973a0233da5263038e6beaf4a9ff64ff0cd7 SHA512 477b9669c14dfb10321b5986dece72fb44a2554ff6c9239ccfadf21643714984ee7fd1e42c9c7982fa17417dee0e7ef6b5d66fc7cceec05298add4ae3d9502fa
DIST mplus-TESTFLIGHT-063a.tar.xz 10371708 BLAKE2B 0821600576564bbbd5b49ac0a268502e8ab77fc11d2a37c00d1ca75097c9385c340e8aceb14633aee759a608740cd02b6eba6892cb607f464703dba7dfcd3312 SHA512 bd491a71c63679977e09cbc3aef6035022299c4330b7799a879029d4c9d3ba9fed91e8bacc0aab190035fa288173e1a056dadec001b515bb3e47e77f9ece6002
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
deleted file mode 100644
index 3fb8501f8f7..00000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-
-DESCRIPTION="M+ Japanese outline fonts"
-HOMEPAGE="http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
-
-LICENSE="mplus-fonts ipafont? ( IPAfont )"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc x86 ~ppc-macos"
-IUSE="ipafont"
-RESTRICT="binchecks strip"
-
-DEPEND="ipafont? (
- media-gfx/fontforge
- media-fonts/ja-ipafonts
- )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="README_J README_E"
-
-IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
- if use ipafont; then
- cp -p "${IPAFONT_DIR}"/ipag.ttf "${S}" || die
- fi
- default
-}
-
-src_compile() {
- if use ipafont; then
- fontforge -script m++ipa.pe || die
- rm -f ipag.ttf
- fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
index 2ddd4e3cbe3..5ebea0ff9e7 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit font
@@ -9,31 +9,31 @@ MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
MY_P="${MY_P/_p1/a}"
DESCRIPTION="M+ Japanese outline fonts"
-HOMEPAGE="http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/"
+HOMEPAGE="https://mplus-fonts.osdn.jp/about-en.html"
SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
LICENSE="mplus-fonts ipafont? ( IPAfont )"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc x86 ~ppc-macos"
IUSE="ipafont"
RESTRICT="binchecks strip"
-DEPEND="ipafont? (
- media-gfx/fontforge
+BDEPEND="
+ ipafont? (
media-fonts/ja-ipafonts
+ media-gfx/fontforge
)"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+
+DOCS=( README_J README_E )
FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="README_J README_E"
IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
src_prepare() {
if use ipafont; then
- cp -p "${IPAFONT_DIR}"/ipag.ttf "${S}" || die
+ cp -p "${IPAFONT_DIR}"/ipag.ttf . || die
fi
default
}
@@ -41,6 +41,6 @@ src_prepare() {
src_compile() {
if use ipafont; then
fontforge -script m++ipa.pe || die
- rm -f ipag.ttf
+ rm -f ipag.ttf || die
fi
}
diff --git a/media-fonts/nanum/nanum-3.0.ebuild b/media-fonts/nanum/nanum-3.0.ebuild
index 7c16d14e20b..a99ec20c0aa 100644
--- a/media-fonts/nanum/nanum-3.0.ebuild
+++ b/media-fonts/nanum/nanum-3.0.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
inherit font
-DESCRIPTION="The Nanum Korean fonts distributed by Naver"
-HOMEPAGE="http://hangeul.naver.com/2014/nanum"
+DESCRIPTION="Korean fonts distributed by Naver"
+HOMEPAGE="https://hangeul.naver.com/2017/nanum"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT="binchecks strip"
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
index 800a4d275ad..8237555a800 100644
--- a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
+++ b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-MY_P="NanumGothicCoding-${PV}"
DESCRIPTION="Korean monospace font distributed by NHN"
-HOMEPAGE="http://dev.naver.com/projects/nanumfont"
-SRC_URI="http://dev.naver.com/frs/download.php/441/${MY_P}.zip"
+HOMEPAGE="https://developers.naver.com/projects/nanumfont"
+SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-${PV}.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
@@ -18,11 +18,7 @@ IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
+BDEPEND="app-arch/unzip"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml
index f2387332549..cc081897d48 100644
--- a/media-fonts/noto-cjk/metadata.xml
+++ b/media-fonts/noto-cjk/metadata.xml
@@ -5,8 +5,4 @@
<email>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
</pkgmetadata>
diff --git a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
index 374927cc510..cda442f4370 100644
--- a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+COMMIT="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
inherit font
DESCRIPTION="Google's CJK font family"
HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk"
-
-COMMIT="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="OFL-1.1"
SLOT="0"
@@ -17,11 +18,5 @@ IUSE=""
RESTRICT="binchecks strip"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
+FONT_CONF=( "${FILESDIR}/70-noto-cjk.conf" ) # From ArchLinux
FONT_SUFFIX="ttc"
-FONT_CONF=(
- # From ArchLinux
- "${FILESDIR}/70-noto-cjk.conf"
-)
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
index e737b19a258..84b1ddb0713 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit font python-any-r1
diff --git a/media-fonts/noto-emoji/noto-emoji-20200916.ebuild b/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
index 1fc1015e2b9..3e3fc27ca1e 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..8} )
inherit font python-any-r1
diff --git a/media-fonts/noto-emoji/noto-emoji-20201214.ebuild b/media-fonts/noto-emoji/noto-emoji-20201214.ebuild
index 09c3fcc8cf4..52d7496927f 100644
--- a/media-fonts/noto-emoji/noto-emoji-20201214.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20201214.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit font python-any-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> $
LICENSE="Apache-2.0 OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="buildfont"
BDEPEND="
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 38abdcf1b74..5d622563cb1 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,3 +1,2 @@
-DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
-DIST noto-20200308.tar.gz 853685953 BLAKE2B 1f25bf1b763161fc246b0a1ed532d4755e4ef441055d92a8a17a05331bbbe47b4f604492e0403088d5aac9a86e42b27354eb7d4c9bc6286853ce1562b7940344 SHA512 9afec0c150beeb2bb27af58b9118da4bf86a21f25b573be3a01186c0295b9d5f51918d9237fafc76a0388c87a2b8fd780ba450fb8b4c3e65addad729e8f56a9f
DIST noto-20200521.tar.gz 861394318 BLAKE2B e30f7ec58130786414f2dd33acaf9c75f403718612270e346fe51df0cb74088ddc34b699d4af9a494446940aa58a4c2cd043f46208aa7a3004a194703efb464a SHA512 d1090eae56c74237da4e35989d3518dfcb163deee1eb4df64a6be0ccb7e6f2a2207f0602ee5f0156efa2bdb3d105073d2e9a65c8841dbab34207c89c05aeb8bc
+DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
deleted file mode 100644
index a359d571698..00000000000
--- a/media-fonts/noto/noto-20190524.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="34e98229863e627d0f841e124a8657d5d0348b04"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://www.google.com/get/noto/
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
- # From ArchLinux
- "${FILESDIR}/66-noto-serif.conf"
- "${FILESDIR}/66-noto-mono.conf"
- "${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
- # Don't install in separate subdirs
- FONT_S="${S}/unhinted/" font_src_install
- FONT_S="${S}/hinted/" font_src_install
-
- # Allow to drop some fonts optionally for people that want to save
- # disk space. Following ArchLinux options.
- use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
-}
diff --git a/media-fonts/noto/noto-20200308.ebuild b/media-fonts/noto/noto-20201226.ebuild
index 4100a27916b..3de653965aa 100644
--- a/media-fonts/noto/noto-20200308.ebuild
+++ b/media-fonts/noto/noto-20201226.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit font
DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts"
-COMMIT="1c9f53362889d4468fd1193b76c397c208d81da8"
+COMMIT="2b1fbc36600ccd8becb9f894922f644bff2cbc9b"
SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
# Extra allows to optionally reduce disk usage even returning to tofu
# issue as described in https://www.google.com/get/noto/
IUSE="cjk +extra"
@@ -34,8 +34,8 @@ FONT_CONF=(
src_install() {
mkdir install-unhinted install-hinted || die
- mv unhinted/*/* install-unhinted/. || die
- mv hinted/*/* install-hinted/. || die
+ mv unhinted/ttf/Noto*/*.tt[fc] install-unhinted/. || die
+ mv hinted/ttf/Noto*/*.tt[fc] install-hinted/. || die
FONT_S="${S}/install-unhinted/" font_src_install
FONT_S="${S}/install-hinted/" font_src_install
diff --git a/media-fonts/nunito/nunito-1.0-r1.ebuild b/media-fonts/nunito/nunito-1.0-r1.ebuild
index 619be073efb..39f75af1128 100644
--- a/media-fonts/nunito/nunito-1.0-r1.ebuild
+++ b/media-fonts/nunito/nunito-1.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A Sans Serif font with rounded terminals"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Nunito https://github.com/vernnobile/NunitoFont"
+DESCRIPTION="Sans Serif font with rounded terminals"
+HOMEPAGE="https://fonts.google.com/specimen/Nunito?preview.text_type=custom
+ https://github.com/vernnobile/NunitoFont"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
LICENSE="OFL-1.1"
@@ -14,7 +15,4 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
-RDEPEND=""
-
FONT_SUFFIX="ttf"
diff --git a/media-fonts/nuosu-sil/Manifest b/media-fonts/nuosu-sil/Manifest
index 8fbdc6b902a..5d9fe3ca9ba 100644
--- a/media-fonts/nuosu-sil/Manifest
+++ b/media-fonts/nuosu-sil/Manifest
@@ -1 +1 @@
-DIST nuosu-sil-2.1.1.zip 240011 BLAKE2B 0c5ddb764a54b2695dda4d1e7401e1ba6c3a72f4d7472bd5e94840c0b23dd1cfb37ed136c2253b556d14b4d7a2199a40a67b37cdd679c334f8362a79850e12c7 SHA512 6ef47c4c042a4dca60d3af8028bf41a5528f28b6d37b7d4e578c64d8f864a83a95f4240d5597e4c1cb74bf4d6ee66a05a558b06ac1c4b9e4e2fdf3930e420b57
+DIST NuosuSIL-2.200.zip 160601 BLAKE2B 61fcc33b91ee66f96ee1f7efe96c94970278645480fc6abccd6c95853e9e35af709a993af74a36d8d9a9f86bc2fd5b32a74031b9062e08b001a79d166c50fba8 SHA512 da5ba1dcbaa6cf18bb78b2720a53c453d94044d9de158fe394e26a6e6e18773c35b6073abb90b3b08e720b7105d06ca6388b7257cdd8b30d82b3b4013bd16513
diff --git a/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild b/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild
deleted file mode 100644
index e58ca1297b9..00000000000
--- a/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Unicode font for the standardized Yi script"
-HOMEPAGE="http://scripts.sil.org/SILYi_home"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=NuosuSIL${PV}.zip&filename=NuosuSIL${PV}.zip -> ${P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/NuosuSIL"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild b/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild
new file mode 100644
index 00000000000..2e56df5b26f
--- /dev/null
+++ b/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Unicode font for the standardized Yi script"
+HOMEPAGE="https://software.sil.org/nuosu/"
+SRC_URI="https://software.sil.org/downloads/r/nuosu/NuosuSIL-${PV}.zip"
+S="${WORKDIR}/NuosuSIL-${PV}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/ohsnap/ohsnap-1.8.0.ebuild b/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
index a67f71a3c09..2652a86162e 100644
--- a/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
+++ b/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="The ohsnap / osnap monospace font (based on Artwiz Snap)"
+DESCRIPTION="Monospace font based on Artwiz Snap with bold and versions with status icons"
HOMEPAGE="https://sourceforge.net/projects/osnapfont"
SRC_URI="mirror://sourceforge/osnapfont/${P}.tar.gz"
@@ -14,4 +15,5 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
FONT_SUFFIX="pcf"
-DOCS="README.ohsnap"
+
+DOCS=( README.ohsnap )
diff --git a/media-fonts/oldstandard/oldstandard-2.2.ebuild b/media-fonts/oldstandard/oldstandard-2.2.ebuild
index ece12183130..1d5406fbce4 100644
--- a/media-fonts/oldstandard/oldstandard-2.2.ebuild
+++ b/media-fonts/oldstandard/oldstandard-2.2.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+FONT_S="${WORKDIR}"
+FONT_SUFFIX="otf ttf"
inherit font
DESCRIPTION="Old Standard - font with wide range of Latin, Greek and Cyrillic characters"
HOMEPAGE="http://www.thessalonica.org.ru/en/fonts.html"
SRC_URI="http://www.thessalonica.org.ru/downloads/${P}.otf.zip
http://www.thessalonica.org.ru/downloads/${P}.ttf.zip"
+S="${WORKDIR}"
LICENSE="OFL"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="otf ttf"
DOCS=( OFL.txt OFL-FAQ.txt FONTLOG.txt )
diff --git a/media-fonts/open-sans/metadata.xml b/media-fonts/open-sans/metadata.xml
index d0f1df7c94c..8b3b4d92532 100644
--- a/media-fonts/open-sans/metadata.xml
+++ b/media-fonts/open-sans/metadata.xml
@@ -1,8 +1,9 @@
<?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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index c4e5872d1e1..3ed819be025 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
HOMEPAGE="https://www.opensans.com/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
# renamed from unversioned google zip
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+
+BDEPEND="app-arch/unzip"
-DEPEND="app-arch/unzip"
-S=${WORKDIR}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/open-sans-1.ebuild b/media-fonts/open-sans/open-sans-1.ebuild
deleted file mode 100644
index 451f8c72aea..00000000000
--- a/media-fonts/open-sans/open-sans-1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
-HOMEPAGE="https://www.opensans.com/"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
-# renamed from unversioned google zip
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/opendesktop-fonts/metadata.xml b/media-fonts/opendesktop-fonts/metadata.xml
index 99d94f24716..5386d971b6f 100644
--- a/media-fonts/opendesktop-fonts/metadata.xml
+++ b/media-fonts/opendesktop-fonts/metadata.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
-<maintainer type="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index 235577e63fa..95ca8328ef3 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
+FONT_SUFFIX="ttf ttc"
inherit font
DESCRIPTION="Chinese TrueType Fonts"
@@ -12,16 +13,16 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
-FONT_SUFFIX="ttf ttc"
-FONT_S="${S}"
FONT_CONF=(
"69-odofonts.conf"
"80-odofonts-original.conf"
"80-odofonts-simulate-MS-simplified-chinese.conf"
"80-odofonts-simulate-MS-triditional-chinese.conf"
)
-DOCS="AUTHORS Changelog*"
-PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )
+
+DOCS=( AUTHORS Changelog Changelog.zh_TW )
+
+PATCHES=( "${FILESDIR}"/${P}-multivalue.patch )
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
deleted file mode 100644
index d06e311225a..00000000000
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit font
-
-DESCRIPTION="Chinese TrueType Fonts"
-#HOMEPAGE="http://www.opendesktop.org.tw/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Arphic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
-IUSE=""
-
-FONT_SUFFIX="ttf ttc"
-FONT_S="${S}"
-FONT_CONF=(
- "69-odofonts.conf"
- "80-odofonts-original.conf"
- "80-odofonts-simulate-MS-simplified-chinese.conf"
- "80-odofonts-simulate-MS-triditional-chinese.conf"
-)
-DOCS="AUTHORS Changelog*"
diff --git a/media-fonts/paratype-astra/paratype-astra-1001.ebuild b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
index 2a92f59970d..16fbe28d6ba 100644
--- a/media-fonts/paratype-astra/paratype-astra-1001.ebuild
+++ b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="ParaType Astra Sans/Serif fonts metrically compatible with Times New Roman"
-
HOMEPAGE="https://www.paratype.ru/cinfo/news.asp?NewsId=3469"
SRC_URI="http://astralinux.com/images/fonts/PTAstraSans&Serif_TTF_ver${PV}.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_S=${WORKDIR}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/paratype/paratype-2.5.ebuild b/media-fonts/paratype/paratype-2.5.ebuild
index 17871600943..284d6c59c1d 100644
--- a/media-fonts/paratype/paratype-2.5.ebuild
+++ b/media-fonts/paratype/paratype-2.5.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit font
DESCRIPTION="ParaType font collection for languages of Russia"
-HOMEPAGE="https://www.paratype.com/public/"
+HOMEPAGE="https://company.paratype.com/pt-sans-pt-serif"
SRC_URI="https://www.paratype.ru/uni/public/PTSansOFL.zip -> ${P}_Sans.zip
https://www.paratype.ru/uni/public/PTSerifOFL.zip -> ${P}_Serif.zip
https://www.paratype.ru/uni/public/PTMonoOFL.zip -> ${P}_Mono.zip"
+S="${WORKDIR}"
+
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_S=${WORKDIR}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index 7eab5517e19..492fe348bc1 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.tsg.ne.jp/GANA/S/pcf2bdf/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
IUSE=""
S=${WORKDIR}
diff --git a/media-fonts/pigiarniq/pigiarniq-2.ebuild b/media-fonts/pigiarniq/pigiarniq-2.ebuild
index 8728ac685d8..032b539e564 100644
--- a/media-fonts/pigiarniq/pigiarniq-2.ebuild
+++ b/media-fonts/pigiarniq/pigiarniq-2.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
DESCRIPTION="Nunavut's official Inuktitut font"
HOMEPAGE="http://www.ch.gov.nu.ca/en/ComputerTools.aspx"
SRC_URI="http://ch.gov.nu.ca/fonts/pigiarniq.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_S=${WORKDIR}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/polarsys-b612-fonts/metadata.xml b/media-fonts/polarsys-b612-fonts/metadata.xml
index 8503115f591..b5e6c15c720 100644
--- a/media-fonts/polarsys-b612-fonts/metadata.xml
+++ b/media-fonts/polarsys-b612-fonts/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>gentoo@taujhe.de</email>
<name>Jan Henke</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003-r1.ebuild
index e09b9c12ea6..584920e558c 100644
--- a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
+++ b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font vcs-snapshot
@@ -9,10 +9,9 @@ DESCRIPTION="Font designed for aircraft cockpit displays"
HOMEPAGE="https://b612-font.com/"
SRC_URI="https://git.polarsys.org/c/b612/b612.git/snapshot/b612-bd14fde2544566e620eab106eb8d6f2b7fb1347e.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="EPL-1.0"
+LICENSE="EPL-1.0 BSD OFL-1.1" # to be clarified #746725
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
FONT_S="${S}/TTF"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008-r1.ebuild
index b2c835d0e4a..67486e105d5 100644
--- a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild
+++ b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
@@ -9,10 +9,9 @@ DESCRIPTION="Font designed for aircraft cockpit displays"
HOMEPAGE="https://b612-font.com/"
SRC_URI="https://github.com/polarsys/b612/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="OFL-1.1"
+LICENSE="EPL-1.0 BSD OFL-1.1" # to be clarified #746725
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
S="${WORKDIR}/b612-${PV}"
FONT_S="${S}/fonts/ttf"
diff --git a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
index 535d0df3fae..bdc339020b7 100644
--- a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
+++ b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,8 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="doc"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
S="${WORKDIR}"
FONT_S="${WORKDIR}"
diff --git a/media-fonts/powerline-symbols/Manifest b/media-fonts/powerline-symbols/Manifest
index fdb2f131666..18f01fd4238 100644
--- a/media-fonts/powerline-symbols/Manifest
+++ b/media-fonts/powerline-symbols/Manifest
@@ -1,2 +1 @@
-DIST powerline-symbols-20150224.tar.xz 3972 BLAKE2B 94ce0e0f8ccd8e8be451c1e85f7b0ecc06a1b9d4513e40e7b80e0ef584109de96922d9211f2adf04fcc3c87ca9e450d5d2764787c762c19bd78c67fdded11f3e SHA512 85a4edefa692a7e28fd91c8d34c33b70424bee105f807aa1dcc182f64df3a66a29dd400892313b0d8ead59f9883e14f47c1a1afbf18af317b93f6aefb977c031
DIST powerline-symbols-20170508.tar.xz 4028 BLAKE2B f0ad0360fb1bfe2c160c531a8ce473bdc746800c4540e56c8a1c27500883922c67354d9d7d8478a9111d56bace51a730ac9683e6e21be112df7d0df288f7cf0b SHA512 6908cb029b28002021530ea330c9ce5626f6bc5ed2336750cd2678f4b314d043289e29ebea61003836bb0cbca9bbb91a1b748f1cf24e4f07932eaf18bf28eac5
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
deleted file mode 100644
index f03cb115598..00000000000
--- a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
-HOMEPAGE="https://github.com/powerline/powerline"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-# We're redistributing just the (unversioned) font from the upstream repo here
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index edcc228cf76..7a2d0156245 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
@@ -11,10 +12,10 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
LICENSE="MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
-FONT_S="${S}"
-FONT_SUFFIX="otf"
FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
+FONT_SUFFIX="otf"
+
+DOCS=( README.rst )
diff --git a/media-fonts/qomolangma/qomolangma-2012.05.ebuild b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
index c726a538fa5..974b66ea148 100644
--- a/media-fonts/qomolangma/qomolangma-2012.05.ebuild
+++ b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Tibetan Unicode Ucan and Umed fonts"
HOMEPAGE="http://www.yalasoo.com/English/docs/yalasoo_en_font.html"
SRC_URI="http://www.yalasoo.com/files/CTRCfonts.rar -> ${P}.rar"
+S="${WORKDIR}"
LICENSE="free-noncomm"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
-DEPEND="|| ( app-arch/unrar app-arch/rar )"
+BDEPEND="|| ( app-arch/unrar app-arch/rar )"
-S=${WORKDIR}
-FONT_S=${S}
FONT_SUFFIX="ttf"
diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index efa31d90a6c..2b5cb7e4844 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -1,8 +1,3 @@
-DIST quivira-4.0-Combining.pdf 311026 BLAKE2B 98544081c6effef9ac7cc535507fda6af8dc9d72ac4653faeba3e578387596a9dfeda3944b42be354861dfef4c68288768e609351cc1c86d677fac94118af5cf SHA512 f904b8587623782093db25d2a069e32ba671f6f1a60ea3b8c8374ede3f48ab0daaa2e0cdff5acc72e97422c00c4f7286a2fe9503960d666429073379282aab9c
-DIST quivira-4.0-PUA.pdf 354040 BLAKE2B 9710d626ee104eed3758702b3c1b668f22ced8e38d822a6e084f71da15e455b06ac31b4b3557a2a1a8cdf404195ccd315f3a78bf3f9be489aae294152cbaa289 SHA512 a07a41e1e0027a03f7f1f4e81ddfb50b09a8dfad4f1342a32aab71505e6ce9ef2a7a8733145887651b20dd472c58b4167faa34945f8ca61bc4e016859a65cbba
-DIST quivira-4.0-Testpage.pdf 822289 BLAKE2B 9515a8dff0178638566af96b23af533b11cdde5a5399d0ad599bf1d86b0aa9d8f8fb11ea01f4c05bb15136b3f924606e9bed57e2dd3e5a11d05f8a0441cd6a0f SHA512 8ed238c9aa03544308dcd471eb6145aa81423a6877a2a5e6d1022277545317568ba642871eb2f3c03c38a9d3030e3f94d8c30469b6c331eaed553b81db154585
-DIST quivira-4.0.otf 1475236 BLAKE2B a42490f1ae75912b217993615b5bb3904c2a96200dde4c5d209a3dd6e25232ab74b2dd38e89f8025f8400620f69ebd7b9fb845fa46a94f198cfb47cbef3d66f3 SHA512 2887152660a8908947c1baa83025c408ac11139067278bce6c8a789d846cf764b9a464dc678ee6acc2b555c9f0d40be3464ac102a97fac8aa9bc04acf926f1b6
-DIST quivira-4.0.pdf 3877062 BLAKE2B 5147d57277be608aea1e250df26fddb5c6e3b9bf201c47d1ef23cde50d8b8d68b59d7a2362dffbfa6aeae4d95adc7616a69d8688fc87f11d8513b74673ddfd5b SHA512 38469819d0b8e062ac2b4f35ef5d8be300ea36645ffc7841428015191d129e1239ec0dff1605cfa0af76fd32ee1e590ed4a146117408afaa9a826328115db4a7
DIST quivira-4.1-Combining.pdf 152768 BLAKE2B 4b0bd89ca5077d57c6643036343b79a460c9215a70cb4a11642a7275c0d2304b0893dfb3aa6abe2dcf8fcd18abe1d508b0ca371c81132b020128cbf53e890d9f SHA512 87bc7bdc5e0c4584c70d65268305d1e6fbc11ba53dea37f958175140934e90d224d9d6764d693f5a5b8dbe888b547dd862f73b6f99381294ea9fd9be079d716d
DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06756277f8eb266b1d2fccd36f148c549d24d30752b64112bdebf9bf0ff6419e0013e46d3b1f4cd6f68e19229d SHA512 9f235e0ff48fbf0d8ff024640a9cd0e408a648b0fba0fc37cda7aaf9b5c7c9bb106d5a0ac82381d1d960068da01e56dd255c883da48b3d3d9120f8b9ff451324
DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
deleted file mode 100644
index edea0e21cfb..00000000000
--- a/media-fonts/quivira/quivira-4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/q/Q}"
-
-inherit font
-
-DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
-HOMEPAGE="http://www.quivira-font.com/"
-SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
- doc? ( http://www.quivira-font.com/files/${MY_PN}.pdf -> ${P}.pdf
- http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
- http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
- http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-
-src_prepare() {
- cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
- if use doc; then
- DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
- cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
- cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
- cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
- cp "${DISTDIR}"/${P}-PUA.pdf "${S}"/${MY_PN}PUA.pdf || die
- fi
-}
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 8ae94696b6b..26c1d7afa8c 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+FONT_SUFFIX="otf"
MY_PN="${PN/q/Q}"
-
inherit font
DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
@@ -14,19 +14,19 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
+LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 arm ppc x86"
IUSE="doc"
S="${WORKDIR}"
-FONT_SUFFIX="otf"
src_prepare() {
+ default
cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
if use doc; then
- DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
+ DOCS=( ${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf )
cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
diff --git a/media-fonts/ricty/ricty-3.2.0-r2.ebuild b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
index 40fca3d3a27..1206fcf0d15 100644
--- a/media-fonts/ricty/ricty-3.2.0-r2.ebuild
+++ b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+MY_PN="Ricty"
inherit font
-MY_PN="Ricty"
-DESCRIPTION="A beautiful sans-serif monotype Japanese font designed for code listings"
-HOMEPAGE="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html"
-#SRC_URI="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/${MY_PN}-${PV}.tar.gz"
+DESCRIPTION="Beautiful sans-serif monotype Japanese font designed for code listings"
+HOMEPAGE="https://rictyfonts.github.io/"
SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="media-fonts/inconsolata
+BDEPEND="
+ media-fonts/inconsolata
>=media-fonts/mix-mplus-ipa-20111002
- media-gfx/fontforge"
-RDEPEND=""
-
-#S="${WORKDIR}/yascentur-${MY_PN}-*"
-S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
+ media-gfx/fontforge
+"
FONT_SUFFIX="ttf"
-FONT_S="${S}"
# Only installs fonts.
RESTRICT="strip binchecks"
diff --git a/media-fonts/roboto/roboto-2.138.ebuild b/media-fonts/roboto/roboto-2.138.ebuild
index 3eb4aa95440..ec3c6d3efcb 100644
--- a/media-fonts/roboto/roboto-2.138.ebuild
+++ b/media-fonts/roboto/roboto-2.138.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
DESCRIPTION="Standard font for Android 4.0 (Ice Cream Sandwich) and later"
HOMEPAGE="https://github.com/google/roboto"
SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/roboto-unhinted.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="app-arch/unzip"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-S=${WORKDIR}
-FONT_S=${S}
+BDEPEND="app-arch/unzip"
-FONT_SUFFIX="ttf"
FONT_CONF=( "${FILESDIR}"/90-roboto-regular.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 8a554d86bc5..6e8ea002c81 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
LICENSE="mplus-fonts public-domain" #446166
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index 901d78e55e5..e4de15ecba4 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 ~s390 sparc x86"
S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index 487effcd21c..a3f0cbe7a04 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/signika/signika-1.001.ebuild b/media-fonts/signika/signika-1.001.ebuild
index db0c801be95..09114a375d9 100644
--- a/media-fonts/signika/signika-1.001.ebuild
+++ b/media-fonts/signika/signika-1.001.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="A sans-serif with gentle character designed for signage"
+DESCRIPTION="Sans-serif with gentle character designed for signage"
HOMEPAGE="http://ancymonic.com/projects/Signika"
SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index ac32b0eddd9..afc277728f5 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -1,27 +1,26 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_P="AbyssinicaSIL-${PV}"
inherit font
DESCRIPTION="SIL Opentype Unicode fonts for Ethiopic languages"
-HOMEPAGE="https://software.sil.org/abyssinica"
+HOMEPAGE="https://software.sil.org/abyssinica/"
SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos"
IUSE="doc"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
+
+DOCS=( FONTLOG.txt OFL-FAQ.txt README.txt )
-DOCS="FONTLOG.txt OFL-FAQ.txt README.txt"
FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/${MY_P}"
-S="${FONT_S}"
src_install() {
font_src_install
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index 145699b807b..791a1b92483 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -1,2 +1,2 @@
DIST LateefGR-1.200.zip 727815 BLAKE2B e236126d08c729fedf5ea3fe7abecdbec1c91c1c350465a555ddf72c83b74145734379394647e9b2527558fe408a871afa0dcc6d386adc32ec3bcaed1221be9e SHA512 12c506516987782d3b3e07ba2cd9773a4e057d358250e9a4cc299287d751f82843d4e6969c714f5321531ac7897448b624dd8a2d1cf3bf213c39f90aae2f01a3
-DIST Scheherazade-2.100.zip 1114645 BLAKE2B 27743054c58afc93c79765abf6ac0698b394e1480e28fe59006da8a369d61a26fe3e0a2deec2df298fca6ee1f31185d3d0a0429b74803f049ae8e384735920a0 SHA512 53a6b684a9c6a6f136da28cc2f663fca9e22d1951203587394ff979c4769e4beb898ab73a7cabedf5ed6eaa2775d10c7281439f10331b203f0e03bd434aa2fb2
+DIST ScheherazadeNew-3.000.zip 7242549 BLAKE2B 84a09105cd625dd841b63627ecbc7b5ab2bb0a3edfaf1e3a7c743b527362de1c913f212c153af8cdc0494f1102af4d9ac99929442d9bb4270ae5d3ec4de3d579 SHA512 d74faf7c4df1a9a2fca5c8a8e8102b78ac05f849ac6aa08985b045549441f37cc8fd2767f622b1eda63dea4473f94591b6a98976accd9316ce7078e8fa920e0d
diff --git a/media-fonts/sil-arabicfonts/metadata.xml b/media-fonts/sil-arabicfonts/metadata.xml
index cde6817f951..96b4d62e063 100644
--- a/media-fonts/sil-arabicfonts/metadata.xml
+++ b/media-fonts/sil-arabicfonts/metadata.xml
@@ -1,26 +1,27 @@
<?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>
- <longdescription lang="en">
- Scheherazade and Lateef are extended Arabic script fonts designed
- by SIL International for modern Unicode-based systems using either
- OpenType or AAT (Apple Advanced Typography) for complex-script
- rendering. They support virtually all of the Unicode 4.1 Arabic
- character repertoire (excluding the Arabic Presentation Forms
- blocks, which are not recommended for normal use). Each typeface
- is currently available in Regular weight only.
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <longdescription lang="en">
+ Scheherazade and Lateef are extended Arabic script fonts designed
+ by SIL International for modern Unicode-based systems using either
+ OpenType or AAT (Apple Advanced Typography) for complex-script
+ rendering. They support virtually all of the Unicode 4.1 Arabic
+ character repertoire (excluding the Arabic Presentation Forms
+ blocks, which are not recommended for normal use). Each typeface
+ is currently available in Regular weight only.
- Scheherazade, named after the heroine of the classic Arabian
- Nights tale, is designed in a similar style to traditional
- typefaces such as Monotype Naskh, extended to cover the full
- Unicode Arabic repertoire.
+ Scheherazade, named after the heroine of the classic Arabian
+ Nights tale, is designed in a similar style to traditional
+ typefaces such as Monotype Naskh, extended to cover the full
+ Unicode Arabic repertoire.
- Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi
- mystic and poet. It is intended to be an appropriate style for use
- in Sindhi and other languages of the South Asian region.
- </longdescription>
+ Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi
+ mystic and poet. It is intended to be an appropriate style for use
+ in Sindhi and other languages of the South Asian region.
+ </longdescription>
</pkgmetadata>
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-3.000.ebuild
index 0b6689c03db..ffa90db5b50 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-3.000.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-MY_P1="Scheherazade-${PV}"
+MY_P1="ScheherazadeNew-${PV}"
MY_P2="LateefGR-1.200"
inherit font
DESCRIPTION="SIL Opentype Unicode fonts for Arabic Languages"
-HOMEPAGE="http://scripts.sil.org/ArabicFonts"
+HOMEPAGE="https://software.sil.org/arabicfonts/"
SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
https://software.sil.org/downloads/r/lateef/${MY_P2}.zip"
@@ -16,13 +16,11 @@ LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
+BDEPEND="app-arch/unzip"
+
+DOCS=( FONTLOG.txt OFL-FAQ.txt )
-DOCS="FONTLOG.txt OFL-FAQ.txt"
FONT_SUFFIX="ttf"
-FONT_S="${S}"
src_unpack() {
default
diff --git a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
index 0c6150e6577..9515389b71b 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit font
+EAPI=7
MY_PN="CharisSIL"
-MY_P="${MY_PN}-${PV}"
+inherit font
DESCRIPTION="Serif typeface for Roman and Cyrillic languages"
-HOMEPAGE="http://scripts.sil.org/CharisSILfont"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip
- compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=CharisSILCompact-${PV}b.zip&filename=CharisSILCompact-${PV}.zip -> ${MY_PN}Compact-${PV}.zip )"
+HOMEPAGE="https://software.sil.org/charis/"
+SRC_URI="https://software.sil.org/downloads/r/charis/${MY_PN}-${PV}.zip -> ${P}.zip
+ compact? ( https://software.sil.org/downloads/r/charis/${MY_PN}Compact-${PV}.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="compact"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+# DOCS=( OFL-FAQ.txt documentation/* )
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
-DOCS="OFL-FAQ.txt documentation/*"
src_prepare() {
default
if use compact; then
- mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
+ mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} . || die
fi
}
diff --git a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
index 4c2d92dfc6c..0156d6f2205 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit font
+EAPI=7
MY_P="DoulosSIL-${PV}"
+inherit font
-DESCRIPTION="SIL Doulos - SIL font for Roman and Cyrillic Languages"
-HOMEPAGE="http://scripts.sil.org/DoulosSILfont"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip"
+DESCRIPTION="SIL font for Roman and Cyrillic Languages"
+HOMEPAGE="https://software.sil.org/doulos/"
+SRC_URI="https://software.sil.org/downloads/r/doulos/${MY_P}.zip -> ${P}.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+DOCS=( OFL-FAQ.txt documentation/{DOCUMENTATION.txt,DoulosSIL-features.pdf} )
-DOCS="OFL-FAQ.txt documentation/*"
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
index 359947c1b38..ff554a8a600 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="MIT OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~s390 sparc x86"
IUSE="doc"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index bf80fdc8930..a1ac4c2e9e2 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
index a189ebc1057..8f3216b1397 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -1,36 +1,34 @@
# Copyright 2004-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
MY_PN="GentiumPlus"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Gentium Plus unicode font for Latin and Greek languages"
-HOMEPAGE="http://scripts.sil.org/gentium"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip
- compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlusCompact-${PV}b.zip&filename=GentiumPlusCompact-${PV}.zip -> ${MY_PN}Compact-${PV}.zip )"
+HOMEPAGE="https://software.sil.org/gentium/"
+SRC_URI="https://software.sil.org/downloads/r/gentium/${MY_P}.zip -> ${P}.zip
+ compact? ( https://software.sil.org/downloads/r/gentium/${MY_PN}Compact-${PV}.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
IUSE="compact doc"
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
-DOCS="GENTIUM-FAQ.txt OFL-FAQ.txt"
-FONT_SUFFIX="ttf"
+DOCS=( GENTIUM-FAQ.txt OFL-FAQ.txt )
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
+FONT_SUFFIX="ttf"
src_unpack() {
unpack ${A}
if use compact; then
- mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
+ mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${S}" || die
fi
}
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 0a1844ddabc..3d7327f54cb 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1 +1,2 @@
+DIST Padauk-4.000.zip 1316567 BLAKE2B 466d9aedad691afa7ae94a24652b156888cda2a926846fe705c953e711b00bff7c053b1f6d4e4ae4989a6fc91d87e984539315b84c0fff10815b8cfd18b80da1 SHA512 3ed97d5e8b47f8883bcab980aeb4247f4878ef8306773abdc4d1387817a3bdd5d8981c01cebbcd6b1c8dd7507d30a3b2879d607df66fcf7bc33d3db5d029016c
DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
index 7fefbd209d8..a8facac4170 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit font
+EAPI=7
MY_PN="padauk"
+inherit font
DESCRIPTION="SIL fonts for Myanmar script"
HOMEPAGE="http://scripts.sil.org/padauk"
SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
+S="${WORKDIR}/${MY_PN}-2.80"
LICENSE="OFL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_S="${WORKDIR}/${MY_PN}-2.80"
-S="${FONT_S}"
+BDEPEND="app-arch/unzip"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-padauk/sil-padauk-4.000.ebuild b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
new file mode 100644
index 00000000000..4beb1755843
--- /dev/null
+++ b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Padauk"
+inherit font
+
+DESCRIPTION="SIL fonts for Myanmar script"
+HOMEPAGE="https://software.sil.org/padauk/"
+SRC_URI="https://software.sil.org/downloads/r/padauk/${MY_PN}-${PV}.zip"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="OFL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild b/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
index 5dc419af100..58a4d00a4d5 100644
--- a/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
+++ b/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Unicode sans-serif typeface for Coptic/Nubian languages"
-HOMEPAGE="http://scripts.sil.org/SophiaNubian"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=SN${PV}.zip&filename=SN${PV}.zip -> ${P}.zip"
+HOMEPAGE="https://software.sil.org/SophiaNubian/"
+SRC_URI="https://software.sil.org/downloads/r/${PN/-/}/SophiaNubian-${PV}.zip -> ${P}.zip"
+S="${WORKDIR}/SophiaNubian"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+DOCS=( Readme.txt )
-S="${WORKDIR}/SophiaNubian"
-FONT_S="${S}"
FONT_SUFFIX="ttf"
-DOCS="Readme.txt"
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 55b1bec9700..c3215099399 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -1,8 +1,4 @@
-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
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index a2973be3b85..0f4c11f008f 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 02d0d4834be..00000000000
--- 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 44b627b242a..29eb7ae1eb4 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-2020 Gentoo Authors
+# 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
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index 932ae2ed178..68181377451 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -1,9 +1,3 @@
-DIST source-code-pro-20141211.tar.gz 2329732 BLAKE2B a99ae99d29054de940ca17c2f2b993f175588a983a034fbba9750eda9ffd655fa1f8038526fa165e21390902f0161d4648147b31176bef38ffcfa5f6e00f46e0 SHA512 85ec3768d72a56f2cab6ddfde01cf5c32871ec376c710d0dc3f7ac72e7bdfe9810c507b7ec8486d2802a30775e4bb87245d2dc00ee4b837956f9cd54f33811f0
-DIST source-code-pro-20160608.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
DIST source-code-pro-20170111.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
-DIST source-sans-pro-20141211.tar.gz 5503301 BLAKE2B 926750667a1a12cc36edadf6a2b07f55d408c2d0ceb25c26ecb7381a2da135e2f3add8aaf338b5eb94f83341db0981562034b95f0bfbd2692783704974f78f65 SHA512 9052a010e0635db84a3f09a3fa71a13db9c29c528b88f8a1f11d24f9a6f2be361d77fd902701e3fa674989034f01706cda1c600447c9f11db8c35c49c093d8e8
-DIST source-sans-pro-20160608.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
DIST source-sans-pro-20170111.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
-DIST source-serif-pro-20141211.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
-DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
deleted file mode 100644
index 9169bb303bb..00000000000
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-SANSV="2.010R-ro/1.065R-it"
-SERIFV="1.017R"
-CODEV="1.017R"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
- https://adobe-fonts.github.io/source-serif-pro/
- https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
- https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
- https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
- cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
- mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
- font_src_install
- for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV}; do
- dohtml ${d}/*.html
- done
-}
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
deleted file mode 100644
index d6fd64638e6..00000000000
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-SANSV="2.020R-ro/1.075R-it"
-SERIFV="1.017R"
-CODEV="2.030R-ro/1.050R-it"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
- https://adobe-fonts.github.io/source-serif-pro/
- https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
- https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
- https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
- cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
- default
- mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
- font_src_install
- for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV/\//-}; do
- newdoc ${d}/README.md README-${d}.md
- done
-}
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index d26340e29e1..e37d5638967 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit font
SANSV="2.020R-ro/1.075R-it"
@@ -15,20 +16,22 @@ HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
IUSE="cjk"
-RDEPEND="media-libs/fontconfig
- cjk? ( media-fonts/source-han-sans )"
+RESTRICT="binchecks strip"
+
+RDEPEND="
+ media-libs/fontconfig
+ cjk? ( media-fonts/source-han-sans )
+"
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
+FONT_SUFFIX="otf"
src_prepare() {
default
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index ee04159841b..a3630a99fc5 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,2 +1,5 @@
DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
-DIST STIXv2.0.0.zip 3921396 BLAKE2B 3188b28e6f21df0bd3283cacac071399afb325cad3c36387e47448ee9bffcd452b59e4381663d06fbbb93d704a3510c23c31a88e832e75fbd7be85a179761553 SHA512 b5d1a98be67fb548d8898cee207b429a6b53617c0ee33b798273e4626e287af9404acf85e702c7fc6cd0b27da379a03013f77caeb57b957d7633efa722f69ae0
+DIST stix-fonts-2.11-FONTLOG.txt 27987 BLAKE2B b29daccfd54daaa59e694bf105d566fb14e4b4c8bf732dd9eccbdd610983e0fc3798a8f8c3bbca80e86190f9e44cdf27e527a721c0ef548addcf39c3f240c6f6 SHA512 3cd3c87b5b8c7ba4e4f76ed95349a375c5a365303f0e9a8bb26922c8b4382e47f4903531dacffd9f2d6df8bb0be8f50fb965695fc5c5ed69c443345140952067
+DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff9732fec997e1665bce256a381457a00b4508ebf052a2aeaa264bd13917c0df34610332a15fbf9a0951f00477d9e17bfb156bc62aff584c6 SHA512 be03b5539bff41b904a4971e07d717d2b8b5bc4805f05c18bb56ec79ee07d38dd7bd1274c0887fc3019594aa09945e59cee30a22a0406c7985dba72245987861
+DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
+DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index b91640f4720..32beaebcb6c 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,30 +1,26 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
+HOMEPAGE="https://www.stixfonts.org/"
SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
+S="${WORKDIR}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RESTRICT="binchecks strip test"
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/STIX-Word"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+BDEPEND="app-arch/unzip"
-src_install() {
- # DOCS can't do files with spaces so handle it ourselves
- font_src_install
- dodoc "STIX Font ${PV} Release Documentation.pdf"
-}
+DOCS=( "STIX Font ${PV} Release Documentation.pdf" )
-RESTRICT="binchecks strip test"
+FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+FONT_SUFFIX="otf"
+FONT_S="${S}/Fonts/STIX-Word"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
deleted file mode 100644
index 160743fffa9..00000000000
--- a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-MY_P="STIXv${PV}"
-DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
-SRC_URI="mirror://sourceforge/${PN/-/}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/OTF"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
-
-DOCS=( docs/STIX_2.0.0_release_notes.txt )
-
-RESTRICT="binchecks strip test"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
new file mode 100644
index 00000000000..3955c4a4081
--- /dev/null
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
+HOMEPAGE="https://www.stixfonts.org/"
+BASE_URI="https://raw.githubusercontent.com/stipub/${PN/-/}/v${PV}"
+SRC_URI="${BASE_URI}/zipfiles/static_otf.zip -> ${P}-otf.zip
+ ${BASE_URI}/docs/FONTLOG.txt -> ${P}-FONTLOG.txt
+ ${BASE_URI}/docs/STIXTwoMath-Regular.pdf -> ${P}-STIXTwoMath-Regular.pdf
+ ${BASE_URI}/docs/STIXTwoText-Regular.pdf -> ${P}-STIXTwoText-Regular.pdf
+"
+S="${WORKDIR}/static_otf"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RESTRICT="binchecks strip test"
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="otf"
+
+src_install() {
+ font_src_install
+
+ local doc
+ for doc in FONTLOG.txt STIXTwo{Math,Text}-Regular.pdf; do
+ newdoc "${DISTDIR}"/${P}-${doc} ${doc}
+ done
+}
diff --git a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
index f3d8c4b9934..452aeec7467 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index d50dc7c1ecf..1e735ed04a4 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,2 +1 @@
-DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
diff --git a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
deleted file mode 100644
index 86ae7d4ce8a..00000000000
--- a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit font python-any-r1
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
- ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
- ${PYTHON_DEPS}
- virtual/awk
- otf? ( media-gfx/fontforge )
- pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS=( README README-BG AUTHORS CHANGES )
-
-REQUIRED_USE="X? ( pcf )"
-
-pkg_setup() {
- python_setup
-}
-
-src_prepare() {
- default
-
- # Upstream patches. Some of them are suggested to be applied by default
- # dv - de NOT like latin g, but like caps greek delta
- # ve NOT like greek beta, but like caps latin B
- # ge - ge NOT like "mirrored" latin s, but like caps greek gamma
- # ka - small ka NOT like minimised caps latin K, but like small latin k
- use a-like-o && eapply "${S}"/alt/ao2.diff
- use center-tilde && eapply "${S}"/alt/td1.diff
- use distinct-l && eapply "${S}"/alt/ll2.diff
- use ru-i && eapply "${S}"/alt/ij1.diff
- use ru-k && eapply "${S}"/alt/ka2.diff
- use ru-dv && eapply "${S}"/alt/dv1.diff
- use ru-g && eapply "${S}"/alt/ge2.diff
- use quote && eapply "${S}"/alt/gq2.diff
-}
-
-src_configure() {
- local configure_args=(
- --prefix="${EPREFIX}"/usr
- --psfdir="${EPREFIX}"/usr/share/consolefonts
- --x11dir="${EPREFIX}"/${FONTDIR}
- )
- # selfwritten configure script
- ./configure "${configure_args[@]}" || die
-}
-
-src_compile() {
- local args=(
- $(usex psf 'psf psf-vgaw' '')
- $(usex pcf 'pcf pcf-8bit' '')
- )
- [[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-
- # Follow https://bugs.gentoo.org/728308#c5
- # build ".otf" (bitmap-only) fonts out of .bdf ones
- #
- # Important details (copying notes as-is):
- #
- # 0. Pango 1.44 now returns floating point ascent and
- # descent, instead of integer. The functions were always returning float,
- # all right... but so far, without a fractional part. Which makes problems
- # too, for example in Scintilla based editors such as SciTE and Geany
- # (there is a quick and dirty fix).
- #
- # 1. 'fonttosfnt' adds 0.5 to at least the logical (OpenType-scaled)
- # character width, ascent and height. Haven't checked the physical (pixel)
- # metrics yet. With some sizes/applications, the fonttosfnt converted
- # fonts do indeed have extra wrong spacing, 1 pixel horizontal or
- # vertical. It has other bugs too, but they don't seem important.
- #
- # 2. If you pack 2+ terminus sizes into a single .otb font file, KDE will
- # (may? YMMV) use *only the first size*.
- #
- # 3. OTB has a single set of logical metrics. So, for example, the logical
- # character width (which is relative to height) can never be correct for
- # an .otb file including both 8x14 and 8x16.
-
- if use otf; then
- local source_bdf
- for source_bdf in ter-u*n.bdf ter-u*b.bdf; do
- set -- fontforge -lang=ff -c 'Open($1); ScaleToEm(1024); Generate($2)' \
- "${source_bdf}" "${source_bdf%.bdf}.otb"
- einfo "$@"
- "$@" || die
- done
- fi
-
-}
-
-src_install() {
- local args=(
- $(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
- $(usex pcf 'install-pcf' '')
- )
- # Set the CHECKDIR to a dummy location so we always get the same set of
- # files installed regardless of what is in / or ROOT or wherever.
- [[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
- # Remove trans files that the kbd package takes care of installing.
- rm -f "${ED}"/usr/share/consoletrans/*.trans
-
- if use pcf-unicode-only; then
- # Only the ter-x* fonts are unicode (ISO-10646-1) based
- rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
- fi
-
- use otf && FONT_SUFFIX=otb
- font_src_install
-
- einstalldocs
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.49.ebuild b/media-fonts/terminus-font/terminus-font-4.49.ebuild
index 9b443d30528..67120305900 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit font python-any-r1
DESCRIPTION="A clean fixed font for the console and X11"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
ru-dv +ru-g ru-i ru-k"
diff --git a/media-fonts/termsyn/termsyn-1.8.7.ebuild b/media-fonts/termsyn/termsyn-1.8.7.ebuild
index b134d4f7dbb..5ca575e2f99 100644
--- a/media-fonts/termsyn/termsyn-1.8.7.ebuild
+++ b/media-fonts/termsyn/termsyn-1.8.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit font
@@ -14,7 +14,4 @@ SLOT="0"
KEYWORDS="~amd64 ~arm"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
FONT_SUFFIX="pcf psfu"
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index 9e2d025a263..1e4e0f58959 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,2 +1 @@
-DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
DIST tg2_501otf.zip 2559336 BLAKE2B 8a4872f1a694765e56ef6e41fab523ee80a9b69de255add3160068131a10f226cb237572b1184f6411afd49936606af6b6809f3a5aebd502122d062a4dc23f55 SHA512 a335e0bfaf16a157c290fcd40fcf8786e8677f14189a8b6fe56ff112f008aed198600248d8eb1334bbb689b9979996e013f61bf5bfa6f0549b6a910d03cb2929
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
deleted file mode 100644
index 2e47c60fea5..00000000000
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Extensive remake of freely available URW fonts"
-HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
-SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${PV}otf.zip"
-
-LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
index ad498a6c96f..7d0f6ccdc7c 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index f2d54be2cd9..6a3557a6363 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
LICENSE="bakoma"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/thaifonts-scalable/Manifest b/media-fonts/thaifonts-scalable/Manifest
index 2242adb78ad..3ac166cf91c 100644
--- a/media-fonts/thaifonts-scalable/Manifest
+++ b/media-fonts/thaifonts-scalable/Manifest
@@ -1 +1 @@
-DIST ttf-tlwg-0.6.1.tar.xz 1931628 BLAKE2B cf1f45f4f34cd38c45b5aabba0646a3cdd0e9a50908d9601a3544f7d56aa10ac463ec4b0afdf6d59cbba53bfb3ea2b9f02967ac0d8a4997cb1a18adfab7e300e SHA512 47364c9125509eb115abdaa60eb1f046d5bef694b2b51113e611b1c35c50300d682fc35c71e16ab3d6ffb43f36ba3e77af70019ec050012aebe04d9c0ece544f
+DIST thaifonts-scalable-0.7.2.tar.xz 1958780 BLAKE2B 6e976d0d7543acbf5869b21c5a488b2d0c3c8b9428a29c35736bb087bd5accbbb81a2766f670940a8006a2f4050818064c4753820a9a12691a3b39d80359da69 SHA512 dd5865da81bbb10665c561ae188197a3bb0831162bf69795298f80f8aff1a210fce8e3d961476a878851376d15d95dd7d36144d53e8123a309ea883ced1a7e58
diff --git a/media-fonts/thaifonts-scalable/metadata.xml b/media-fonts/thaifonts-scalable/metadata.xml
index d0f1df7c94c..8b3b4d92532 100644
--- a/media-fonts/thaifonts-scalable/metadata.xml
+++ b/media-fonts/thaifonts-scalable/metadata.xml
@@ -1,8 +1,9 @@
<?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>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild
deleted file mode 100644
index 9eaa1e7bce3..00000000000
--- a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A collection of Free fonts for Thai"
-HOMEPAGE="https://linux.thai.net/projects/thaifonts-scalable"
-SRC_URI="ftp://linux.thai.net/pub/thailinux/software/thai-ttf/ttf-tlwg-${PV}.tar.xz"
-
-LICENSE="|| ( GPL-2-with-font-exception GPL-3-with-font-exception )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/ttf-tlwg-${PV}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-FONT_CONF=(
- "${FONT_S}/etc/fonts/conf.avail/64-01-tlwg-kinnari.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-02-tlwg-norasi.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-11-tlwg-waree.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-12-tlwg-loma.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-13-tlwg-garuda.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-14-tlwg-umpush.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-15-laksaman.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-21-tlwg-typo.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-22-tlwg-typist.conf"
- "${FONT_S}/etc/fonts/conf.avail/64-23-tlwg-mono.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-garuda-synthetic.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-kinnari-synthetic.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-laksaman-synthetic.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-loma-synthetic.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-umpush-synthetic.conf"
- "${FONT_S}/etc/fonts/conf.avail/89-tlwg-waree-synthetic.conf" )
-
-pkg_postinst() {
- font_pkg_postinst
- echo
- elog " 64-*.conf enable basic support"
- elog " 89-*-synthetic.conf emulate the Thai font of Windows"
- echo
-}
diff --git a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild
new file mode 100644
index 00000000000..e6cf8aa2a63
--- /dev/null
+++ b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Collection of free fonts for Thai"
+HOMEPAGE="https://linux.thai.net/projects/thaifonts-scalable"
+SRC_URI="https://github.com/tlwg/fonts-tlwg/releases/download/v${PV}/ttf-tlwg-${PV}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/ttf-tlwg-${PV}"
+
+LICENSE="|| ( GPL-2-with-font-exception GPL-3-with-font-exception )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+FONT_CONF=(
+ fontconfig/conf.avail/64-01-tlwg-kinnari.conf
+ fontconfig/conf.avail/64-02-tlwg-norasi.conf
+ fontconfig/conf.avail/64-10-tlwg-loma.conf
+ fontconfig/conf.avail/64-11-tlwg-waree.conf
+ fontconfig/conf.avail/64-13-tlwg-garuda.conf
+ fontconfig/conf.avail/64-14-tlwg-umpush.conf
+ fontconfig/conf.avail/64-15-laksaman.conf
+ fontconfig/conf.avail/64-21-tlwg-typo.conf
+ fontconfig/conf.avail/64-22-tlwg-typist.conf
+ fontconfig/conf.avail/64-23-tlwg-mono.conf
+ fontconfig/conf.avail/89-tlwg-garuda-synthetic.conf
+ fontconfig/conf.avail/89-tlwg-kinnari-synthetic.conf
+ fontconfig/conf.avail/89-tlwg-laksaman-synthetic.conf
+ fontconfig/conf.avail/89-tlwg-umpush-synthetic.conf
+)
+FONT_SUFFIX="ttf"
+
+pkg_postinst() {
+ font_pkg_postinst
+ elog " 64-*.conf enable basic support"
+ elog " 89-*-synthetic.conf emulate the Thai font of Windows"
+}
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index aa4bbb81678..db509cf9d11 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.t
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
index 2f40f2335ae..768b2dd001d 100644
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
+++ b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit font
-DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
-HOMEPAGE="http://font.ubuntu.com/"
+DESCRIPTION="Set of matching libre/open fonts funded by Canonical"
+HOMEPAGE="https://design.ubuntu.com/font/"
SRC_URI="https://assets.ubuntu.com/v1/fad7939b-${P}.zip -> ${P}.zip"
LICENSE="UbuntuFontLicense-1.0"
@@ -14,14 +14,13 @@ SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
+BDEPEND="app-arch/unzip"
DOCS=( CONTRIBUTING.txt FONTLOG.txt README.txt )
+FONT_SUFFIX="ttf"
+
src_prepare() {
default
- rm "${S}"/Ubuntu-M*.ttf || die
+ rm Ubuntu-M*.ttf || die
}
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index ac013eaf343..c07bea2e703 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1 +1 @@
-DIST umeplus-fonts-20160402.tar.xz 1763132 BLAKE2B 3e1406085d8dd1f62f69455efd53e0a51281d9a2a7220ef21a588d551fbd9c078110cbbc3e35ddd16cb9d31ee29d418c128b92fb4a5f980be654d57447d60157 SHA512 36a2ab6f2919e3e4ec99662a296f56dc765fc55ca1de3ea7329030312c88cd16c589ef2a945f4b52509d52b029cef749371d3dd4c1aebceb5c0811d5b7313658
+DIST umeplus-fonts-20180604.tar.xz 1768840 BLAKE2B 5b0f2677fca36a59886f389189256c78276fef8a93215090505431aa22df220e0837ee230126d4ccc019c8c252a422406e80413aa38a7a775797a24c4f88cd96 SHA512 eee7ef831c7a6e434a129b37e96f0b41f8adc485200cbfaa1856b21e54f3f3c3e02d77b2954619144eb3b9c28d0d3aedaa66591955a8b98d2024b3cd2fa9692b
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index aec3c8272b2..32fec8d24cc 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
@@ -9,6 +9,7 @@
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">mdk-ut</remote-id>
<remote-id type="sourceforge-jp">users</remote-id>
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20160402.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild
index 5f84586f6ba..88183813b21 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20160402.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit font
-DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
-HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
-SRC_URI="mirror://sourceforge.jp/users/10/10368/${P}.tar.xz"
+DESCRIPTION="Modified Ume and M+ fonts for Japanese"
+HOMEPAGE="http://linuxplayers.g1.xrea.com/modified_fonts_01.html"
+SRC_URI="https://free.nchc.org.tw/osdn//users/21/21734/${P}.tar.xz"
LICENSE="mplus-fonts public-domain"
SLOT="0"
diff --git a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
index 7f99a77338c..7ef7e6e8e4d 100644
--- a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-extra-${MY_PV}-r1.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index 4f0ea6480ec..25a45f07100 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-core-${MY_PV}-r1.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index d587e3534eb..06ad234dd2d 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,2 +1 @@
-DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
diff --git a/media-fonts/unifont/files/10.0.06-make.patch b/media-fonts/unifont/files/10.0.06-make.patch
deleted file mode 100644
index cf09b7715b0..00000000000
--- a/media-fonts/unifont/files/10.0.06-make.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c2e07357abc86fc0e7715ef21dc3d279e3002819 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 29 Aug 2017 08:55:26 -0400
-Subject: [PATCH] Another parallel make fix
-
-Bug: https://bugs.gentoo.org/629278
----
- font/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/font/Makefile b/font/Makefile
-index 1cd7ce3..2c85e64 100644
---- a/font/Makefile
-+++ b/font/Makefile
-@@ -236,7 +236,7 @@ psf: bdf
- #
- # Print coverage of scripts in Basic Multilingual Plane in .txt file.
- #
--coverage:
-+coverage: hex
- sort $(HEXDIR)/*.hex | \
- $(BINDIR)/unicoverage > $(COMPILED_DIR)/coverage.txt
-
---
-2.14.1
-
diff --git a/media-fonts/unifont/metadata.xml b/media-fonts/unifont/metadata.xml
index 8806553ecd2..ad0973c0612 100644
--- a/media-fonts/unifont/metadata.xml
+++ b/media-fonts/unifont/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
-</maintainer>
<maintainer type="project">
<email>fonts@gentoo.org</email>
<name>Fonts</name>
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
deleted file mode 100644
index 6c00044c786..00000000000
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="fontforge utils"
-
-DEPEND="
- fontforge? (
- app-text/bdf2psf
- dev-lang/perl
- dev-perl/GD[png(-)]
- media-gfx/fontforge
- x11-apps/bdftopcf
- )
-"
-RDEPEND="
- utils? (
- dev-lang/perl
- dev-perl/GD[png(-)]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/10.0.06-make.patch
-)
-
-src_prepare() {
- sed -i -e 's/install -s/install/' src/Makefile || die
- default
-}
-
-src_compile() {
- if use fontforge || use utils; then
- tc-export CC
- xdg_environment_reset
- makeargs=(
- CFLAGS="${CFLAGS}"
- BUILDFONT=$(usex fontforge 1 '')
- )
- emake "${makeargs[@]}"
- fi
-}
-
-src_install() {
- makeargs+=(
- DESTDIR="${ED%/}"
- PCFDEST="${ED%/}${FONTDIR}"
- TTFDEST="${ED%/}${FONTDIR}"
- USRDIR=usr
- )
- use utils || makeargs+=( -C font )
- emake "${makeargs[@]}" COMPRESS=0 install
- font_xfont_config
- font_fontconfig
-}
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index e67e08a79ea..4f5f95202bb 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!media-fonts/gnu-gs-fonts-std
diff --git a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
index 4dd03c3cde5..748a963d210 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
+MY_P=${P/-fonts/}
inherit font
-MY_P=${P/_/-}
-MY_P=${MY_P/-fonts/}
-DESCRIPTION="fonts gpl'd by Han The Thanh, based on URW++ fonts with Vietnamese glyphs added"
+DESCRIPTION="Vietnamese version of the standard PostScript fonts from URW++"
# Check updates on:
-# http://vntex.sf.net/fonts/urwvn-ttf/download
+# http://vntex.sourceforge.net/fonts/urwvn-ttf/download/
# https://sourceforge.net/projects/vntex/files
-HOMEPAGE="http://vntex.sf.net"
+HOMEPAGE="http://vntex.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
+S="${WORKDIR}/${MY_P}-ttf"
-LICENSE="GPL-2 Aladdin" # see bug #434262
+LICENSE="GPL-2 Aladdin" # bug #434262
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
-S="${WORKDIR}/${MY_P}-ttf"
-FONT_SUFFIX="ttf"
-FONT_S=${S}
FONT_CONF=( "${FILESDIR}/65-urwvn.conf" )
+FONT_SUFFIX="ttf"
pkg_postinst() {
font_pkg_postinst
diff --git a/media-fonts/viga/viga-1.ebuild b/media-fonts/viga/viga-1.ebuild
index 696e7090cfe..308ca98fb1d 100644
--- a/media-fonts/viga/viga-1.ebuild
+++ b/media-fonts/viga/viga-1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-DESCRIPTION="A sans-serif font with great personality and good on-screen performance"
+DESCRIPTION="Sans-serif font with great personality and good on-screen performance"
HOMEPAGE="https://www.fontsquirrel.com/fonts/viga"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index cf7d44d508f..fc742507fcd 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
# sazanami -> BSD-2
LICENSE="vlgothic mplus-fonts BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
S="${WORKDIR}/${MY_PN}"
diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild b/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
index c2325ed0d0f..a19277df809 100644
--- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
+++ b/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
inherit font
-MY_P="${P/_/-}"
-DESCRIPTION="A droid derived Sans-Serif style CJK font"
-HOMEPAGE="http://wqy.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz
+DESCRIPTION="Droid derived Sans-Serif style CJK font"
+HOMEPAGE="http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/"
+SRC_URI="mirror://sourceforge/wqy/${P/_/-}.tar.gz
https://dev.gentoo.org/~dlan/distfiles/${PN}.ttc.xd3"
+S="${WORKDIR}/${PN}"
LICENSE="Apache-2.0 GPL-3"
SLOT="0"
@@ -18,15 +19,14 @@ IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
+DOCS=( AUTHORS.txt ChangeLog.txt README.txt )
FONT_SUFFIX="ttc"
-DOCS="AUTHORS.txt ChangeLog.txt README.txt"
-DEPEND="${DEPEND}
- dev-util/xdelta:3"
+BDEPEND="dev-util/xdelta:3"
src_prepare() {
- xdelta3 -f -d -s "${S}"/wqy-microhei.ttc "${DISTDIR}"/wqy-microhei.ttc.xd3 "${S}"/wqy-microhei.ttc || die
+ xdelta3 -f -d -s wqy-microhei.ttc "${DISTDIR}"/wqy-microhei.ttc.xd3 \
+ wqy-microhei.ttc || die
+ default
}
diff --git a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
index f99e9724683..1fbd789e583 100644
--- a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
+++ b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
+
inherit font
-MY_P="${PN}-bdf-${PV/_p/-}"
DESCRIPTION="WenQuanYi Unibit CJK font"
-HOMEPAGE="http://wenq.org/enindex.cgi"
-SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz"
+HOMEPAGE="http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/"
+SRC_URI="mirror://sourceforge/wqy/${PN}-bdf-${PV/_p/-}.tar.gz"
+S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
IUSE=""
-DEPEND="media-gfx/ebdftopcf
- sys-apps/sed"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="pcf.gz"
-DOCS="AUTHORS ChangeLog README"
-
# Only installs fonts
RESTRICT="strip binchecks"
+BDEPEND="media-gfx/ebdftopcf"
+
+DOCS=( AUTHORS ChangeLog README )
+
+FONT_SUFFIX="pcf.gz"
+
src_prepare() {
- sed -i -e "s|$range=shift(ARGV);|$range=shift(@ARGV);|g" \
- bdfmerge.pl || die
+ default
+ sed -i -e "s|$range=shift(ARGV);|$range=shift(@ARGV);|g" bdfmerge.pl || die
}
src_compile() {
diff --git a/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
index 6c90475d9e4..0c77fa73799 100644
--- a/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
+++ b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
@@ -1,5 +1,5 @@
---- 44-wqy-zenhei.conf.old 2014-02-14 00:41:31.277115976 +0100
-+++ 44-wqy-zenhei.conf 2014-02-14 00:43:18.985123207 +0100
+--- a/44-wqy-zenhei.conf
++++ b/44-wqy-zenhei.conf
@@ -4,9 +4,35 @@
<fontconfig>
<!-- modified by Madsen@SMTH -->
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
index 3c6b62a97aa..95664928408 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
@@ -1,29 +1,29 @@
-# Copyright 2007-2020 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+
DISABLE_AUTOFORMATTING=true
-inherit font readme.gentoo
+inherit font readme.gentoo-r1
DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font"
HOMEPAGE="http://wenq.org/wqy2/index.cgi?ZenHei"
SRC_URI="mirror://sourceforge/project/wqy/${PN}-snapshot/${PV}-May/${P}-May.tar.bz2"
+S="${WORKDIR}/${PN}"
LICENSE="GPL-2-with-font-exception"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
IUSE=""
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttc"
+# Only installs fonts
+RESTRICT="binchecks strip test"
+
FONT_CONF=(
43-wqy-zenhei-sharp.conf
44-wqy-zenhei.conf
)
-
-# Only installs fonts
-RESTRICT="binchecks strip test"
+FONT_SUFFIX="ttc"
DOC_CONTENTS="This font installs two fontconfig configuration files.
@@ -33,9 +33,7 @@ To activate preferred rendering, run:
To make the font only use embedded bitmap fonts when available, run:
eselect fontconfig enable 43-wqy-zenhei-sharp.conf"
-src_prepare() {
- epatch "${FILESDIR}/44-wqy-zenhei.conf.patch"
-}
+PATCHES=( "${FILESDIR}/44-wqy-zenhei.conf.patch" )
src_compile() {
:
@@ -49,5 +47,5 @@ src_install() {
pkg_postinst() {
unset FONT_CONF # override default message
font_pkg_postinst
- readme.gentoo_pkg_postinst
+ readme.gentoo_print_elog
}
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
deleted file mode 100644
index 3e27e148565..00000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="jmk-x11-fonts-${PV}"
-
-DESCRIPTION="This package contains character-cell fonts for use with X"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
-
-BDEPEND="
- x11-misc/imake
- >=x11-apps/mkfontscale-1.2.0
- x11-apps/bdftopcf"
-
-PATCHES=( "${FILESDIR}"/gzip.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- xmkmf || die
- default
-}
-
-src_install() {
- emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
- einstalldocs
-}
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index 4f59cf47a97..0673462a08f 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit font
+inherit font toolchain-funcs
MY_P="jmk-x11-fonts-${PV}"
@@ -12,10 +12,10 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
BDEPEND="
- x11-misc/imake
+ >=x11-misc/imake-1.0.8-r1
>=x11-apps/mkfontscale-1.2.0
x11-apps/bdftopcf"
@@ -25,9 +25,9 @@ PATCHES=( "${FILESDIR}"/gzip.patch )
S="${WORKDIR}/${MY_P}"
-src_compile() {
- xmkmf || die
- default
+src_configure() {
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
}
src_install() {
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index 69688882626..d76445218ae 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"