gentoo resync : 13.09.2019

3 files changed, 159 insertions, 2 deletions

diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index b0f57964f33a..cbb6143ff199 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,4 +11,5 @@ AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d
 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 3707 BLAKE2B 2330414eb9f418cec64dd1bcc2775fc63ebac0ff2404f611d08563bfebc615bb4002bd3740f86aba08aa5da62fb12a4cc24c2d50904ad1516f67fec11382a4fc SHA512 0e532bdabd29029898127229238b1404a57a0e3fc6b747c424c8bfbfe0bbf2e1c53633a839ade8452b8c705873b6fa261ed3b3c9093e42839c81dbb8c7147d3f
-MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
+EBUILD openjade-1.3.2-r9.ebuild 4311 BLAKE2B dd023c69bd4d5c5650e30c3073563618f10f810ec093b727d71c63f167ddd616740fa6ca6187b15f1a6b33de9790598b72354770d45e43c77823024c6490981d SHA512 0a9ad74203fe2d184f7d4d32cc6823298528947ef5c5294839b0729b3a471787c4224337eea2c91da68e317b5d40020751fec642a1908a35b47a2999c27dcf61
+MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index a4a5fdce9de1..1a3a16228acc 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openjade</remote-id>
 	</upstream>
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
new file mode 100644
index 000000000000..2d63798c3d74
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+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
+}
+
+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
+	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} \
+		--disable-static
+}
+
+src_compile() {
+	unset INCLUDE #412725
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	#dodir /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	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
+
+	newins - catalog <<-EOF
+		SYSTEM "builtins.dsl" "builtins.dsl"
+	EOF
+	doins -r pubtext
+	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 /etc/sgml
+	newins - "${P}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/catalog"
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+	EOF
+
+	local HTML_DOCS=( doc/*.htm )
+	einstalldocs
+	dodoc -r jadedoc
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/${P}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/${P}.cat ]]; then
+		cp "${T}"/${P}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	# this one's shared with docbook-dsssl, so we need to do it in postinst
+	if ! grep -q -s ${P}.cat \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
+		ebegin "Adding ${P}.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
+		EOF
+		eend
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/${P}/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+	sgml-catalog-r1_pkg_postrm
+}