gentoo resync : 04.05.2019

3 files changed, 2 insertions, 28 deletions

diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 11d52db903ad..5f6aae8a1ae5 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
 DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
-EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd
-EBUILD mkfontscale-1.2.1.ebuild 635 BLAKE2B ddf6792dd4ead0a415a65fdf99ca93d48638e7b41c050cfd345e73a5756366580b7f5c8c5a43ad36f3964fe13d9351e5a82b30c881ee80d99cb0de9917e48e68 SHA512 52a283f1327fccbd18bd4e1911cb8a09cf3c0d181e1e989ee50bd8bdf007d9241aa5dd23d189f9df029340bde39f1468f51db982da430b170f9f73fdc2cb4372
+EBUILD mkfontscale-1.2.1.ebuild 632 BLAKE2B a9868c3b217f9c0dd14423723441617e246ba78720964602e8cb5c80fbe1280bd76960032a14d26326870b4c64994e4d0e34c32238fce9e288dd46df6969703b SHA512 3e4b976352e4db8be492fad7ac5b3718d41411301eac72d14b0485f1160000956364e32163df8605b8faf22c52be645bffbbb693cbc29b79e1f6564c1044726a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
deleted file mode 100644
index bb2c8a3d40b5..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/util-macros
-	app-arch/gzip"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 69935689f2fd..434349d1b0dd 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="