commit: 7e5d51442914bb19a8dcde1ba25f63a52e69afa8 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Nov 9 10:05:29 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Jan 27 08:00:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5d5144
dev-java/javax-mail: javax-mail-1.6.7-java21.patch Closes: https://bugs.gentoo.org/917068 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33739 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/javax-mail/Manifest | 3 +- ...-1.6.7-r1.ebuild => javax-mail-1.6.7-r2.ebuild} | 36 ++++++++++------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest index 25170c74c15f..35dd8eaf5b5a 100644 --- a/dev-java/javax-mail/Manifest +++ b/dev-java/javax-mail/Manifest @@ -1 +1,2 @@ -DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08 +DIST javax-mail-1.6.7-java21.patch 108038 BLAKE2B 41dd770dc9de5b17d9a4b4a427f31fd3158d45420a3bf1b7949075f1c65103c4093d945e224d70fec66045c314d41aca721b8a7667b6c839fd3f1c3d448c00a4 SHA512 f6f777f7a158114707196321f4480c98bd04ab9a807cbc65a6166bbb55dd9e33853ec4074a5fd23540a1d70629368f1e187e9e839c2bd775ad6d309b4d59fca7 +DIST javax-mail-1.6.7.tar.gz 1854403 BLAKE2B b6681995202c5fd9ed978314d79a6e3c6ee0edeecbbcdb147b94e1f789f7706e090342df8e6491dc23a67d9b3b2b12150cdd0c8ab17a120d1bc0dd4e153be846 SHA512 eb9d1bf863ef2404bdcfde4d9c23089e8d6f76c3f8fd2fc817dd365811636d23d57a60e6991e0349842b1f29b5a1b36b3af78533077858fd2d4550560d2e2d8c diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild similarity index 60% rename from dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild rename to dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild index cb0feeaf01ef..f19bd8c2717b 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,45 +11,42 @@ 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" +SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/jakartaee/mail-api/commit/86ee859eb1.patch -> ${P}-java21.patch" +S="${WORKDIR}/mail-api-${PV}" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -CDEPEND=" - dev-java/jakarta-activation:1 -" - DEPEND=" + dev-java/jakarta-activation:1 >=virtual/jdk-11:* - ${CDEPEND} " -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=">=virtual/jre-1.8:*" -DOCS=( ../{NOTICE,README}.md ) +DOCS=( {NOTICE,README}.md ) +PATCHES=( "${DISTDIR}/javax-mail-1.6.7-java21.patch" ) #917068 src_prepare() { + default #780585 java-pkg-2_src_prepare - mv src/main/{resources,java}/javax/mail/Version.java || die + mv mail/src/main/{resources,java}/javax/mail/Version.java || die } +JAVA_CLASSPATH_EXTRA="jakarta-activation-1" JAVA_ENCODING="iso-8859-1" -JAVA_GENTOO_CLASSPATH="jakarta-activation-1" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="mail/src/main/resources" +JAVA_SRC_DIR="mail/src/main/java" JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="mail/src/test/resources" +JAVA_TEST_SRC_DIR="mail/src/test/java" src_test() { - pushd src/test/java || die + pushd mail/src/test/java || die # Selection according to 137,138 pom.xml # 1) com.sun.mail.util.logging.MailHandlerTest # java.io.IOException: Permission denied @@ -60,6 +57,5 @@ src_test() { JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" popd - java-pkg-simple_src_test }
