gentoo resync : 15.05.2018

21 files changed, 14 insertions, 212 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index ad739be3b3cd..e8aa26628462 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 0db661830c11..1526402ec2c7 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -3,5 +3,5 @@ DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b
 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
 EBUILD dejavu-2.35.ebuild 2138 BLAKE2B 1be5537b1617cef6379bc45456557e01a877e6f5be30b5dfbb2257c697c1cca0d76094856907b4339b58f1eac4fce494c736e854ab78ea08a5b3522cb44e3e7b SHA512 7ebb17717372bade13726987d3f8c7bdedae0577fad1f63256926a7da676875a70ed21e8b9b77b52e2e4b7392d7c50bb6778df1d55d9f503c849d30c541824a5
-EBUILD dejavu-2.37.ebuild 2208 BLAKE2B ef4bddb6724d7fc335f4952631b29f009caae51ebe9a6061a93addbbdee07cba4d055c20cb4aab701e73ba17d2491998b4573a1606c1ba31928df6263f3bb8e3 SHA512 609b094efcdc1019b4bf7d5820cb4962ca4e338463ba27fe95e7370635f32bfa5f62858b0a679e0f89d7396c641dc5e71c53224fe2877c88d304e7778ddde9e5
+EBUILD dejavu-2.37.ebuild 2207 BLAKE2B a1c0a2c2cd7585af6f0d28727c0df5cf20364e9e8c1ea8fa6a6912c4191e787efce48263b26c75005a3d4607ed8b3e48768b06d8209704f0c3f116d015d72a74 SHA512 330b482b1ebae93a1ab1d5a4c3e8b0bcef56a7a3296c9cb0ed075b6c8b80360cc0f5e78e953d12c3d567393882960f54400037726186481c51b73374c9579019
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index a0ead71962a0..5678de566ac2 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/hack/Manifest b/media-fonts/hack/Manifest
index 7aeabbdd2ac3..c97893fc23d8 100644
--- a/media-fonts/hack/Manifest
+++ b/media-fonts/hack/Manifest
@@ -1,7 +1,5 @@
 DIST Hack-v2_020-otf.tar.xz 322564 BLAKE2B c4c3abaa829d671b3d063b73837eeb70ebee90de162dbfb5a0c2bf0c238af383a260adfe4bb164eafa7c29bd6e67d5deb91a8b17708f15100aac6ee29d627415 SHA512 d58ef2a7b96557a1feb587efc68e64a16238ca9fd336bafa41c488e48e088a547612890fcaff8899494f2eb0b8acf300815ada8f72df64ae7d19af032fade058
-DIST Hack-v2_020-ttf.tar.xz 404776 BLAKE2B c4f205702620bb68965f3131abad518d418a631b6f08886f4a5bcd3bc8cba783d87bfbf99246c7743b10951caa6d505580effd03d390a7cde0b75a5b723371de SHA512 6901828b8a4bfccf113674bcad3725a0b35aded7da04e765a889fae8fe45d5de791f02167346f276b69c766eefbfcbbb7afec3eca3f3105f067509064f075e65
 DIST Hack-v3.003-ttf.tar.xz 360136 BLAKE2B 73a029a2bdf154642c59effb3e3ab6ea8997e537e6934d7554b13b0d39cec999c9a3c4bea706ce6421e28b1e9c4e1f7154a7fa0a552cfcc5d95c845eabc5dd5e SHA512 d6480957ef77b0e117a564b76e7b8b041a28cfc89441d394a27e2a1b230cae7a67c0b9f3cbe6aab48c5d2cc832b0ea653017a3b925db1d0cc2885e02eab9a81d
-EBUILD hack-2.020-r1.ebuild 568 BLAKE2B 3999a13c191687b459fa7bfd1987f1e237ace502f3b8437a08a354827aa6232e398f83e763222d909425e112dfcdd1702f0bfcf4b2b4926a8b6e1873ff3a388d SHA512 23a0a55fc7153600f51c86eafa8e3ea2058ac06bde17e18f7f3bbdc192e2b58080d89f1dfff71be181861de7b5e73a18f8433ab70a5601e21d7f6db464ddac55
 EBUILD hack-2.020.ebuild 559 BLAKE2B dfa5eb11087918f661c2f0b56244b486c0406b07dcd51a572602018c7788a22a0d8177e8f3fcffb53ca91f6d00b17ee3979243ba6adb41b86780a62b7421d99e SHA512 d6ff056b6efeef7d7b99cd7cd62a1e180b566d4b6b0d2a42ab54a727a702711e1c3a2e507bce0497133080004d8a8ca26ef4237f9014460813d66de6fa07af62
-EBUILD hack-3.003.ebuild 534 BLAKE2B 7ba8b8894f8a37774da71c577def10597a34c122ff42bd9d14621d2d0fb3c53c232480dcc39b8e935d927b0b0685571ea741efb5b53815369bebc4bb78798169 SHA512 ed9163bcc6aa20aa7920f028e42db963756f80da0251029ee8653369859d57e7e26af47848532367ab0802103b52640a9f1666e862e7d69d6c357eed6e07bef0
+EBUILD hack-3.003.ebuild 532 BLAKE2B 3891ce4b63f1f06d7991c1e9ff643afe458b1ed715979bfa3aafa78f4f38ead8a21621e76cf3c3d848a7382786372db30ad8d9830c7c2c31456e6b29a7322a2b SHA512 10aa7729b4ea1d942ed08f9995cb193a2e695d1a531ed2f67111295890963e8108edecdea7f65dd9bd92c7967dbcabf2c386f61b1ad0c66a53e5c7a9cba722c9
 MISC metadata.xml 322 BLAKE2B c8e02209b20e037d40de9fdb967e13fa786facdb9a9a74b3f1cafc60bc039c13a3a0bfbd4e14032386df942db8326f6cf02511f6ca15d2262a02b7e88bea00ed SHA512 f50dfd6348f6c4425efe7a889e1dda8c6ceeeca5617f7f846ba00e5eb5a9e08f65098141432fceebfc212a831c9191c952bc373a6ca633863b6f385d970987c8
diff --git a/media-fonts/hack/hack-2.020-r1.ebuild b/media-fonts/hack/hack-2.020-r1.ebuild
deleted file mode 100644
index 006ff7840b26..000000000000
--- a/media-fonts/hack/hack-2.020-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font versionator
-
-DESCRIPTION="A 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$(replace_version_separator 1 '_' )-ttf.tar.xz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND=""
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	mkdir "${S}" && cd "${S}"
-	unpack ${A}
-}
diff --git a/media-fonts/hack/hack-3.003.ebuild b/media-fonts/hack/hack-3.003.ebuild
index 7fd0f42adcb8..1b272507e29b 100644
--- a/media-fonts/hack/hack-3.003.ebuild
+++ b/media-fonts/hack/hack-3.003.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/source-foundry/Hack/releases/download/v${PV}/Hack-v$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/nanumfont/Manifest b/media-fonts/nanumfont/Manifest
index 202fb2fac939..e6006ee1ab9e 100644
--- a/media-fonts/nanumfont/Manifest
+++ b/media-fonts/nanumfont/Manifest
@@ -1,4 +1,3 @@
 DIST NanumGothicCoding-2.0.zip 2038498 BLAKE2B 965cea0994f106d44d68a2f348c72d76d3d943b068380fcadb2ea81db22354a84a301c452b596e7e2da2542cb3a6172a0dffdfc760c36aca7a782c0211486d74 SHA512 c69cf0dc2d72cac4f38a9ddfa90fb268b0d6673a9b74d728bf3fd08811d5cc8599cb17dae2a0e63e064aca0b733a56da27ae2fcc1efe2b02da631b14a54e1f3f
-EBUILD nanumfont-2.0-r2.ebuild 721 BLAKE2B b83f34b1eb0aee35cefc45ae26f2f236329b74ba050dbfd900b10d03caaa454557d6287557722413e6bcb7f1a040c1c5161eec0cffd6c114a5961784bf41e4c5 SHA512 20a66de7d5afc46b306e234485123b94c51431ff5b7e970f77f8d6b39c46d2569f21ba8abe36c298fe1ec3776e11a3502110b21d2c07d4cf95ef891359589e20
-EBUILD nanumfont-2.0.ebuild 487 BLAKE2B 9a9559df6ce4212d812be09d06107ed18fdc9481d0a1316f979b6fca553ed7cd6a2406b27caac5a91db3e72e89219fb58ea82911176a8ce4561fd7e465ceefce SHA512 33a32a6a1869a753df11f60e71d4082901b02fc5df72bd2eb9af413ca14ddadd1d7984285a29d4ffcfe3659d0fc5967db1270375802262d38c5d9ad56edb216b
+EBUILD nanumfont-2.0-r2.ebuild 719 BLAKE2B 76533993365843c478655e039f4bfd749071f3aa070c2dbfbf77c5f9a70d00e6560e8e235f7c3ab773738ce70b1d16687381b2f930bc7a15844d3f5c70ded6b7 SHA512 6551ac10b4937af93529f06e98578d4c366361dee9662683f16332185b4896b8120399fc6d5cc1f8de04279c71ef37a7f567b8a7948a4695c6628d1d6373ecc2
 MISC metadata.xml 333 BLAKE2B 9d3792a2eb82c78418d947f6a870d94fcfd9f468e3109186cd440418bb0c34935f19b9776c5ec2a93be75f374ea143827e06d075a9cd9fb92a50cf6407cb86c8 SHA512 899b5a869916993f06c848adffadb0af91fcad7ecdf0f5bde10d7a801adcf060b3fb2d2ec7909458319b098b4e5a21a1e64a030ffc1a1c4299aa6a57da17510c
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
index 9e1a4b35a724..800a4d275ad5 100644
--- a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
+++ b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dev.naver.com/frs/download.php/441/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Only installs fonts
diff --git a/media-fonts/nanumfont/nanumfont-2.0.ebuild b/media-fonts/nanumfont/nanumfont-2.0.ebuild
deleted file mode 100644
index 89570f4814de..000000000000
--- a/media-fonts/nanumfont/nanumfont-2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index eb47b1f2ddb7..eb03f5d0e65c 100644
--- a/media-fonts/sil-charis/Manifest
+++ b/media-fonts/sil-charis/Manifest
@@ -1,7 +1,4 @@
-DIST CharisSIL-4.110.zip 3435758 BLAKE2B f6c53137499b804c763684b7ed8f92dc08e364785891355568140bf06dbb045cefdc9dc3be8dd81706ab12fe62541b4b5f6daff530fc3206163898aea8cd87b4 SHA512 c9fdb54ec1739ceb81601350eec4778156c564228c858aaf8453946df4dd8c59931d2a3f49deaf75b9109099b882fd259e3a6fccc2cd69b9486ce6937c436dbe
-DIST CharisSILCompact-4.110.zip 3384203 BLAKE2B 5d52d44cb98990066946d3faf4300747261ce699aeb33a6bb8eacf30f7399e515c6dc1a87f203fe72a17b25a3a15dbc786b5e00f7d74c766f209aaf173c85a16 SHA512 8e81df18ff9a071812ba85d57969872cb3d5e6705e010c02dd18973b48445e3ff1b3444b0cd57955c70c390b97174443f1f52f3e68cbc1483fe3ad12ffe59a08
 DIST CharisSILCompact-5.000.zip 3056771 BLAKE2B 8ba790086166b606797242327ccfb9a8093354ef0f5dadbff6edc01c67217628e1c2a46973e17fafb92033af9d4f59fd0807483fd593fad388d5ccf850e34eb5 SHA512 59a444c4085f80719b1bff3cecc2d60176ed2deb136ddc0714de60e2bde1a43c136924e510790fcd7aa8d123f082b5570d80afbf188a15e8363f984dc1e75c80
 DIST sil-charis-5.000.zip 2967087 BLAKE2B 46725b826c53eff25c8a5c6fb7826b5cc9f910424f2afb3ac226aee9ae2cf17b013f17be4b0a19d9c68c63e0f091474125199e8bb4aa60c4d5c678311b1046f1 SHA512 f85da6c9b93c0ef81617241219b208ca262c12fcecae1d447163b7aff31ea8bfc3f09636dcfc0a322c86201a0d551288884e4017fded5bb71bbb54c8093faaed
-EBUILD sil-charis-4.110.ebuild 834 BLAKE2B 93625cdefeac8f420b713a386183c5c5cc0c7faadfeb7934234e9a01e837fd793214cf2ba35966bf2fddac81d810c38137c7ed216198f78f8a80613a0169a4bd SHA512 7a2fc7b5cae28a4e3ddff8e2745f1ae26fba9b980adef8321c83e04feeb5c26000defa1df9cc1e6196cd9b399e4fdb1aa2d92c505b563b70c854d26ebada53e5
-EBUILD sil-charis-5.000-r1.ebuild 988 BLAKE2B e286029166db8be6565f64093332ef22d16bf8d28d1f38e83b0fb6515e3afd9349348974e9e11f636abcc73526c06d94298c7048660139b720bbd9a24f492188 SHA512 19f38ef1d159959eb441d876ff44117ee8c10f350eb0210d063b77a9f6ec46986d5e3f8450fa2668c280f44acbf6a4e45a1b83a8e53712ca037e20cbb26ba7cf
+EBUILD sil-charis-5.000-r1.ebuild 977 BLAKE2B a8d27089ace76def0f662d13ac34298b869b37e4616633cbb08b4f09adc14ec8ed75d4f2d655817e7ed1b6c9fc604b608514ead398a854220b7f0e6248773203 SHA512 c23c03bf1fda141659975f15623ad25a314532fc56663c9b68a17953a82b4a00cf51159fcd4263dca8a33a6e3df3a828f8569062a46a0228dd473bc11487fc54
 MISC metadata.xml 842 BLAKE2B 2aff2242a26218da06b04bd3cd60ffd736661d7aedcefa0be78f514a9f500d918298835e4cef807c2fd07c33f863c518a459d9db9cfefdac126ac45b0550eb15 SHA512 fb1fa7439a87cadcd485cbe7ebcbc7b9477904fae953dfbdb53c92bdbfe30aa6ede685fbe07ff761d5abe1a74d2bde27726e9152e7bd34a8a71a160015a0b457
diff --git a/media-fonts/sil-charis/sil-charis-4.110.ebuild b/media-fonts/sil-charis/sil-charis-4.110.ebuild
deleted file mode 100644
index 0e50ceb8e9e3..000000000000
--- a/media-fonts/sil-charis/sil-charis-4.110.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_PN="CharisSIL"
-
-DESCRIPTION="SIL Charis - SIL fonts for Roman and Cyrillic languages"
-HOMEPAGE="http://scripts.sil.org/CharisSILfont"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip
-	compact? ( mirror://gentoo/${MY_PN}Compact-${PV}.zip )"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-macos"
-IUSE="compact doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-DOCS="OFL-FAQ.txt"
-
-src_unpack() {
-	unpack ${A}
-
-	if use compact; then
-		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
-	fi
-}
-
-src_install() {
-	font_src_install
-	use doc && dodoc -r "${S}"/documentation
-}
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 088723a2da42..e5f7df65a7c7 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-macos"
 IUSE="compact"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index 4a1ddc72c021..6271647c3667 100644
--- a/media-fonts/sil-doulos/Manifest
+++ b/media-fonts/sil-doulos/Manifest
@@ -1,5 +1,3 @@
-DIST DoulosSIL-4.110.zip 1498994 BLAKE2B 112a0e26880c00b72c40e2bf26929eda99195a997333d8aba59c15ddad9eb89c3ed99650bbea1792f213f55a3023bda735c71244637fd615781c67f1fd6988ec SHA512 b08b662dfc0647dac6c629e7ceb66676c36ff098a589cf4292cac2d9d965ea46302e797d7de7a178dff8f4c0def44827699c21ab1763db6abaaaf4c6484b13d7
 DIST sil-doulos-5.000.zip 1347526 BLAKE2B d6f5ea4ce5e5cf264dcd59a96e7bb328fdb7cce66d07e30743e8381ec5631eab6b32cdd929940d75bf7b9bca3f102fdd8619f56a813c022ea90020d4fa2d7429 SHA512 3698b3f330d34cfa2be93f9dfc87c113a0b3e174a40ce9c2277bb452161cda61aab4688338ab3aeaaaa3cc684cedc58bbb3f066392e3911246a230d1a9fb02f3
-EBUILD sil-doulos-4.110.ebuild 616 BLAKE2B 45ae4d3a67b3dad7a6287f5ceac353f334b1d4e2eafca0d42184b94b400b4f9456f4fa4599203a4e2ed000debece35428ab9bf7f7275828fce12c53865e8333c SHA512 016a86dfaef988930fff15d97316bc4ba36db6d9091de2ea259e7b642174b8824662131e226117b2618531ca981ced3a853bac208349a584ab8f8aebe1fdd3cf
-EBUILD sil-doulos-5.000-r1.ebuild 640 BLAKE2B acb42e6436fd024e069a89b970eb3626053ace912ef9f9c28ff8fda77056c8748ad581a6a8d551d997e197da4564889b1e5a2787023e2edf54bce9809bf75245 SHA512 1e138b19b0f4af86609915acb2f84d857fc9cc2f99898303fd3648c023e12f996f3541d33731996df1d5f993ecdd1fa640ad1d3e3d954d75a02f98187361dd21
+EBUILD sil-doulos-5.000-r1.ebuild 629 BLAKE2B e344421d1d07252c100fbbe22bd0f878d79f03122f5fdca8a9ccdda4efd020c115d6abe0b838cbb26c598c85baa43144b1057a97c15be7eee897a3770332d36d SHA512 c2592941338b0178c1f559eaede70ac4e3d7a7079bdf64a334debc41ce3046cac798fc1eb806167291069c7b19006a882a8c880ce79124c505ccf21ea7591178
 MISC metadata.xml 1107 BLAKE2B d213d88142231e9bdd7f94e2dbfac584fe2a67de6ca0eca48d8d2440da63aa16a1490101132e04bdf1fa23eb30d3dfd2b1765cbf132ef0dcc85b688379d08883 SHA512 2f5692898543ee8f0fdb8621046604720d43c2ca9eb28a474c3cc01081fd877290997a65ac7457b3dc58c68ecf1636b05deaaaf52e89be5ebdde77b0f5ee71d9
diff --git a/media-fonts/sil-doulos/sil-doulos-4.110.ebuild b/media-fonts/sil-doulos/sil-doulos-4.110.ebuild
deleted file mode 100644
index 216d29aa3266..000000000000
--- a/media-fonts/sil-doulos/sil-doulos-4.110.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_P="DoulosSIL-${PV}"
-
-DESCRIPTION="SIL Doulos - SIL font for Roman and Cyrillic Languages"
-HOMEPAGE="http://scripts.sil.org/DoulosSILfont"
-SRC_URI="mirror://gentoo/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DOCS="OFL-FAQ.txt"
-FONT_SUFFIX="ttf"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-
-src_install() {
-	font_src_install
-	use doc && dodoc -r "${S}"/documentation
-}
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 d651c3ddbf5f..28ca843c4eb8 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index ad4c58b61bbf..1d4a12d36412 100644
--- a/media-fonts/sil-gentium/Manifest
+++ b/media-fonts/sil-gentium/Manifest
@@ -1,7 +1,4 @@
-DIST GentiumPlus-1.508.zip 1986418 BLAKE2B 025ba05e67619be53e9cb020c19d66b3e50176c27028161ae674d6672e2f45a1ecd65363794ad66f786db720b034cd81a8e63b3a0ab9c324e9a1d6ddf6910cb2 SHA512 7948b666b33338b5e7509a5e46633dc4c8d72aa098013ce0fddd4dba80cb217a2ff240253e1f3f477ea5309b9c9a8284c724cf9378d1ac0632ff53784cf2be44
-DIST GentiumPlusCompact-1.508.zip 1957129 BLAKE2B c981160c9eccafac75b9d7bf421a47ba213d52e45408d0ed95273ae47adc2c8b9f45629114e58a03e770940367d4c6cf9b8dfa9ee5a7f2a5658d5f4ced05509c SHA512 b031a0edc0d4ee527378cd0834ce447f0aca00abd75148c2e1df1a8fe281b75361e535496c8e39f8eab81398af6ba302a0c78872877bc589b27db3e7078638f9
 DIST GentiumPlusCompact-5.000.zip 2089135 BLAKE2B 78d734a3289c1577869fb57126f66f13eccf268f8665fa15e9c4f34cfe43a52ba9e10e00d35382d5745070a6ce43f2c75622706185933e151eef3a6b340f2e0b SHA512 1959ef4e1e05a3d1fb68b2f89e0b90683508239118a7fcad8ba667753635790fa6a5c882111128150e8c9f71557947a11d7a156f931326a5844213094bec16ac
 DIST sil-gentium-5.000.zip 2025499 BLAKE2B e13130aaff0d3893260598605c2332e7316d451e544efead87bd527a275ef1565e5b76ddfa3491b32bae77cd773f3d52b1d063851a0f694a54516c65fef15c92 SHA512 6580fb6717154d25230c837ca6150265349171cf2ad670b638c5029e034ba446dd6adb9508c9b667c6ebad1b05357326f7684daa5517df55235a8728c48f419b
-EBUILD sil-gentium-1.508.ebuild 873 BLAKE2B 52b49b800e5e185296a8375c204e9f6feca3dff4f92c88fbebff583dbe857292848afafa0bf1fdd857528e3c0dba2933f5f67fe74b26d2d2c07dcb3445f00555 SHA512 e15976e174a374b029f598d113f64a30162b381e2634aed031beb9d4d0c7e14b577d89209d40b5a724d03702b78b1c55c86799c7c9f3cf2e992443b5e0e06063
-EBUILD sil-gentium-5.000-r1.ebuild 1115 BLAKE2B 7c000c72478479cfd66089cb8de9f43b2587cb5cbdd5ea6e9f3829b2f2e5aeff972bd497dde4cfb9d578d1207775b51df9072915f02cc3c161db91d35e7b995b SHA512 e9615d540c3108251f5c1e8bb0b1838df032af45e72fc4a9b94ceec3e6ba0bafd731c26432399f49da92553f32954d80a597d206d538ae993798cce3484e266c
+EBUILD sil-gentium-5.000-r1.ebuild 1105 BLAKE2B ce5e3f8f5e93c05694820b551f285cc79a39fb1479eda458b7a2208977ba908e46a6d3c0f24a0d7cb50e333815c2ac76f84349ee026528f34c77c221c339ae38 SHA512 bad2502e353cf8ecea80dd06eb854b0439452f21f6dd9806114c8e410eedc30e3c59ae1112a9151e40d07c93ce5dedf39cefd012c7689e71ae40c6e11663f127
 MISC metadata.xml 1117 BLAKE2B e994bf44da56f29dd77dbc8de5b0f85a61146f079f4af32516d9b7499a4dc6e7902cc1e2c43af83d74b2d542c956c03c16b4f843b9e487ea2772242665d83900 SHA512 b2f33956c0bfef65d97a4e96ab1ca7a37db7f7892be729798d26fcecea8c76c66942df7bc675a9078fadab9cbd287960dd572381938f0b9c52519672161458d9
diff --git a/media-fonts/sil-gentium/sil-gentium-1.508.ebuild b/media-fonts/sil-gentium/sil-gentium-1.508.ebuild
deleted file mode 100644
index 729c747dcfe2..000000000000
--- a/media-fonts/sil-gentium/sil-gentium-1.508.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_PN="GentiumPlus"
-
-DESCRIPTION="SIL Gentium Plus unicode font for Latin and Greek languages"
-HOMEPAGE="http://scripts.sil.org/gentium"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip
-	compact? ( mirror://gentoo/${MY_PN}Compact-${PV}.zip )"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="compact doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-DOCS="GENTIUM-FAQ.txt OFL-FAQ.txt"
-FONT_SUFFIX="ttf"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
-
-src_unpack() {
-	unpack ${A}
-
-	if use compact; then
-		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
-	fi
-}
-
-src_install() {
-	font_src_install
-	use doc && dodoc -r "${S}"/documentation
-}
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 c17640d19a7a..07ca20894df1 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="compact doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 56733ae7cbb5..29b23e999dd7 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,4 +1,3 @@
 DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
-EBUILD sil-padauk-2.8-r1.ebuild 496 BLAKE2B 4de4e5a5aea589e020b691f106888897f282eef0b0d18c3cfccda3a879ead45da63cfa88512667acbfb7197f672dbd82fb67f64561391442aaa289731167fbc9 SHA512 3ad234e15842007aa6635c64a92ee65bda27eab0d5eac24314f5d4a05dce63fa9f59a5e99ab47f7b0c6db294c5365b97caa5b8cc0e57d1323e08a3da8cd2ec2c
-EBUILD sil-padauk-2.8.ebuild 496 BLAKE2B 26c183757e6cdf9dd3a3795c775c0dcb21371b8f64bb03dfcc4872dcc97e26018b1c9881a25044b7a6391555b6f8bc07f305f55496fc727edc4b477b07310078 SHA512 f98a9664d554a8251fa56b3a1cf9188d0e05b3955213619f42a54eb7557239d043ac24a98902c76f1ae3fc9a28a22f38f1bfe7340297379221347d573cb382c4
+EBUILD sil-padauk-2.8-r1.ebuild 486 BLAKE2B 7f5b49ce5706fd1794323b42c47951e5d56ff7d7ffd2507c53244d299da16d05fb1be493ae34e0d49af846639ecd8d524cfd4e55cee6e18e885c1380c3d6c66a SHA512 1f7f4702827dd0ea99a0b7b0f4229a183bf7ecdb5661f53d6bc7cccf8ab0fc669ca803c6f51d5e99d1c8690b6110b8225354d01697d4a6a190b75a2764e09224
 MISC metadata.xml 414 BLAKE2B d9beb4772ec5900f5d59dd25ddabb6839519b298affb780c548febe8e93fad52e53d1763b82d49b248cc3972bb5b7f3228fbad05c9fc2d611239faba2395ef60 SHA512 6cca51cb9d6fcd2c1253bccfcbe8ccecab7463bce295c430d81349cd7e7de227f7da7b8f301e600b4922137638500ff6a53b3a9cc803b1b6725c9b52de86c7f7
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 67ccf42bf0d4..6f2bc08773f6 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8.ebuild
deleted file mode 100644
index a60102903f78..000000000000
--- a/media-fonts/sil-padauk/sil-padauk-2.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_PN="padauk"
-
-DESCRIPTION="SIL fonts for Myanmar script"
-HOMEPAGE="http://scripts.sil.org/padauk"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_S="${WORKDIR}/${MY_PN}-2.80"
-S="${FONT_S}"
-
-FONT_SUFFIX="ttf"
-DOCS=""