diff options
Diffstat (limited to 'dev-java/apache-rat')
| -rw-r--r-- | dev-java/apache-rat/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/apache-rat/apache-rat-0.15-r2.ebuild | 109 | ||||
| -rw-r--r-- | dev-java/apache-rat/apache-rat-0.16.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch | 39 |
4 files changed, 2 insertions, 151 deletions
diff --git a/dev-java/apache-rat/Manifest b/dev-java/apache-rat/Manifest index a84157688d24..00106504c571 100644 --- a/dev-java/apache-rat/Manifest +++ b/dev-java/apache-rat/Manifest @@ -1,4 +1,2 @@ -DIST apache-rat-0.15-src.tar.bz2 203040 BLAKE2B 0727fb932cfbab7080eba5115bee69e5c46155a231509109a5c7aecf40ed539d4357f2d9b31342717306221891e4a411e01077ae55a0988abe4926e40f1fafc4 SHA512 7f9fb219a5ce0b95909f006140b20e7621d9f5ce583c42a57e2783ec40fd842e75b546843ab033a99bf5108d0d8369a0ab1aac80e33af9685f651fed3dd603ee -DIST apache-rat-0.15-src.tar.bz2.asc 833 BLAKE2B b87e059a5a83d3d728c28c25926129743fdfb6a5c7cf2e258892d86711e7f5890d140ca1cfa5fc1012d56b6321ec2c93903ec30854bd3536216c8f1fd269f504 SHA512 f5abcb3df5d23834deab8c3c1a476100324452cba88e9185fb398dd6118c3c8ff8dc00c4c9f8166245833d6e602c51bc8cdf20361813bbe1e720022766412b8d DIST apache-rat-0.16.1-src.tar.bz2 1941799 BLAKE2B 4b871debc73c11b36bfdb7fcd2e9463dabb46673672c8a4731b2a81fc6fc4a063aede934e3c5e870968108aa3b5a2c01d0b17dba57ee81bad625290b705e4b0d SHA512 44a37a06bb7981835a26b302f0d9e0027e45443920f892e19c6c0240329dbfb89c3c9fea3cef67a94e553606f5f16718278a712f034b0e448fb2d3224108363d DIST apache-rat-0.16.1-src.tar.bz2.asc 833 BLAKE2B cdb503b69140cfd1dab7d9c84a4c96fb5e54f33b4293121b06c1a0b6672f293d5c645499b847b8b79e6168b0c6f9c4fcb62a0fe851642f644888a22b88cd338f SHA512 1677082f6b93cda1b60e752d352f81ab368d2b4f6a5123f9ad82f675fdb142950476fc7b7e35c065965dc0052a5b4bf06f857c07cd8514dab235d1751fc5c971 diff --git a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild deleted file mode 100644 index 628754f463cb..000000000000 --- a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# javadoc is broken for java 17, see https://bugs.gentoo.org/914458 -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES=" - org.apache.rat:apache-rat-core:${PV} - org.apache.rat:apache-rat-tasks:${PV} -" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Apache Rat is a release audit tool, focused on licenses" -HOMEPAGE="https://creadur.apache.org/rat/" -SRC_URI="https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2 - verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )" -S="${WORKDIR}/${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" - -CP_DEPEND=" - >=dev-java/ant-1.10.14:0 - dev-java/commons-cli:0 - dev-java/commons-collections:4 - dev-java/commons-compress:0 - dev-java/commons-io:1 - dev-java/commons-lang:3.6 -" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc" - -DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt ) - -PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" ) - -JAVADOC_SRC_DIRS=( - "${PN}-core/src/main/java" - "${PN}-tasks/src/main/java" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} - -src_compile() { - einfo "Compiling apache-rat-core.jar" - JAVA_JAR_FILENAME="${PN}-core.jar" - JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources" - JAVA_SRC_DIR="${PN}-core/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar" - rm -r target || die - - einfo "Compiling apache-rat-tasks.jar" - JAVA_JAR_FILENAME="${PN}-tasks.jar" - JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources" - JAVA_SRC_DIR="${PN}-tasks/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar" - rm -r target || die - - # javadoc is broken for java 17, see https://bugs.gentoo.org/914458 - JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" - use doc && ejavadoc -} - -src_test() { - JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4" - - einfo "Testing apache-rat-core" - cp -r "${PN}"-core/src/{main,test} src || die - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - java-pkg-simple_src_test - rm -r src/{main,test} || die - - einfo "Testing apache-rat-tasks" - cp -r "${PN}"-tasks/src/{main,test} src || die - mkdir -p target/it-sources || die - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - java-pkg-simple_src_test -} - -src_install() { - java-pkg_dojar "${PN}-core.jar" - java-pkg_dojar "${PN}-tasks.jar" - java-pkg_dolauncher "${PN}" --main org.apache.rat.Report - - use doc && java-pkg_dojavadoc target/api - - if use source; then - java-pkg_dosrc "${PN}-core/src/main/java/*" - java-pkg_dosrc "${PN}-tasks/src/main/java/*" - fi -} diff --git a/dev-java/apache-rat/apache-rat-0.16.1.ebuild b/dev-java/apache-rat/apache-rat-0.16.1.ebuild index b87bad5d3d6e..c44ff4e45377 100644 --- a/dev-java/apache-rat/apache-rat-0.16.1.ebuild +++ b/dev-java/apache-rat/apache-rat-0.16.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pottlinger )" CP_DEPEND=" @@ -32,6 +32,7 @@ DEPEND=" ${CP_DEPEND} >=virtual/jdk-1.8:* test? ( + >=dev-java/ant-1.10.15:0[junit,testutil] >=dev-java/assertj-core-3.27.6:0 dev-java/junit:5[vintage] >=dev-java/mockito-5.20.0:0 diff --git a/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch b/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch deleted file mode 100644 index b9cb73648008..000000000000 --- a/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml -+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml -@@ -48,7 +48,7 @@ - <target name="all"/> - - <target name="testWithReportSentToFile"> -- <property name="report.file" location="${output.dir}/selftest.report"/> -+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> - <rat:report reportFile="${report.file}"> - <file file="${ant.file}"/> - </rat:report> -@@ -88,22 +88,22 @@ - <target name="testAddLicenseHeaders"> - <delete dir="${output.dir}/it-sources"/> - <mkdir dir="${output.dir}/it-sources"/> -- <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/> -+ <copy file="index.apt" tofile="../../../../target/anttasks/it-sources/index.apt"/> - <rat:report addLicenseHeaders="true"> -- <file file="${output.dir}/it-sources/index.apt"/> -+ <file file="../../../../target/anttasks/it-sources/index.apt"/> - </rat:report> - </target> - - <target name="testISO88591"> - <rat:report format="xml"> -- <file file="src/test/resources/org/example/iso-8859-1.html"/> -+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> - </rat:report> - </target> - - <target name="testISO88591WithReportFile"> -- <property name="report.file" location="${output.dir}/selftest.report"/> -+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> - <rat:report reportFile="${report.file}" format="xml"> -- <file file="src/test/resources/org/example/iso-8859-1.html"/> -+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> - </rat:report> - </target> - </project> |
