gentoo resync : 15.12.2017

3 files changed, 3 insertions, 18 deletions

diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 5f152c5e8e3d..f57989a34ce0 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,4 +1,3 @@
-DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 SHA256 ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd WHIRLPOOL 7507e503b0d99d516871f9479610b00a769dc78eda87c37b4e53ec10c56b2d1c652481e32f985a199cf9ff40cdd95d50ee45a9d05f337f2f944a5d4f3f9e4169
-EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 322 BLAKE2B 6f74ae46ff360a1d16b4ffa32f520cba2e66d9daa5f877bb1fbef06d031b3ee6a62b2aafcc294f10668cab33f9010d4aabda110fc986aa08aef198066047217a SHA512 e4caaf7b0ae08782a5dc544407c5453d8edf990eee215f532b198c8df890b8169dfc79bc169853242b12c3ad12bdad15a30719e3f24ee289d06e2859807a1d41
-EBUILD font-bitstream-100dpi-1.0.3.ebuild 334 BLAKE2B f6d82fa5943bdea9cdb1fb7eb08cb8bde88144f02dd4161a47ef100eb0ebf8b6e4dbb0bee57533d770d3e725bce554e5dd834c91e4822a76518a45ed70253098 SHA512 a779283167b912a5a3ceb81a8f287025ecb7ccf57655edb36a8aafc88af339e09eb856994f5e7f107c6ac902e53e8086128fd84c4bc48fe6f55789a7a978b5e8
+DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
+EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 311 BLAKE2B 7dca945aa6dbe3e065dc3d3f2bbd93147555354b68a7f03c656ab4e55b6e9ea296875fa8b7aa9d1e0dfb92ae468012e9d00252d87931d90ac9489e15b2dcdae6 SHA512 42842d7f4a109f2c40df73343fad4b06edc601a9303b93d71c6d0f903218965d71df0741e278f4255d1e23fb3ad9cb2c36d33267f1f57cbf9d059a937df56664
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
index c280c8b458b7..b9020d419e67 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild
deleted file mode 100644
index 93dca07ef2f8..000000000000
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild
+++ /dev/null
@@ -1,14 +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 Bitstream bitmap fonts"
-
-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"