gentoo (leap year) resync : 29.02.2020

5 files changed, 40 insertions, 56 deletions

diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index 946d5614a3dc..af56e2ec6d7c 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,6 +1,6 @@
-AUX 1.11.0_pre797991-as-needed.patch 5376 BLAKE2B f00d1c7274a8d49e7ad9c3d46ca001bfad513dcde220d7d2109c1a87411246d7ccd66faedaeaae6ee148d958bf7ace2a0e188f322dd7b1f0382a9c2f28f6dc82 SHA512 c68861162bc6fd0c90a5c52cffed73d7fa0733f7b6198d06c6b728f7324b55e2e19e6e062ec67787f80ee2c31b45556431ea529ea8c6d4706d547fcb4fdf9ae4
-AUX 1.11.0_pre797991-bugfixes.patch 1652 BLAKE2B 5d015161a921db987fe5c66134686a8249e6dd26b4a8edc20e2e85e5959b76320a9b2c2c052bcca89f84f2af4e0b1bc1fe0cf4745aeea3e9a61bc82df8e3573b SHA512 5103993c7549d7d65e8c3555438da43eb00929d786bdf5046c8da99b3779e73c2b0029affa40c28a0492f1498c1cad2fa48091aa5a51dc28630bbe59e50724f1
-AUX 1.11.0_pre797991-parallel-build.patch 2714 BLAKE2B ac0b0184fec7dff9b6d1b36e2b1272b4d0636a103c45e0c16ef141072f431a08bf6852e48ef8031566f01819298102580aa4f9fa509342fddf0297c8465dc031 SHA512 1b21006f19266f1c285f6a730cc3aefc714d2da77b0bce5519a1ed2434cd465ec89b5638320aacf19ec88a2bc974ad3777e2c6179cf137d9d92a75fc4d2c6699
+AUX 1.11.0_pre797991-as-needed.patch 4803 BLAKE2B 1dd127bb9fd93cc58ac0a09e45354df5b0e8eaa4e53b9eb0f8a6d96f00e1606fe202b46ea4f9e105c0d20fd58a52761df1bf52f51e19fb70892d5909912db30e SHA512 f0805dc8456ed803d92e2b913d4996881078e402ad053be5175aeeb6126b6e752a39e02fc1d4f37853e5e2aaee229a82c11cc7e0b298d3474e4d638d3fd0025b
+AUX 1.11.0_pre797991-bugfixes.patch 1409 BLAKE2B 78c628ae10560bf950c7fed9ae4c28216bfb97bc7936064f20ee91403e74297d0b15ea1755901f26d900e53ba935fee937b726bee65511272e305f2731bdc94d SHA512 3eaa70d2936b7091e036d936ff8b35cbf2399ccbb81444b8a6a9583cbd11aa865e7f927a035b1d0223c172eb8de891e4da3b7113b155dfc4e8b19d0da5c4c4da
+AUX 1.11.0_pre797991-parallel-build.patch 2530 BLAKE2B 2d88ed70b30643cae4bcf6a88de56706fd1f0cf5b71e2d12dd24812217ce06023b08b8914dcbcfd828e8c8ba8b116d227d621cc785fbd3591a2d2d502be5fa37 SHA512 be994c118b212b3b96409c273b01d2b00b0a8b0f7ec53338f8efc6ec9d9dccd4fb6fdcaf7c365351024a965e96992ff23ba849c90d6d6aa1e7086c51c763cbef
 DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653
-EBUILD xalan-c-1.11.0_pre1153059.ebuild 2346 BLAKE2B 93171b40c421413e8b5ce2656e08fcaaa5ade224ffd4902fbc61b16106819dceac23749c683d71b8cb8b6b00ecdacc4ec98eeb49bd0543fe8b0b9f89161f091f SHA512 cea55607e6c31c142826b47cdc5e5da17ef0cc7751791358184e81c6c6c2be4395f8477b61398eb067eb1c44a4b1921d719e28137161999c0f15fb8b7bc91c29
+EBUILD xalan-c-1.11.0_pre1153059.ebuild 2180 BLAKE2B a31ce8f492efc514caec802d6d855d0329561d47c7692c3bc864415c545f644decd633427eb03f4065799215f80a8fa8c0e309391f6542f808e876bb036b249d SHA512 948a65343d58b40f06aae2cf4625782679528e714a1f3de5f2ecd10062135d4cdc39d49a84b1248989e7b42d3ee11e7ea83d4aef4ad9ee5fb06cd062aedc845b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
index e8a9cc9d03b3..791da1cd7e75 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
@@ -1,6 +1,5 @@
-diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:23:08.411122528 +0200
-+++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 00:45:09.514777553 +0200
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
 @@ -174,7 +174,7 @@
  
  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
@@ -64,9 +63,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefi
  ifeq ($(PLATFORM), OS390)
  	mv *.x  ${XSL_LIB_DIR}        
  else
-diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in
---- xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:23:08.431122558 +0200
-+++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:43:47.674693543 +0200
+--- a/src/xalanc/Utils/MsgCreator/Makefile.in
++++ b/src/xalanc/Utils/MsgCreator/Makefile.in
 @@ -29,7 +29,7 @@
  
  $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
@@ -76,9 +74,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/
  	
  $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
-diff -Naur xml-xalan.orig/c/Tests/Makefile.in xml-xalan/c/Tests/Makefile.in
---- xml-xalan.orig/c/Tests/Makefile.in	2009-07-27 00:23:08.514445103 +0200
-+++ xml-xalan/c/Tests/Makefile.in	2009-07-27 00:45:50.541094978 +0200
+--- a/Tests/Makefile.in
++++ b/Tests/Makefile.in
 @@ -62,7 +62,7 @@
  
  $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o 
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
index d86f1bd45f4b..8b7f618bb8b1 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
@@ -1,6 +1,5 @@
-diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
---- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:23:08.507787691 +0200
-+++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:53:50.781756249 +0200
+--- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
++++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
 @@ -28,7 +28,7 @@
  #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
  
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
index 46d9659b0f0a..da2c79572984 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
@@ -1,6 +1,5 @@
-diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan.orig//c/src/xalanc/Makefile.in	2010-02-23 10:51:30.058353490 +0100
-+++ xml-xalan/c/src/xalanc/Makefile.in	2010-02-23 10:52:53.251679288 +0100
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
 @@ -84,6 +84,10 @@
  SAMPLES_DIR = ${XALANCROOT}/samples
  TESTS_DIR = ${XALANCROOT}/Tests
diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
index 894d99b5b6be..8d8eda0a2222 100644
--- a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
 
 DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
-HOMEPAGE="http://xml.apache.org/xalan-c/"
+HOMEPAGE="https://xml.apache.org/xalan-c/"
 SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -15,22 +15,19 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples nls threads"
 
 RDEPEND=">=dev-libs/xerces-c-2.8.0"
-#	icu? ( dev-libs/icu )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/xml-xalan/c"
 
-pkg_setup() {
-#	export ICUROOT="/usr"
-	export XALANCROOT="${S}"
-}
+PATCHES=(
+	"${FILESDIR}"/1.11.0_pre797991-as-needed.patch
+	"${FILESDIR}"/1.11.0_pre797991-bugfixes.patch
+	"${FILESDIR}"/1.11.0_pre797991-parallel-build.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/1.11.0_pre797991-as-needed.patch" \
-		"${FILESDIR}/1.11.0_pre797991-bugfixes.patch" \
-		"${FILESDIR}/1.11.0_pre797991-parallel-build.patch"
+	default
 
 	# - do not run configure in runConfigure
 	# - echo the export commands instead exporting the vars
@@ -47,19 +44,12 @@ src_prepare() {
 
 src_configure() {
 	export XERCESCROOT="/usr"
+	export XALANCROOT="${S}"
 
 	local target="linux"
-	# add more if needed, see xerces-c-2.8.0-r1 ebuild
-
-	local mloader="inmem"
-	use nls && mloader="nls"
-#	use icu && mloader="icu"
-
 	local transcoder="default"
-#	use icu && transcoder="icu"
-
-	local thread="none"
-	use threads && thread="pthread"
+	local mloader=$(usex nls nls inmem)
+	local thread=$(usex threads pthread none)
 
 	./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
 		-m ${mloader} -t ${transcoder} \
@@ -73,24 +63,23 @@ src_configure() {
 src_compile() {
 	default
 
-	if use doc ; then
-		mkdir build
-		cd "${S}/xdocs"
-		doxygen DoxyfileXalan
+	if use doc; then
+		mkdir build || die
+		cd xdocs || die
+		doxygen DoxyfileXalan || die
+		HTML_DOCS=( build/docs/apiDocs/. )
+
+		# clean doxygen cruft
+		find "${S}"/build \( -iname '*.map' -o -iname '*.md5' \) -delete || die
 	fi
 }
 
 src_install() {
 	default
 
-	if use doc ; then
-		dodir /usr/share/doc/${PF}
-		dohtml -r build/docs/apiDocs/*
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
 	fi
 }