From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5255138350 for ; Tue, 18 Feb 2020 19:11:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4534E08C0; Tue, 18 Feb 2020 19:11:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D150E08C0 for ; Tue, 18 Feb 2020 19:11:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0991B34ED3A for ; Tue, 18 Feb 2020 19:11:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47B6814B for ; Tue, 18 Feb 2020 19:11:48 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1582053070.315334b53166562660a4cce84d8e001ca018824b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild X-VCS-Directories: dev-libs/xalan-c/ dev-libs/xalan-c/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 315334b53166562660a4cce84d8e001ca018824b X-VCS-Branch: master Date: Tue, 18 Feb 2020 19:11:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98fdf25d-e15b-44d8-83e1-3b9ccb4c0e6c X-Archives-Hash: ce48436094cade7379b48029aab91493 commit: 315334b53166562660a4cce84d8e001ca018824b Author: David Seifert gentoo org> AuthorDate: Tue Feb 18 19:11:10 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Feb 18 19:11:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315334b5 dev-libs/xalan-c: Port to EAPI 7 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../xalan-c/files/1.11.0_pre797991-as-needed.patch | 15 +++--- .../xalan-c/files/1.11.0_pre797991-bugfixes.patch | 5 +- .../files/1.11.0_pre797991-parallel-build.patch | 5 +- dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 63 +++++++++------------- 4 files changed, 36 insertions(+), 52 deletions(-) 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 e8a9cc9d03b..791da1cd7e7 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 d86f1bd45f4..8b7f618bb8b 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 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 46d9659b0f0..da2c7957298 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 894d99b5b6b..8d8eda0a222 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 }