Adding metadata

12 files changed, 126 insertions, 56 deletions

diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 5f44c8a13868..2eb906737348 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,2 +1,3 @@
-DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
-DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa
+DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index 459fa0f06282..20b19ae30fba 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-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 jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,8 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -25,7 +22,7 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 JAVA_ENCODING="iso-8859-1"
 
@@ -33,7 +30,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# these files are not present in the upstream jar
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
@@ -45,7 +42,6 @@ src_compile() {
 }
 
 src_install() {
-	default
 	# we remove the implementation sources so that they don't land in sources
 	rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
 	java-pkg-simple_src_install
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
index 2b6b9f6729b6..91741f54c08c 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-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 pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
 
 LICENSE="EPL-1.0"
 SLOT="2"
@@ -24,12 +22,5 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/api"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
new file mode 100644
index 000000000000..bf58d5636275
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation-api/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml
index 45dfb1a076a0..712103bd48c1 100644
--- a/dev-java/jakarta-activation-api/metadata.xml
+++ b/dev-java/jakarta-activation-api/metadata.xml
@@ -5,7 +5,7 @@
   <email>java@gentoo.org</email>
  </maintainer>
  <upstream>
-  <bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+  <bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 1dd5a7e9b404..69ab6e98ddb0 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,2 +1,2 @@
-DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 0a83f80926ed..1483a29bde02 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-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 pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -28,8 +26,6 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
-
 JAVA_ENCODING="iso-8859-1"
 
 JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
@@ -37,7 +33,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
 
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index c409f44c8000..7b2fc15669ec 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-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 pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,24 +9,16 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/jaf-${PV}/activation"
+DEPEND=">=virtual/jdk-11:* "
+RDEPEND=">=virtual/jre-1.8:* "
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
index 45dfb1a076a0..712103bd48c1 100644
--- a/dev-java/jakarta-activation/metadata.xml
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -5,7 +5,7 @@
   <email>java@gentoo.org</email>
  </maintainer>
  <upstream>
-  <bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+  <bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 799d229338cd..2e485d822b5e 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1 +1,2 @@
 DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
+DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
new file mode 100644
index 000000000000..11bc903425a9
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# 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="jakarta.mail:jakarta.mail-api:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API 2.1 Specification API"
+HOMEPAGE="https://jakartaee.github.io/mail-api/"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/mail-api-${PV}/api"
+
+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-api:2
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/angus-activation-1.0.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="src/main/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	rm src/test/java/module-info.java || die
+
+	# There was 1 failure:
+	# 1) doesNotExist(jakarta.mail.util.FactoryFinderTest)
+	# java.lang.NullPointerException
+	#         at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55)
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/doesNotExist/i @Ignore' \
+		-i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die
+
+	# These tests need to run separately, otherwise would fail
+	JAVA_TEST_EXCLUDES=(
+		jakarta.mail.internet.ContentDispositionNoStrictTest
+		jakarta.mail.internet.WindowsFileNamesTest
+		jakarta.mail.internet.AppleFileNamesTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.ContentDispositionNoStrictTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.WindowsFileNamesTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.AppleFileNamesTest"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail-api/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index 183036eda27c..9fd7e4d858fc 100644
--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -7,6 +7,8 @@
  <longdescription>
 		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
- 
+ <upstream>
+  <changelog>https://jakartaee.github.io/mail-api/docs/CHANGES.txt</changelog>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file