diff options
Diffstat (limited to 'dev-java/werken-xpath')
-rw-r--r-- | dev-java/werken-xpath/Manifest | 4 | ||||
-rw-r--r-- | dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch | 4 | ||||
-rw-r--r-- | dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild (renamed from dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild) | 26 |
3 files changed, 18 insertions, 16 deletions
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest index 09ad09addb20..833423214199 100644 --- a/dev-java/werken-xpath/Manifest +++ b/dev-java/werken-xpath/Manifest @@ -2,7 +2,7 @@ AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 BLAKE2B 77a304e9d140ab67e1d32d0fc9 AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 BLAKE2B f3a7f3b02830cbb3705f501bed9fe135b37e75ca9f07e927b83490e25047c5863e9108a2c630680888b41b2e71ce0e8892f76ffb2c613ca862828cfbd1fbc61f SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 BLAKE2B ae2c82957a0651084f918a79407418b18191876a7113f9ffe9968ebe24e89eb2fd368571997605e68473836caf21dfbfa96e9d0c3ae78a420cc2585590e06c13 SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4 AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 BLAKE2B 619f023176c841c876a7d0e7fd181b686a2d42b815ea3caa7973ed94bfe8ad5cc1264890e5032ef017aaa548b317c28d9e709101a2599ccee5bca9d5b65081e3 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6 -AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 BLAKE2B 2b941351292a8fadb8b48ad3c3836cf9420db30fcf1a449a9d53aecd7f724ff76d7cbbf80fddd7330adbf3a7d98ac42b6ed3155a4fd266e1f01caed1fcc1163c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4 +AUX werken-xpath-0.9.4_beta-jpp-tests.patch 357 BLAKE2B 1e7be890d118b4c470e36ffc6aa289cdff8f24a95bd94473f68493d84d887c3b6f8c660765d5c92a8be1f01a4296da42389fc985fb964916aa762a96417c8eee SHA512 45269db14477adea79892f06400c564a09e5bcce52350af7aff16b69d92227d3752c6326f00a4fc42828268389dad7243b0bd8b1b59e6b82d331b83e9d6dbe11 DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d -EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1355 BLAKE2B 24fbe9aa3e66fe735ce9997a07e7cd0c85001aefd1cd884cf5b30131cb59591024a799953d17b45efcdca4dd7ff5ac1212066a9ab8b2ea61359f707e7de05cda SHA512 9872d9584539c631629f213e60fae1da24d96487dba38cc6e1fa818ef585ec07767b4415f771c4890b76ad98fa06d9274adcf24744a38c06e65857d974358270 +EBUILD werken-xpath-0.9.4_beta-r5.ebuild 1322 BLAKE2B 3e9695d26af0b47da7b743d1c2df6cf5c27ca5969fead91afff4244dadf0b80de99c0f47da1e64fb8e14fefe98d935ccd37eafb8d5314ddc1315d9efc5f53592 SHA512 d5ac201cc7a456fcab18bf018c2875dbbdf23b81ad2f7046d4b215fd37627ab1bfd53b42ca2ac752c94fb3422dd4ce0201c35b07bc732b6ab98f882bd9e255f2 MISC metadata.xml 318 BLAKE2B be2cb60066e3fbccd9201112d37d447b49de3fd37a9c42a287f0b7f7b7466efdbe9c179f0ced41d7af9b0119be17328a234997377dfefb481596355fa1c3838c SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3 diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch index d26e6185aff3..bcb84f1ee237 100644 --- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch +++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch @@ -1,5 +1,5 @@ ---- runtests.sh~ 2000-10-31 23:42:01.000000000 +0200 -+++ runtests.sh 2003-03-02 01:59:55.000000000 +0200 +--- ./runtests.sh~ 2000-10-31 23:42:01.000000000 +0200 ++++ ./runtests.sh 2003-03-02 01:59:55.000000000 +0200 @@ -9,6 +9,6 @@ XPATH_CP=./build/werken.xpath.jar TEST_CP=./build/test/classes/ diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild index 904444297829..97f1586aa696 100644 --- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild +++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + JAVA_PKG_IUSE="doc source" WANT_ANT_TASKS="ant-antlr" -inherit java-pkg-2 java-ant-2 eutils versionator +inherit java-pkg-2 java-ant-2 MY_PN=${PN/-/.} -MY_PV=$(replace_version_separator 3 '-') +MY_PV=${PV//_/-} MY_P=${MY_PN}-${MY_PV} DESCRIPTION="W3C XPath-Rec implementation for DOM4J" @@ -23,9 +24,9 @@ KEYWORDS="amd64 x86" COMMON_DEP=" dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0" -DEPEND=">=virtual/jdk-1.4 +DEPEND=">=virtual/jdk-1.8:* ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.4 +RDEPEND=">=virtual/jre-1.8:* ${COMMON_DEP}" S=${WORKDIR}/${MY_PN} @@ -34,15 +35,16 @@ EANT_BUILD_TARGET="package" JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_GENTOO_CLASSPATH="antlr,jdom" -java_prepare() { +src_prepare() { + default # Courtesy of JPackages :) - epatch "${FILESDIR}"/${P}-jpp-compile.patch - epatch "${FILESDIR}"/${P}-jpp-jdom.patch - epatch "${FILESDIR}"/${P}-jpp-tests.patch - epatch "${FILESDIR}"/${P}-gentoo.patch + eapply "${FILESDIR}"/${P}-jpp-compile.patch + eapply "${FILESDIR}"/${P}-jpp-jdom.patch + eapply "${FILESDIR}"/${P}-jpp-tests.patch + eapply "${FILESDIR}"/${P}-gentoo.patch # API updates to support jdom-1 - epatch "${FILESDIR}"/${P}-jdom-1.0.patch + eapply "${FILESDIR}"/${P}-jdom-1.0.patch java-pkg_clean rm -rv lib/bin || die |