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 F107D158089 for ; Tue, 3 Oct 2023 07:21:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 453B32BC01E; Tue, 3 Oct 2023 07:21:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2960D2BC01E for ; Tue, 3 Oct 2023 07:21:01 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 472E9335C7E for ; Tue, 3 Oct 2023 07:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7046954 for ; Tue, 3 Oct 2023 07:20:58 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1696317656.bf4cdad2ad0bfd23acdca1c9c8121fff4e963221.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/javax-mail/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild X-VCS-Directories: dev-java/javax-mail/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: bf4cdad2ad0bfd23acdca1c9c8121fff4e963221 X-VCS-Branch: master Date: Tue, 3 Oct 2023 07:20:58 +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: c0ede16d-a039-4ac2-9e19-d71eb2ad9205 X-Archives-Hash: 4fa23748a5dbb27b2ef248d85957b47e commit: bf4cdad2ad0bfd23acdca1c9c8121fff4e963221 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Sep 28 07:06:06 2023 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33164 Signed-off-by: Miroslav Šulc 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 -}