gentoo resync : 10.11.2019

3 files changed, 2 insertions, 72 deletions

diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index fc91a3e1abbe..37be8286d717 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 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1887 BLAKE2B f15df4383f323db128a975a0fdacc643fa162058484962d55e15526e601ad2b18f1e251f83e9ee516732794a0e51bb2c51b1feb968d5f4e03db4fae79543443c SHA512 f23328537fa94f67fa4eca2401ffd513fa164cf5bf4f7f7efae2428e31ff00e0a8114d77800cb1253c371cfe367d2cdcd5517d3404e8be8b9cf138a7963e7f01
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1833 BLAKE2B a15bec5c3f6a00be5f0dd3955a97b7cb06467abd6ca96ff13834f6ee23281530f5c24b17caf92b3de62390dad7840a07fce8cd2c568805b30bc43b06e025b9e8 SHA512 03ba40d09d6e1585839e4fcc1e89607176ee63e668650bdb8f43436bc43216f97da23cce4ae468b101720c061e4a9d96d7ef0b4acb496e5c1a2420356281d094
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1830 BLAKE2B 872bc4571ab58886490d921c6571ce6d9b7c8d22ed5cef7a2e4b9140c673c169615216db44dcb12226183f3e45db602b387a6e3fec69a4cab96d05b49bcf7275 SHA512 6d3b6c9fcfab53ffd269cf6a45c2cc4e6cf73c79e2f7aefb0a44fb23e2af2beef4342ea61ae7438f88d95bf3c77302a564212cd7bc1d90f82a95ac0ab2f714a8
 MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
deleted file mode 100644
index b9da594bedd8..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools prefix
-
-MY_PN=${PN/-sgml/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-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
-	jadetex? ( app-text/jadetex )
-	userland_GNU? ( sys-apps/which )
-	|| (
-		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() {
-	epatch "${FILESDIR}"/${MY_P}-elinks.patch
-	epatch "${FILESDIR}"/${P}-grep-2.7.patch
-	if use prefix; then
-		epatch "${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 || die "Installation failed"
-
-	if ! use jadetex ; then
-		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
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
index c6ea3b0e3927..38a3221cf16f 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5