gentoo resync : 19.01.2018

3 files changed, 2 insertions, 35 deletions

diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index ebaea293f868..ab5253bddb28 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,4 @@
 AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
-EBUILD html401-19991224-r2.ebuild 751 BLAKE2B 88342ff6cbbeb2e0fcd389456bc469ab1c8470ffbad80cb6761f8bfd0a4a94884fbea9a3fb3e418944a08d353b59cc0bfdcc788001924a039b30acb7fc5df928 SHA512 48f9954963d403399bcb63dc18fa24ea36b28fa0d79f3612e504a37139cc3efe4a6a1537d349a9d2c62bef9c5f7542cb6f7359728747e90649145b71d14a494d
-EBUILD html401-19991224-r3.ebuild 768 BLAKE2B fa0e8462702a729066e2e1f115909ef0a4ae442b19be0b428025d4a799ce0bf7276a5c1afe59d3feffe6707ccd9b1a7010e77f45ad6271c9e947790a5a91ebf2 SHA512 5bea14c5ff1dd2db7a9541cc0985d41279013a9ce6e0177be0b1439213cf0e9c583632513fa5813cf20e598ec6cdf018fd70d7b52cd804c949ca804c22c608de
+EBUILD html401-19991224-r3.ebuild 767 BLAKE2B fb6c509178154e010191683b1b3a26449b3136e6e662b9033134314b7587ba69c2583046366e1d7b0cead226dd2e6e3f24e1ba97eb4270a15080d4fa3086164f SHA512 f1669367c90b57b5d53e296736e511fc84561532d61f58caf6b7d76064ec178dcda9b0b02f6f27467c2e0f50059e0cfa37ba78edd6fd0841dbd4eb5d4d296e4b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/html401/html401-19991224-r2.ebuild b/app-text/html401/html401-19991224-r2.ebuild
deleted file mode 100644
index 807d1d6eaeef..000000000000
--- a/app-text/html401/html401-19991224-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
-HOMEPAGE="http://www.w3.org/TR/html401/"
-SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="app-text/sgml-common"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-		"/usr/share/sgml/${PN}/HTML4.cat"
-	epatch "${FILESDIR}"/${PN}-decl.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins HTML4.cat HTML4.decl *.dtd *.ent
-	insinto /etc/sgml
-	dohtml -r *.html $(ls -p | fgrep "/" | sed "s#/##")
-}
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
index fe8aa9d173f9..777837fcc2f2 100644
--- a/app-text/html401/html401-19991224-r3.ebuild
+++ b/app-text/html401/html401-19991224-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND="app-text/sgml-common"
 RDEPEND=""