gentoo resync : 15.01.2020

3 files changed, 2 insertions, 33 deletions

diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index 33acd1d6faed..ddbeeb41dab3 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,5 +1,3 @@
-DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
 DIST glass-tty-vt220-001.3.tar.gz 23707 BLAKE2B 3fe67a3e34d405aff20addaacd4a7acdd9fb4632cbc7f277a715469fab3ba68ef6985e17e8bcd630264641ecc56cc0f9a2e08876ac94ed26b40175cac1709738 SHA512 9ed77e9cff5c1c59a9a93cb2caaebdc19d8057827165630882cbacb5cc79e15c6b90044d3a5e85bfc55c344a16128d499f15d6bdff8ef3091093b2b7790fbedc
-EBUILD glass-tty-vt220-001.3-r2.ebuild 760 BLAKE2B 2c024219a09e3a5fe29b8a4ace84964552a91ab5165de954fb8bc2e39c6f2b788310abf0de061decabb88388882126a2e4f5394d56a5cae8575c3c88aa89e9b2 SHA512 89113faaea56814edc81d66924008a7df8b290b45ff71c1f7d7144ff2a4da8822f22a54983c3d9672f53a5449802180d8cde647ef7308409ee45b000be022838
-EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 2ef4c65ef8a1b8df1ca15cc0683fbf9974c6677cafe446609e49fa08ab627e13626feb65dd55e4933dbbf1b1e61bb2c6cd491d0755c8cbfa41cc261e23b7c670 SHA512 0be4ba90fe98d6fdb5f33f1b1fe9ecbe23b86555f32a2bc8c3c94fbc09143589ed2de14eed28431df20e6aa48c8dc0a62b18ef41649d0a50e138e1e4313709af
+EBUILD glass-tty-vt220-001.3-r2.ebuild 757 BLAKE2B 0d37ee066cdf36b95115a17b48ff852157f4e3fdd20ed340f32b7de28ff6d562dc6280b0ddbd0509079ccc5e18189f8cfa705a44ee4cf432110021be6cb5a11a SHA512 c3ff6bfc062a2f90245d719b152c065fa36417ab07e3dcd045923bf7b45018baca3d13b01f68c16c03b51512e621e3e50a899c9361bc3be680e865e9e33dbb7c
 MISC metadata.xml 883 BLAKE2B 2dd17a42c2bd1dc5ff6303b106675a72aacd0f93a41e3c784f1fa0fde749fa2dca4b02d53feed0d8bd17f8632d383de9f97a1bdafac376a8500d2447be297b01 SHA512 77e4c66e296c88a793843627743bf3cdeaa32e0453c5fc6304202aab080a50d79bd8b33341be05173e167a22ef358605ae33ecd35eb708085f2e131eee1d5e13
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
index e9c6a1763e84..bdf6db36c461 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/svofski/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 LICENSE="Unlicense"
 SLOT="0"
 
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
deleted file mode 100644
index 32ca56359a3f..000000000000
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Hacking with Style: TrueType VT220 Font"
-HOMEPAGE="http://sensi.org/~svo/glasstty/"
-SRC_URI="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-${PV}.ttf"
-
-KEYWORDS="amd64 arm arm64 x86"
-LICENSE="Unlicense"
-SLOT="0"
-
-RESTRICT="mirror"
-
-S="${DISTDIR}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	return
-}
-
-pkg_postinst() {
-	einfo "When using the GlassTTY VT220 font, you must set the font size to 15."
-}