gentoo resync : 18.11.2018

6 files changed, 172 insertions, 32 deletions

diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 59cfd3f7d1db..34b5d2621a59 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,13 +1,15 @@
 AUX openjade-1.3.2-acinclude.m4 1922 BLAKE2B 1fe4500e45ffa14774b1c20257907732b9ff593c2a31146929859bc16cd9ac66619093a725bc60e1e7c1af812d4d1f87ab2742c737a424f95b43c3fd4e15aaca SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb
+AUX openjade-1.3.2-chmod.patch 311 BLAKE2B db74402d322ad11f1c4c5688df7db3c0b097182ca44518228cd29bbcd1bebce75da171ef460172153c88de7e19efeac2f2710499983d056fe702fcbf81210873 SHA512 90968a6ba70dfb75060859229e2ce8507bab9f9a5045f9b379ac810aaac6c99d7d229d988924254722b168007e6c72dbd38025ebd470095f2d0f5b11e2422f11
 AUX openjade-1.3.2-deplibs.patch 1506 BLAKE2B 44b81cd550202a21489bf14a1ddf6be2f27f3675671e644ddbec8580394d956a76f5d6d82cc4be7bd7bbf8d180c278675c0274cc79431553e7123b9448db3e07 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e
 AUX openjade-1.3.2-gcc46.patch 2164 BLAKE2B 08d9ac31c20e3b2a27c92a0b14141404d7508a9cc269ca28e4af6405e7be560866df51e34270a98603b363aefc7ee1b0c7a3d6f882f0ec2f246bef4ab3a0b623 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438
 AUX openjade-1.3.2-ldflags.patch 819 BLAKE2B 8ac32c3d629c57439336830c58421463cd628d9cb13e43db7b734c83d26d35e8d18bd2f736ef620816f359d15955dade6ffca42a1fa583b67670f733cf0516cf SHA512 6112fbc474f0f2c3c024040b42b13290ba2763381b7f99071d7d9d4f8d11bf1087a2c319eba9f0006e2cc067a14a52cedde98444338b180f9566172b52c044ec
 AUX openjade-1.3.2-libosp-la.patch 1725 BLAKE2B 14521987d8c20c1276d72136c4ec046e35e1fc23b758d44e105c92cd31346c7bc53ca956b0f1f0385c8deaa6aaf6231ece753250560d117ca9c5d330e51bbdb1 SHA512 9b73b95ce3ac1d0042641eb0ddbb5ce753d2fd639dab026b9eab0f45bb3231515c69670f02c2a0793d950b6a6276f94e838d273f01e43694e97525af65903a0e
 AUX openjade-1.3.2-msggen.pl.patch 748 BLAKE2B 2329df5658b10bcd2e2e8986b7313b3c5256b4415e084ff3c189b4e0788430c138f76a5329446a78315acd4d6ab4582fcfd05792100d7a71d241c40353665825 SHA512 31f25e96bb3df3d8c0850a6ca2c2f0e59c19d23aa62a697ea475c9d2a5a36f5e1fcf807878ca7be5b57538b96d3295591466f1035edd9a885e035525f445b410
-AUX openjade-1.3.2-no-undefined.patch 434 BLAKE2B 69bf4b67166ef4253c88303ee0f682af0f09ccf4f3e3494f03119e1b17cfca9d37ca555ccac17a5b51946e2560fa43fecc408080aef812f4e0e20b5e3f645ff0 SHA512 fcabb03a649150a05b847fe9f367dffb8b2df4b8635bea8f50a433afb43bab4d6bc58c0bad705b84421d4c5e1d19e2df03065d89544d023c225c0f529f168656
+AUX openjade-1.3.2-no-undefined.patch 438 BLAKE2B a64392f7f11f69994ef2e7708e0346f1da877b3abef73e37f3d9e2e90db21783ce57e8d98cb0eef37964af4d0cc0087f3cf873da95907bc89f6c92731f76e813 SHA512 5ae0f893e1bf6f80247db80ec5333ba13a50e98a1e3d6ec9739f665fd74ad718be155e0ebeb90836bb5e4fe6651b62f42d92b27fdbefdf167f1351b772d1a459
 AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4814b91c5cefeac551f028cbbedeaf773ae7597b100785a5f53d0a428e95b6b2d1d6e235ac2c52ee53bd16b6fecdd394f3234b SHA512 bca7e9550329bc033a1df4ca78bc1ae75b12f27fdecc6aafff136fd81c93f88045ca675dd03e711b4d428a3de832f3bfa703d639319a2b348a2f8268091658d8
-AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
+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-r7.ebuild 3678 BLAKE2B 477ff1defb0270a6e61b449c896d22b519acbf77f128b53fc45b09a07624cdbec1629e0e79844b9ee732d291323ed2faa772ab66d4e883a63aa5409a6a4e12bd SHA512 5e3678fa85225737b6880bcab51dd64160431cfc6603722a0112735a7cc2220cd98e5c10d05bd1fa9c3967fd8a3a5eb255f0ae20f4671e1b3ac7244f08fc4a34
+EBUILD openjade-1.3.2-r7.ebuild 3700 BLAKE2B b80ec4f9088cfe7d15ceaa84fd14d640e33f48e8a718034e1d7812c25a8376d93b68ae4a7b3e73e7ea17f6ac91a59af227a4f22c6bd5720b1d43e2fbcc744e0e SHA512 5a7df1f6187b35f1ca79777ba33ccc50fce08dcf3528dbe4f8439034104da58152d6fbdb13f5f303bf33cf18ecbf5a1e6d3760c4a293c7bb1c08b0cc0bd70d5d
+EBUILD openjade-1.3.2-r8.ebuild 3713 BLAKE2B 8b0d77dfd1fb724f4af91bf120e73f982520ea55b86180c1e45415cff6676b2d8d3987867820105b539db5ccb8ffe1495682d73ad33bcc0e5e95cf8c88a3273f SHA512 9e271fc764e90bc592cfce95858e179d0f9bed6904ac2872a633006609fa15336b7aa557c953783f3d94f1e399e44006e683bb770c96e24094a2c5daa1ef3fb1
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/files/openjade-1.3.2-chmod.patch b/app-text/openjade/files/openjade-1.3.2-chmod.patch
new file mode 100644
index 000000000000..ca8abbd50da8
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-chmod.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.comm.in.orig	2017-07-11 20:14:20.459014115 +0700
++++ b/Makefile.comm.in	2017-07-11 20:14:31.724715876 +0700
+@@ -53,7 +53,7 @@
+ .m4.cxx:
+ 	rm -f $@
+ 	$(PERL) $(srcdir)/../instmac.pl $< >$@
+-	chmod -w $@
++	chmod a-w $@
+ 
+ %.h %.cxx %.rc: %.msg
+ 	$(PERL) -w $(srcdir)/../msggen.pl $(MSGGENFLAGS) $<
diff --git a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
index 1b298f88a6f8..4e5aefc3a865 100644
--- a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
+++ b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
@@ -1,5 +1,5 @@
---- Makefile.lib.in.orig	2016-05-19 17:20:25.164931700 +0200
-+++ Makefile.lib.in	2016-05-19 17:20:56.539989400 +0200
+--- a/Makefile.lib.in.orig	2016-05-19 17:20:25.164931700 +0200
++++ b/Makefile.lib.in	2016-05-19 17:20:56.539989400 +0200
 @@ -24,7 +24,7 @@
  
  lib$(LIB).la: $(LT_OBJS)
diff --git a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
index 62dcb02cd2ec..920cff248d60 100644
--- a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
+++ b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
@@ -1,7 +1,7 @@
 This fixes Cygwin, where wchar_t is ushort.
 
---- grove/Node.h
-+++ grove/Node.h
+--- a/grove/Node.h
++++ b/grove/Node.h
 @@ -8,6 +8,7 @@
  #endif
  
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index 15297e079041..95ece1c5ef24 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5  # sgml-catalog inherits base, banned in 6
-
-inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
+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"
@@ -14,20 +13,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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="static-libs"
 
-RDEPEND="app-text/sgml-common
-	>=app-text/opensp-1.5.1"
-DEPEND="dev-lang/perl
-	${RDEPEND}"
+RDEPEND="
+	app-text/sgml-common
+	>=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-deplibs.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-msggen.pl.patch
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-	epatch "${FILESDIR}"/${P}-libosp-la.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	epatch "${FILESDIR}"/${P}-no-undefined.patch
-	epatch "${FILESDIR}"/${P}-wchar_t-uint.patch
+	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
@@ -68,9 +73,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Bug 412725.
-	unset INCLUDE
-
+	unset INCLUDE #412725
 	emake -j1 SHELL="${BASH}"
 }
 
@@ -82,7 +85,7 @@ src_install() {
 		libdir="${EPREFIX}"/usr/$(get_libdir) \
 		install install-man
 
-	prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	dosym openjade  /usr/bin/jade
 	dosym onsgmls   /usr/bin/nsgmls
@@ -98,14 +101,14 @@ src_install() {
 	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}
+
+	# 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/*
 
-	dodoc NEWS README VERSION
-	dohtml doc/*.htm
+	HTML_DOCS="doc/*.htm" einstalldocs
 
 	insinto /usr/share/doc/${PF}/jadedoc
 	doins jadedoc/*.htm
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
new file mode 100644
index 000000000000..af2595cbebd6
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 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 ~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="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"