gentoo resync : 04.05.2019

3 files changed, 2 insertions, 22 deletions

diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index ef7308e01ed9..f1c7a8adce90 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,3 @@
-DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.3-r1.ebuild 539 BLAKE2B ecb19be659b4c3196f61a601523a60c1dd71efe169aafa26eaec87233803d6ea0390e20d64438549fe5f4bc6cebcc1578b0c7a7a5408d6e9bf3416ab3fc8a8f8 SHA512 afffae656694c41c6ea15be00b4efcf1cc0ef2377ab46c99577497495235fcecf5230b0f3f58d9db5b6cc31f7d55cae34c8762121522e9bee85e6179c23aedf5
-EBUILD libfontenc-1.1.4.ebuild 540 BLAKE2B 30d8ddec3ffce144ccf6cf6f1d2e7d94dafa784d8e7fdceb336116c2e62673cc6ed7bace91adef098bf0355c21e781180a139aa2e8fa9e5dca234d4a26e49d90 SHA512 db1307bb1fd9ed648adc71e690aef902dfc0ba53ea3d98e28c3709ebdf4497145b38c182e1f1ec1c33b2a282d3ce11802ef163eaa418ff32599581aa22270b29
+EBUILD libfontenc-1.1.4.ebuild 537 BLAKE2B 825fa6e31419ca70f6e1e159ada681fd177054cb30af49691717c9ea7c2dda074b2b7162101554d804751cd2af1a8dff21f313f089c59533ebfe3f92dc8ff47c SHA512 662015465c78c282ce7b1fd0354bdce58faa85a8f3a15cce688442396d36db2a14369396050050aa9ac4901166f6dedb348a756bb052d8e1b227becabb99a39e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
deleted file mode 100644
index d2b4e89fe49c..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fontenc library"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 780869d7c306..6d9ac818b874 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"