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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D190E158089 for ; Mon, 13 Nov 2023 07:07:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE8762BC014; Mon, 13 Nov 2023 07:07:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EB052BC014 for ; Mon, 13 Nov 2023 07:07:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86074335D44 for ; Mon, 13 Nov 2023 07:07:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7C751337 for ; Mon, 13 Nov 2023 07:07:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699859230.a16b4525ae38baece80f39070de1e9c028943072.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/junit/junit-4.13.2-r1.ebuild X-VCS-Directories: dev-java/junit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a16b4525ae38baece80f39070de1e9c028943072 X-VCS-Branch: master Date: Mon, 13 Nov 2023 07:07:40 +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: 617022ad-d5f0-490f-bacd-d47d6be366e0 X-Archives-Hash: 09da91973fc5629f89f616844a4cf4ef commit: a16b4525ae38baece80f39070de1e9c028943072 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Nov 1 13:30:27 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 13 07:07:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16b4525 dev-java/junit: minor style update Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33613 Signed-off-by: Sam James gentoo.org> dev-java/junit/junit-4.13.2-r1.ebuild | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild index 81a334cec831..af5e4f424217 100644 --- a/dev-java/junit/junit-4.13.2-r1.ebuild +++ b/dev-java/junit/junit-4.13.2-r1.ebuild @@ -1,19 +1,17 @@ # 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=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="junit:junit:4.13.2" +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/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz" +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" @@ -29,19 +27,12 @@ RDEPEND="${CP_DEPEND} JAVA_AUTOMATIC_MODULE_NAME="junit" 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_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="${PN}4-r${PV}/src/test/java" -JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources" - -src_prepare() { - default - java-pkg_clean -} +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" src_test() { cd "${JAVA_TEST_SRC_DIR}" || die