From 8e3f5a0e42ba2822463660764321da4ed3b52ef9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Oct 2023 11:48:34 +0100 Subject: gentoo auto-resync : 03:10:2023 - 11:48:34 --- dev-java/javax-mail/Manifest | 4 +-- dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild | 34 ++++++++------------------ dev-java/javax-mail/metadata.xml | 3 +++ 3 files changed, 15 insertions(+), 26 deletions(-) (limited to 'dev-java/javax-mail') diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest index 01e94a8f5e42..a92f995097f4 100644 --- a/dev-java/javax-mail/Manifest +++ b/dev-java/javax-mail/Manifest @@ -1,3 +1,3 @@ DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08 -EBUILD javax-mail-1.6.7-r1.ebuild 2047 BLAKE2B 4187a02c47c7c7310d7d32a46dfe53b4bd52aa454f78040240bfe838f51d59ca33e94d2ed54920935bac6fe7ffa871eae1269bc04b01e68fd28789d2825297f7 SHA512 7139bc9cb731bada24a6e9cc1d694282fb5df50847c3820acafc7c0fe89b81ec76b5ce88f9c1052a5f9b824adcb6648dc6935d2d2a44aab2a585a3729771b761 -MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 +EBUILD javax-mail-1.6.7-r1.ebuild 1571 BLAKE2B 416b7ce3d3f0fc9ab40f96e67d07af38f5f9491c761ee4724cf2fc684c3b0b1275112823971427db1a827c57e04af90e2fa563d62013eee13e01c0c1f6014e92 SHA512 94ee70a94a3913e154684fbd4b48133060698d2a37538655456f79e78d4fbc1efadc8399a68ecb313d271f6a5dd140e92f9ba9f2db1e80760adc920ce248226f +MISC metadata.xml 300 BLAKE2B 59a5cc3d098097693ee38e1552293270505f8d82025e096a6d1c331045451d5782ccc8819a2034a88a89f4490318becb96f10186766db32afad98c1546c956dc SHA512 2d1560717ededf180302c9348d112971e6d24c8745aae17f1ec59c3676ae41bb7fe396bbb57f5c88ef52bd0f7e161aefc22b9d2d5fd006ffc9873dbf42cb2df5 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 c72608beb918..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-2022 Gentoo Authors +# 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" @@ -13,19 +10,16 @@ JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Mail API" -HOMEPAGE="https://eclipse-ee4j.github.io/mail/" -SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +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 -} diff --git a/dev-java/javax-mail/metadata.xml b/dev-java/javax-mail/metadata.xml index 75321cfb5598..53eb0003d9ca 100644 --- a/dev-java/javax-mail/metadata.xml +++ b/dev-java/javax-mail/metadata.xml @@ -4,4 +4,7 @@ java@gentoo.org + + jakartaee/mail-api + -- cgit v1.2.3