From 943fdd0100f2d0ca460f6bb9799e119fbd77a2aa Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Sun, 28 Jan 2024 09:49:49 +0000
Subject: Adding metadata

---
 dev-java/javax-mail/Manifest                   |  3 +-
 dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild | 65 --------------------------
 dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild | 61 ++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 66 deletions(-)
 delete mode 100644 dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild
 create mode 100644 dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild

(limited to 'dev-java')

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-r1.ebuild
deleted file mode 100644
index cb0feeaf01ef..000000000000
--- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.sun.mail:jakarta.mail:1.6.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-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"
-
-CDEPEND="
-	dev-java/jakarta-activation:1
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DOCS=( ../{NOTICE,README}.md )
-
-src_prepare() {
-	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_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="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"
-
-src_test() {
-	pushd src/test/java || die
-		# Selection according to 137,138 pom.xml
-		# 1) com.sun.mail.util.logging.MailHandlerTest
-		# java.io.IOException: Permission denied
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*TestSuite.java" -o -name "*Test.java" \
-			! -name "MailHandlerTest.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
new file mode 100644
index 000000000000..f19bd8c2717b
--- /dev/null
+++ b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:1.6.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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/${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"
+
+DEPEND="
+	dev-java/jakarta-activation:1
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {NOTICE,README}.md )
+PATCHES=( "${DISTDIR}/javax-mail-1.6.7-java21.patch" ) #917068
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mv mail/src/main/{resources,java}/javax/mail/Version.java || die
+}
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-1"
+JAVA_ENCODING="iso-8859-1"
+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="mail/src/test/resources"
+JAVA_TEST_SRC_DIR="mail/src/test/java"
+
+src_test() {
+	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
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestSuite.java" -o -name "*Test.java" \
+			! -name "MailHandlerTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
-- 
cgit v1.3.1