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 E204013835C for ; Fri, 12 Mar 2021 12:18:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 235E1E09C0; Fri, 12 Mar 2021 12:18:13 +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 0B2A7E09C0 for ; Fri, 12 Mar 2021 12:18:13 +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 10E8C340B6A for ; Fri, 12 Mar 2021 12:18:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 834CB59C for ; Fri, 12 Mar 2021 12:18:09 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1615551483.fb83e8a64cf52a952ac45a25dff08e847a8da52b.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/xalan/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/xalan/xalan-2.7.2-r1.ebuild dev-java/xalan/xalan-2.7.2.ebuild X-VCS-Directories: dev-java/xalan/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: fb83e8a64cf52a952ac45a25dff08e847a8da52b X-VCS-Branch: master Date: Fri, 12 Mar 2021 12:18:09 +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: 143999cd-6605-46f0-9901-b677553fd213 X-Archives-Hash: e3aadc77b9fe00364c2af5e68bd620ba commit: fb83e8a64cf52a952ac45a25dff08e847a8da52b Author: Miroslav Šulc gentoo org> AuthorDate: Fri Mar 12 10:30:13 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Mar 12 12:18:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb83e8a6 dev-java/xalan: eapi7, min jdk/jre 1.8 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../{xalan-2.7.2.ebuild => xalan-2.7.2-r1.ebuild} | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild similarity index 88% rename from dev-java/xalan/xalan-2.7.2.ebuild rename to dev-java/xalan/xalan-2.7.2-r1.ebuild index c5f4ec852ee..068336c4047 100644 --- a/dev-java/xalan/xalan-2.7.2.ebuild +++ b/dev-java/xalan/xalan-2.7.2-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # NOTE: Building the docs is much more hassle than it's worth. It # requires com.sun.image.codec, which has long gone from JDKs, and @@ -9,16 +9,16 @@ EAPI=5 JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 versionator +inherit java-pkg-2 java-ant-2 MY_PN="${PN}-j" -MY_PV="$(replace_all_version_separators _)" +MY_PV="$(ver_rs 1- _)" MY_P="${MY_PN}_${MY_PV}" SRC_DIST="${MY_P}-src.tar.gz" BIN_DIST="${MY_P}-bin.zip" DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types" -HOMEPAGE="http://xalan.apache.org/" +HOMEPAGE="https://xalan.apache.org/" SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST} doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )" LICENSE="Apache-2.0" @@ -28,13 +28,13 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac CDEPEND="dev-java/javacup:0 dev-java/bcel:0" +BDEPEND="doc? ( app-arch/unzip )" RDEPEND="${CDEPEND} - >=virtual/jre-1.3 + >=virtual/jre-1.8:* ~dev-java/xalan-serializer-${PV}:${SLOT}" DEPEND="${CDEPEND} - >=virtual/jdk-1.3 - doc? ( app-arch/unzip )" + >=virtual/jdk-1.8:*" EANT_GENTOO_CLASSPATH="bcel,javacup" EANT_BUILD_TARGET="unbundledjar" @@ -43,7 +43,9 @@ EANT_DOC_TARGET="" JAVA_ANT_REWRITE_CLASSPATH="true" S="${WORKDIR}/${MY_P}" -java_prepare() { +src_prepare() { + default + # disable building of serializer.jar sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \ build.xml || die "sed build.xml failed"