gentoo resync : 25.01.2018

3 files changed, 2 insertions, 83 deletions

diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index a220114ae1fe..378648ec292a 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r4.ebuild 2244 BLAKE2B 2de0b7976f3c0a2784228b32f30abf9d453729646059f5bb05ee729e48ab0eaf0257d897a083ef1e7ab2f4a4fce139203526846748e6310fa9020b85263084da SHA512 31718f3105af95a71fc688b260e7149d7fee94d8d9c3541868773407b8a130a9f19c2f693dd55c5c82b3d4f6dc4358b4f0bebe0eed62c7fe1c6c612f9ea687e3
-EBUILD xhtml1-20020801-r5.ebuild 2180 BLAKE2B f257ebd086f2f59fc286d3fe578e221799bfe13b54ffa026f0a5e4f15fcd0eb016ac00f63b5b4c1b25d357b49c99b7b434985178930455f6352b50201e8ae192 SHA512 0bba7ff7f8238383368ccffb64a7a937ff171700ec58a7528e4fd6f311ea716cb3f08c9c56eca094a3dfde4055a4da5475a07d54e75df92413db58e599dada3a
+EBUILD xhtml1-20020801-r5.ebuild 2177 BLAKE2B 0d0c33716b2f816b03713365af543835934e9112afd74c00099fb98d9013cc5b8adb0581f3e6dfd64456511cd1199352cd51dcee244acee426b3eb547ce19b55 SHA512 9b7732f5606ba95344bfe1bce64f5f3ccc7a298356b9d25f3ab6e9fa667c4f9be2f98168494c535b9226cec6c3dbf2b55a92f7681d5222fbaf7e6af0efede957
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xhtml1/xhtml1-20020801-r4.ebuild b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
deleted file mode 100644
index 457f14f5572c..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
-LICENSE="W3C"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-text/sgml-common
-	dev-libs/libxml2"
-RDEPEND=""
-
-xml_catalog_setup() {
-	CATALOG="${EROOT}etc/xml/catalog"
-	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
-	DTDDIR="${EROOT}usr/share/sgml/${PN}"
-
-	[ -x "${XMLTOOL}" ] || return 1
-
-	return 0
-}
-
-src_prepare() {
-	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-		"/usr/share/sgml/${PN}/xhtml.soc"
-
-	epatch "${FILESDIR}"/${PN}-catalog.patch
-}
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent || die "doins failed"
-	insinto /etc/sgml
-	dodoc *.pdf *.ps || die "dodoc failed"
-	dohtml *.html *.png *.css || die "dohtml failed"
-}
-
-pkg_postinst() {
-	sgml-catalog_pkg_postinst
-	xml_catalog_setup || return
-
-	einfo "Installing xhtml1 in the global XML catalog"
-
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
-		${DTDDIR}/xhtml1-strict.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
-		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
-		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
-	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-}
-
-pkg_postrm() {
-	sgml-catalog_pkg_postrm
-	xml_catalog_setup || return
-
-	if [ -d "$DTDDIR" ]; then
-		einfo "The xhtml1 data directory still exists."
-		einfo "No entries will be removed from the XML catalog."
-		return
-	fi
-
-	einfo "Removing xhtml1 from the global XML catalog"
-
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
-	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
-}
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
index a1093ba390cc..b1ffbb673296 100644
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
 LICENSE="W3C"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common