gentoo resync : 29.06.2021

3 files changed, 79 insertions, 8 deletions

diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 37a117d27424..f00b22fe5598 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,3 +1,5 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-api-2.0.1.ebuild 935 BLAKE2B 22cb90a9b6b5397636ede15bfcf6d1c039cbc5b4228be4d908e64d7d595b80c4421ca85a04487da7db670d8118c7f6baaa4ef94c49a90e9ebcc0271a5df2fc25 SHA512 7cae470ad71954dab9e526b3580b2c251f01098aea4b26bca366d2c80d277f984addb90f451d3a914cbc4cce6579417ed7651c8e8270efc8d5370d7cd7c543d1
+DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+EBUILD jakarta-activation-api-1.2.2.ebuild 1594 BLAKE2B 5fe2c55a2e8b940d9a932dcfed02124793850c7e591ca0abc4936e9c54c0ba0662cc5261bec3d8d4193108ca261da4d6ad532795775815d9b5acf58cc8c4a580 SHA512 52bb3a7e881fee28bec2c89f468893d34ee69d07a79c3381099c715551a506211f47c54166be5ba6efecc4b8114746570489c24349435b18551447db30951ac8
+EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1558 BLAKE2B 3951b0ea3bd20d0bb129387747c215122f662f1f52b6660bc5be83b4eb6afcb966bf8518bba74131026933d9d944ece5d15b9100963adf2c826c61d0f4d4bb86 SHA512 09d0f47c9472f4ec6528f109f238beabf68a7dbdd7f71458fc07747f46457972e1eb74e8aa5ba49ea38b8ec66722c47eed805c3c1b469f396441c4f735f06c10
 MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
new file mode 100644
index 000000000000..d66cea7f3dd0
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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=7
+
+JAVA_PKG_IUSE="doc source"
+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/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	# these files are not present in the upstream jar
+	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# we remove implementation classes from the api
+	zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
+}
+
+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.0.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
index c3224df283ed..9537b85bd9ff 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
@@ -16,18 +16,35 @@ HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
 SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
 
-RDEPEND="
-	>=virtual/jre-11:*
-"
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
 
 S="${WORKDIR}/jaf-${PV}/activation"
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	# these files are not present in the upstream jar
+	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# we remove implementation classes from the api
+	zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
+}
+
+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
+}