3 files changed, 2 insertions, 127 deletions
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index abb399fa9a45..ff7002dd7e34 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r8.ebuild 3685 BLAKE2B 8fa38e1343de5dffe1477aba279158cf1a46d20b6b9f2bbb33806b32f9ee2e80a7aea2b9f90068bd4c671d892f974f15decb8a178aead7d3da66d68a798266cf SHA512 04eb2d1e1080015346d2ddd136c71fb6328973e6b94814fc2a90d9f9f7743055d117825017cc165f37f333a8a6f6c683fc4bdd4103c920d6313bc71c0cea14fc
-EBUILD openjade-1.3.2-r9.ebuild 4324 BLAKE2B 02fee4ca8f94031901f5cf53a70b9b6b30443717cc0a02513e3887058fa9b33c5256e629f05d37b74765ee52f678f4f67475ed5d6e0889493fe08a42df49057e SHA512 30ae5346e8c936e936165f04e6178b53eed5323a1c8ad8ed413d6f035c5bb447fbf5ac77fb0e9b9578631dacdabf1aa4277b88e6800d327ceaf237e681221756
+EBUILD openjade-1.3.2-r9.ebuild 4321 BLAKE2B e8a4a8eb03b705731391c64bc70b58d01a50c0bbe31dae8c4c80e1d0dd3f748eaac547017c757e61cad42a723cb5b8f728f6d90f56ef402ff6a78a77ad45af1d SHA512 3b5d249e45a4d4228f5f766e5bdd0209d7f37d835aced6de77f14303d687b293c48d3277fb09204f7fffe51c2efc6e011b486f54dac323ff0c127c29020ce042
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
deleted file mode 100644
index 7388015dfa8c..000000000000
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools sgml-catalog flag-o-matic toolchain-funcs
-
-DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
-HOMEPAGE="http://openjade.sourceforge.net"
-SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	app-text/sgml-common
-	>=app-text/opensp-1.5.1
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-deplibs.patch
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	eapply "${FILESDIR}"/${P}-msggen.pl.patch
-	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
-	eapply "${FILESDIR}"/${P}-libosp-la.patch
-	eapply "${FILESDIR}"/${P}-gcc46.patch
-	eapply "${FILESDIR}"/${P}-no-undefined.patch
-	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
-	eapply "${FILESDIR}"/${P}-chmod.patch #487218
-
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
-	# on hppa. Using -O1 works fine. So I force it here.
-	use hppa && replace-flags -O2 -O1
-
-	ln -s config/configure.in configure.ac || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	rm config/missing || die
-
-	AT_NOEAUTOMAKE=yes
-	eautoreconf
-
-	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
-}
-
-src_configure() {
-	# avoids dead-store elimination optimization
-	# leading to segfaults on GCC 6
-	# bug #592590 #596506
-	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
-
-	# We need Prefix env, bug #287358
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	unset INCLUDE #412725
-	emake -j1 SHELL="${BASH}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)
-
-	make DESTDIR="${D}" \
-		SHELL="${BASH}" \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		install install-man
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	dosym openjade  /usr/bin/jade
-	dosym onsgmls   /usr/bin/nsgmls
-	dosym osgmlnorm /usr/bin/sgmlnorm
-	dosym ospam     /usr/bin/spam
-	dosym ospent    /usr/bin/spent
-	dosym osx       /usr/bin/sgml2xml
-
-	insinto /usr/share/sgml/${P}/
-	doins dsssl/builtins.dsl
-
-	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
-	insinto /usr/share/sgml/${P}/dsssl
-	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-
-	# Breaks sgml2xml among other things
-	#insinto /usr/share/sgml/${P}/unicode
-	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
-	insinto /usr/share/sgml/${P}/pubtext
-	doins pubtext/*
-
-	HTML_DOCS="doc/*.htm" einstalldocs
-
-	insinto /usr/share/doc/${PF}/jadedoc
-	doins jadedoc/*.htm
-	insinto /usr/share/doc/${PF}/jadedoc/images
-	doins jadedoc/images/*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/${P}.cat"
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index df072b4fe9df..04d8536f09b2 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="