gentoo resync : 15.12.2017

3 files changed, 3 insertions, 19 deletions

diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index d655939b62a7..bc051093d7cc 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,4 +1,3 @@
-DIST font-bh-100dpi-1.0.3.tar.bz2 713206 SHA256 23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481 SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2 WHIRLPOOL 6a4bd2cc21d6dc2d391741c5abf7b70adb91a25293b3a46e292508675b4b4e89cf2c2f93974d605c4a82e894bd4aebe3c3a9e46c025ecdf30c3aa272bb98a9cf
-EBUILD font-bh-100dpi-1.0.3-r1.ebuild 386 BLAKE2B 583f3e45502de3d7d8e2664b57468b28de8bcd340dcbfe1f7adb04ecb93652f742066f6525f1f245871724b72b62cde3a5294281d00f3582bd2f8bf8b2dd82ed SHA512 06cfbf52c060ebacde018220913e7812a7701887427e7373a969432915a8bb47383549a510a93dc3534480cc05452e52f1f3e802aa8cedccbe3e5b54a96b6606
-EBUILD font-bh-100dpi-1.0.3.ebuild 399 BLAKE2B 3e02df9e6bbc5502abe1ecdb1ee18e69ee837330d94b8581e2319d0a2120deec86818d468c6723b2b5fc3fb504a59e1349a013fc9aa2b8db1ceda0baab74457e SHA512 3af35964afade4c5892602f155eced5b46d489b1c073f2bc8eec9592224d57f426b1d3f218aa2f2db322e694fcdf69b1497647ad68ae244766a972e979c70fbe
+DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
+EBUILD font-bh-100dpi-1.0.3-r1.ebuild 375 BLAKE2B b1eb84da9c24edabc4c9bc7f28c2d4822d7398db268f27f45516a14058a8a251bbe748dd22ce72e7064d4585a140c7e896d1d37ee84da0a0909c1ebe10e9cd97 SHA512 c62ef7fe4214209bcf22581bbc9791e52ca8a63941ac107a8010a2ce2933af6ce0406c9cc665d187fee2efa5134b490d9ac69095163f1b553b515a250c648ce1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
index dd8bbfa16b3a..4ec726c9f149 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
deleted file mode 100644
index f72d17583101..000000000000
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit xorg-2
-
-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 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-apps/bdftopcf"