gentoo resync : 10.11.2019

3 files changed, 2 insertions, 83 deletions

diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 9bbae74489b9..0f9016ab3c61 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-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r5.ebuild 2160 BLAKE2B ca6392bf2c05f249f7d2ce3a8f4ddbc184c80e6d5d4f292db63f33415c9a108fcc655a633665a7784fce61949bece01a8f29c72ced9994456dee3e3a1e0587a5 SHA512 b1f7470392e2d8acc75c0604f396621c624153baf7a27afac83632a3464c4001d94069b660adcc8432b038f2697ee0c3ab8a8b50dae3224f0d90670c81a791a6
-EBUILD xhtml1-20020801-r6.ebuild 2360 BLAKE2B 2d16c6349e56d2960aa32b0fec23898af872fffbb2a2d44253f8aa60ff93129c75938868401106e04e5fb93d3f014fc51bac45fd6c6e77eaaa5690e0275f2dd6 SHA512 e3c6a8f6453a00595c6f3fd478907b8d79a04867de73fc7ceacccf9d672e11615aeca8127de813fd7c127c955060402c331b4e2af458e2992e29dc8d7cd4cf61
+EBUILD xhtml1-20020801-r6.ebuild 2361 BLAKE2B 73fe63abb3bd77b8ac2875040969a302c75e63d02524df43fe610b3b9543a867a92c240ab4b8bfc468507aeb83de63ffad70408176ccc5059a48e7ab33a2d821 SHA512 b256d6c0300b7a712785376e870f7e70636bfccd4f4fb6f7b2700c2dca242d6b6bee9e1cdfc81b2b0d8f04c986e21e363b998692abe92804a2aa3faed34a2981
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
deleted file mode 100644
index d46b7a400430..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="mirror://gentoo/${P}.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
-	insinto /etc/sgml
-	dodoc *.pdf *.ps
-	dohtml *.html *.png *.css
-}
-
-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-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index e4ee29db7afc..41ac3da774b6 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit sgml-catalog-r1
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+HOMEPAGE="https://www.w3.org/TR/xhtml1/"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"