gentoo resync : 02.08.2019

3 files changed, 2 insertions, 32 deletions

diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 739fadb63f7c..a191dedfe165 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,5 +1,3 @@
-DIST encodings-1.0.4.tar.bz2 665087 BLAKE2B 867da2247836ed829af8e6c465eeeb40e84d98bd114939843be619f2915f61c5ffc56a48adf9414e39c7a3ddd0fc86572fb85d2bc486cf68886d48d78e369761 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
-EBUILD encodings-1.0.4-r3.ebuild 706 BLAKE2B 1d99857684028e0fd3be9518f467a7a651caf1f47f2228073f53a76184d0e946370db0178893f26ee4ef5b793ccfa24b3be9816b6dbc37c1da4949182180ab25 SHA512 5e98154d7837045ddb5826a346d168cc855e80dde991d093e89c8518f031c670c35eadaf3e88d2b82d075323d3b837969d9c0eff1eff2372f0f4aa2e3f781a48
-EBUILD encodings-1.0.5.ebuild 695 BLAKE2B f73a8079a8315825e65483d11e27e15ccc46fcdcada5f07316023e40a3be1d208891b05c1d1fb18ce83971d2beaf9e4638522e7e31f36e264d8a98f8df580bb5 SHA512 bcdc0a2d8219b3d8f6e1b49499ac0c04ff3a695348897042620d762035c3d8241999592643c79e44ab20f41cf098ecce3d53749b76776d9e80fc25e692262d31
+EBUILD encodings-1.0.5.ebuild 693 BLAKE2B ccd89a3f60735b83b205903f757771a50d5b74ab4c2ffb5a7245af674227ff79770d9214f1caec720e8b40132b0fdb28455689828dedbaea7071a13f3228a0e6 SHA512 ea476c1cb66e5ee78914e3ec039684101b4009a267dbcfc4e78cf9ecc06ebfaeccf5ff9f1b9ceee47405ebeb6fd0375c6d3efb277a447a35bae22cc3180e71cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.4-r3.ebuild b/media-fonts/encodings/encodings-1.0.4-r3.ebuild
deleted file mode 100644
index 03202612b63b..000000000000
--- a/media-fonts/encodings/encodings-1.0.4-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# font eclass is needed since "media-fonts/encodings" does not match
-# check for pattern media-fonts/font* in xorg-2 eclass
-inherit font xorg-2
-
-DESCRIPTION="X.Org font encodings"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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=""
-
-DEPEND="x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-ECONF_SOURCE="${S}"
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	font_pkg_postinst
-}
-
-pkg_postrm() {
-	xorg-2_pkg_postrm
-	font_pkg_postrm
-}
diff --git a/media-fonts/encodings/encodings-1.0.5.ebuild b/media-fonts/encodings/encodings-1.0.5.ebuild
index 82b8b59e78ab..6bc36202fd69 100644
--- a/media-fonts/encodings/encodings-1.0.5.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-2
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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=""
 
 DEPEND="x11-apps/mkfontscale