gentoo resync : 15.05.2018

3 files changed, 2 insertions, 35 deletions

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"