gentoo resync : 15.12.2017

3 files changed, 3 insertions, 21 deletions

diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index d3bb5e06aa32..277e2a90e678 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,4 +1,3 @@
-DIST encodings-1.0.4.tar.bz2 665087 SHA256 ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17 WHIRLPOOL b006a8fd1bbfd50f33084203b23bb56e05bf1c3ca8407eb4bb62033154f10226774f93f800c915d35472542c6ae11a2a0ae124d821e34d06e2ab04e6818e1301
-EBUILD encodings-1.0.4-r1.ebuild 487 BLAKE2B ca108a3db6e7084c219d37f98cb4c63bc32df6dffef9259c64a776e5de6cdd2d2152dfcb581fdc0e81c7e0bdc56fbbdd28e62af471a9aefaa0e429efdea33887 SHA512 faa8363a7821a2b6be6e2cab8231a9c15250724c86f7605bfddd3e1f1f1de41ccf4970fe36bd72c7acf2b474d5dbe3fb7749aabbe55637d433955aeaccaab4d8
-EBUILD encodings-1.0.4.ebuild 497 BLAKE2B 876a60d00ab314e664232e4667f84b755c63314e2a26d0699c6ad9dc624d79a84449cf6244a15d522f672c93fbca8a81104255520abf271106e7346cbb4cf5f6 SHA512 bb693283b18fa69c91042e3d8720aa0f0bb02b23a506a9cc7b8f94faf8008f8145d9a7d3ed22d1849d2eb82aff85b70c3134b0292eb6edfd6042a0a9c6f4eb39
+DIST encodings-1.0.4.tar.bz2 665087 BLAKE2B 867da2247836ed829af8e6c465eeeb40e84d98bd114939843be619f2915f61c5ffc56a48adf9414e39c7a3ddd0fc86572fb85d2bc486cf68886d48d78e369761 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17
+EBUILD encodings-1.0.4-r1.ebuild 474 BLAKE2B 7cfd4a3fd76dd0ac0400339930c6e6f4a0a0dd383b1a3327c1543b986606ceca3fbb57b2adc35f661ce3b815f96867b39670582f6250b72a49b3116f78bea80d SHA512 cafb098572c948d2688b5990f7db20814a16630d6858e230a9982fb6a53b401f41a194bcb77a0578edff499f90ef49d3f24881a3dd0507d51cfb5f077060b805
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.4-r1.ebuild b/media-fonts/encodings/encodings-1.0.4-r1.ebuild
index 6c2041d2b41d..55a2e3129890 100644
--- a/media-fonts/encodings/encodings-1.0.4-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-apps/mkfontscale
diff --git a/media-fonts/encodings/encodings-1.0.4.ebuild b/media-fonts/encodings/encodings-1.0.4.ebuild
deleted file mode 100644
index 96390dec7118..000000000000
--- a/media-fonts/encodings/encodings-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-ECONF_SOURCE="${S}"