From aafdd1dcd9a66da0b1bcdfadbca62add48751897 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 Nov 2023 10:28:51 +0000 Subject: gentoo auto-resync : 13:11:2023 - 10:28:51 --- dev-java/junit/Manifest | 2 +- dev-java/junit/junit-4.13.2-r1.ebuild | 46 ++++++++++++++++++++++++ dev-java/junit/junit-4.13.2.ebuild | 68 ----------------------------------- 3 files changed, 47 insertions(+), 69 deletions(-) create mode 100644 dev-java/junit/junit-4.13.2-r1.ebuild delete mode 100644 dev-java/junit/junit-4.13.2.ebuild (limited to 'dev-java/junit') diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 6cf01dbd11ed..fa2ba7b03103 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -2,6 +2,6 @@ DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 EBUILD junit-3.8.2-r2.ebuild 797 BLAKE2B 06cd41709d371c3263db3abeeaa12a1a6481a265aba31b7ccff312b566e437c759ed8d7f3ffacc357b038d46e4083ef142049c148db741c113683730c9da392b SHA512 e6f0a571f0bc833daf4488c783686828b31720ff165ebbea868d9e6a1eeea0599077a23b062807a6ba637723206ed003dff89b048f635ee7e4a79d87c49584d2 -EBUILD junit-4.13.2.ebuild 1954 BLAKE2B 8bafa0e9083254276b1ab1fca037df8179a9ab99921a6e4f50fbb44497836e91be3436def30fc6e3ba7dca7a1efa887fae6ee85359c0a317c0ba08c319f8321b SHA512 216b525b701b25df30c81b87b7ab68a1a3c469591678d1bd53f8103c58ca0c8b27cb8272a135e7a676dee890dca0dfa648207223e072cb28cfc8a4460e1110ab +EBUILD junit-4.13.2-r1.ebuild 1372 BLAKE2B d9436a6fc7dc4d9debe2d26c7d5b2a58d2c6f7ce89d6cb87d50e7beb9e1e5328c5cbb0cc6454dbe8d782429091d0276cb4be93db8d0e8137bb3bb4ef11b2a318 SHA512 809e16b55c592b15d5f9da130a7eda0a53792605d08970c093acecbc9794c3aecc7b42237b7c1ceec667db5ff9510405b4873193ce992719bb0aa1283317646e EBUILD junit-5.9.2.ebuild 12008 BLAKE2B d6d24a32af7ec0acec0732adf2f85accefc5e92c07d754388ec96e52af2c7803f511b9add52cd26152005957e5c19786b54b56ddb885c0aac15f83ff2e9e396d SHA512 924202efe2dd0f35efc82841c353c0d595c7a5c8099a31559625528731396367597df3e0820e24898720db3350f33feb30fa9707496680a71f5f4f079e83d6a2 MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1 diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild new file mode 100644 index 000000000000..af5e4f424217 --- /dev/null +++ b/dev-java/junit/junit-4.13.2-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="junit:junit:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit4/" +SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-r${PV}" + +LICENSE="EPL-1.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND="dev-java/hamcrest-core:1.3" +# not suitable for jdk:21 #916398 +DEPEND="${CP_DEPEND} + <=virtual/jdk-17:* + test? ( dev-java/hamcrest-library:1.3 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="junit" +JAVA_ENCODING="ISO-8859-1" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_test() { + cd "${JAVA_TEST_SRC_DIR}" || die + + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" + + ejavac -cp "${CP}" -d . $(find * -name "*.java") + # pom.xml lines 264-268 + java -cp "${CP}" -Djava.awt.headless=true \ + org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed" +} diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild deleted file mode 100644 index ead129bf0725..000000000000 --- a/dev-java/junit/junit-4.13.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="junit:junit:4.13.2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Simple framework to write repeatable tests" -HOMEPAGE="https://junit.org/junit4/" -SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# Common dependencies -# POM: ${PN}4-r${PV}/pom.xml -# org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3 - -CDEPEND=" - dev-java/hamcrest-core:1.3 -" - -# Compile dependencies -# POM: ${PN}4-r${PV}/pom.xml -# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3 - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/hamcrest-library:1.3 - ) - ${CDEPEND}" -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" -BDEPEND="app-arch/unzip" -S="${WORKDIR}" - -JAVA_ENCODING="ISO-8859-1" - -JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" -JAVA_SRC_DIR="${PN}4-r${PV}/src/main/java" -JAVA_RESOURCE_DIRS="${PN}4-r${PV}/src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" -JAVA_TEST_SRC_DIR="${PN}4-r${PV}/src/test/java" -JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources" - -src_prepare() { - default - java-pkg_clean -} - -src_test() { - cd "${JAVA_TEST_SRC_DIR}" || die - - local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" - - ejavac -cp "${CP}" -d . $(find * -name "*.java") - java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed" -} -- cgit v1.2.3