commit: bf4cdad2ad0bfd23acdca1c9c8121fff4e963221 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Sep 28 07:06:06 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Oct 3 07:20:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4cdad2
dev-java/javax-mail: style update, drop ExcessiveLineLength Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33164 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild | 28 +++++++------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild index 53f046003118..cb0feeaf01ef 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild @@ -1,9 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,17 +12,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Mail API" HOMEPAGE="https://jakartaee.github.io/mail-api/"; SRC_URI="https://github.com/jakartaee/mail-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/mail-${PV}/mail" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: mail/pom.xml -# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1 - CDEPEND=" - >=dev-java/jakarta-activation-1.2.2:1 + dev-java/jakarta-activation:1 " DEPEND=" @@ -37,25 +31,22 @@ RDEPEND=" >=virtual/jre-1.8:* ${CDEPEND}" -DOCS=( ../{LICENSE,NOTICE,README}.md ) - -S="${WORKDIR}/mail-${PV}/mail" +DOCS=( ../{NOTICE,README}.md ) src_prepare() { - default + java-pkg-2_src_prepare mv src/main/{resources,java}/javax/mail/Version.java || die } JAVA_ENCODING="iso-8859-1" - JAVA_GENTOO_CLASSPATH="jakarta-activation-1" -JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_EXTRA_ARGS=( -ea ) +JAVA_TEST_SRC_DIR="src/test/java" src_test() { pushd src/test/java || die @@ -72,8 +63,3 @@ src_test() { java-pkg-simple_src_test } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -}
