diff options
Diffstat (limited to 'dev-java/xalan')
-rw-r--r-- | dev-java/xalan/Manifest | 2 | ||||
-rw-r--r-- | dev-java/xalan/xalan-2.7.2-r1.ebuild (renamed from dev-java/xalan/xalan-2.7.2.ebuild) | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest index f196f181580d..7665ef120bf9 100644 --- a/dev-java/xalan/Manifest +++ b/dev-java/xalan/Manifest @@ -1,4 +1,4 @@ DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 -EBUILD xalan-2.7.2.ebuild 1818 BLAKE2B d7f8b82abe9c9f295851a866879df0341560b88cd3244937d83707cc3d92137e4a528f8260225e5bd8056f5ea014d36c57c30d814cb2e94f599c7bc91b215725 SHA512 f8d7d85cb4d2b5836b2294c58d01347fc9cce7cd355a099acdecd7208a00e2eb932e1b234afa13dd24b7aecb7428130f7a26b1b6b96f978f8543fa5cb4dc1959 +EBUILD xalan-2.7.2-r1.ebuild 1804 BLAKE2B 232fc0f7afdaf42e099c6d96af1123f88a53a66f061bb0966604b38818d7189efa3d3c8e37e1378a3ac0310ae46b12ac918495cc943fa1084b25cef8496a241f SHA512 ba00767a262f80fb54498cc47661bf605e9f0d72c30cd7c6d4370d29a1bfa69a31c558a32ffa3948f07e2609bb06cbd89e701c1bef8e6740958fca1a5b7dd598 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild index c5f4ec852ee9..332cb5588c95 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" |