gentoo auto-resync : 30:07:2022 - 15:10:23

6 files changed, 4 insertions, 75 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ac5acbd2c53a..33d68a5632fd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 12220c86883a..29950e886b6f 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,6 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 565 BLAKE2B c68fca7e9f273a6d32b9689
 AUX docbook-utils-0.6.14-elinks.patch 239 BLAKE2B 3f2b99e9afe33849af50428053cd057e96420f9a2e004b4193afd8ca5b43b7795ec852cfd5e511b5c2aff8013092c805b0c46b3d334148eb915fab2b2793c315 SHA512 d8848ff585a3db20b95d58f6eb249dcbea039e303f21ae047946e809e734824227a2fab8ff5d5366bba4a66650ccc7f1a0e3b3e11fa1f8b8173c2ae308844b5a
 AUX docbook-utils-0.6.14-prefix.patch 2810 BLAKE2B 1dcb7b40cabc930f96d2caa3c541dba42c7ab380a08cbaf6bf87b9c84dbb13f976c7f1dc05883c308b789c5295fd5ec97c2ef2aa8cf5046c9f302e3d8c873fe8 SHA512 c0fcd0575b031c9dba6ca42cac7e46bfeb687279006b69ba931dbbd546234309f9667e9a6bdd355bd518d8346589a68e1c453b36239fcb158899693819c41f70
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1825 BLAKE2B 663ce29c6c25416b5a0a405f4a20059c1b565a218684a4ae7c0a0e2f3ee4ea842c080527aafa0c4a62e14bd825f6d07f47602e3585e4a08709f863778cf6ec99 SHA512 a0ecbc59c6355206064cee0253b4cba479555af7fc13c24c1622a14095a1314cf80ccc7e72aebd79a4ce6e2ded63031e4f0e61fbb15759ebb1d5e3a6b52afbde
-EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1840 BLAKE2B 2fe20be602e3020968924711af1a0cc95abfba8b4e97ad87ee01e4dbdc4c727f857d6037c819ca4a9e17786a8f1ff3835d1c22293944eb42040b8abbd93c9602 SHA512 5051bb6dd4563b12b9458cb4daee3129b45b5f9bca4c655d29cbcfd496c85878e74143cc5074c82b5980ac9c3bc22e4bf5f3471909d514f98bdf0f6ae5a8548a
+EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1839 BLAKE2B 24e3f741edbfca5af82de161c83054a97780a14372ac9a64bc82d4d9186bdf6d583dfe29320ee80db3c808421f81a7c29531889931c0f0ac09a255b4d4d9da74 SHA512 00cd791261201d544022c1da618e385ab6f123815bc2cdab17d099f637d1a1278214748bd9872ff28300feec31acaad2f7345f543214f24f2774a3b93f9edaf4
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
deleted file mode 100644
index 344496f27daa..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools prefix
-
-MY_P=${PN/-sgml/}-${PV}
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	dev-perl/SGMLSpm
-	~app-text/docbook-xml-simple-dtd-4.1.2.4
-	~app-text/docbook-xml-simple-dtd-1.0
-	app-text/docbook-xml-dtd
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1
-	~app-text/docbook-sgml-dtd-4.2
-	~app-text/docbook-sgml-dtd-4.4
-	sys-apps/which
-	jadetex? ( dev-texlive/texlive-formatsextra )
-	|| (
-		www-client/lynx
-		www-client/links
-		www-client/elinks
-		virtual/w3m
-	)"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${MY_P}-elinks.patch
-	eapply "${FILESDIR}"/${P}-grep-2.7.patch
-	if use prefix; then
-		eapply "${FILESDIR}"/${MY_P}-prefix.patch
-		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
-		eautoreconf
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	if ! use jadetex; then
-		local i
-		for i in dvi pdf ps; do
-			rm "${ED}"/usr/bin/docbook2${i} || die
-			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
-			rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
-		done
-	fi
-	einstalldocs
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
index 2336c59e11eb..e050c2dcd0d2 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 6c5785323303..93cf7beaa08d 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r6.ebuild 2401 BLAKE2B fc386441a849114e9c7475c6962f7e473eda9b0bf08cbc94fa1f7aabf77c3d72b61f90319d9d856e5be738f9e22672d82498e6a50c538140999f67441ffc9d74 SHA512 0482e64d11845e7f279f973874c098a1f060688f3b599d60fad14d88efda374e3e61f8127701b85e72b8bbb8aeac10a6fdba456d3f30c8b7e6797b63c7176279
+EBUILD xhtml1-20020801-r6.ebuild 2400 BLAKE2B 6ddabc08ab013e2cb0b672c426938034529982cad83326f5db2b9c430ed8f1984f9000976c5ec021ea1ebaa968f76733a6a32a22115e2e554e32a137008ee6ac SHA512 2a16a2404a4966161749aca5cc584b6b7819bbac14e440b5bf66eddf42ead9c5a86e09c1ebc903044b1ecffb10bcf9c502f52c0bec87c4ca901e259ef6ac2827
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index fd6ac25ac247..eaa55b40c250 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common