gentoo resync : 04.01.2022

3 files changed, 24 insertions, 8 deletions

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 1673508d5353..9cab301d346e 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,5 +1,5 @@
 AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
-EBUILD jedit-5.4.0-r1.ebuild 2949 BLAKE2B 9f2400e0dc2d7f2c901e7cab8c70b2b223b0435edcccb52e808496338c94d60210ef6ed4ec9333e596945da01e886bde10afd9387212ccc0d5e309a367d5ccfc SHA512 368f5911801102a12d7f99fb67be150b42708f1748e8fbe88566a67ac340371905fb19cde9efd174746a4850009027faea9c4023f6e09f043591051ff53dd6cf
-EBUILD jedit-5.4.0.ebuild 2426 BLAKE2B fdc9dda4f7cae91b136494b4a231717c4cae4c01737a6489031350bfb8dd70335f3e7f76602bbfc8d282e2ef1906ca9269fac51a4e98543b424622d02f329e35 SHA512 ab9371eca6ca6fc632964e549b45ba012bf069eaf06c4e88920e82d8a752b69c0770f2a27515d9764f1232f42c7e3d97c4b57b09ff12cdf7ce0b3222b888bcf6
+EBUILD jedit-5.4.0-r1.ebuild 3166 BLAKE2B 5590fd9ecc292e3b376e8a9c40b3ab052fefe7da9cfd632a90749ed1748fbed75302dd8cce7236a24496cce1d95e48983050de5cfe0e09560eb327748170c759 SHA512 3ed37bbb6443cf77ea90408b6d99bf7f5921a33e049682c841c5fffee4b5dda429e3d11479805a125ca92e224d2becf723f33c51e1d203b5cb3bd562a054df82
+EBUILD jedit-5.4.0-r2.ebuild 3169 BLAKE2B 1238d003d5e9b0b0d84ea7f9a4382ba1a3a701d7f57d7154f908cab34bef386bea20c6a1b473d6b791b45607f5686fa06663faf40ec59fd429a9a82f3c4d665f SHA512 1d6ba2a59b10c21920da1b846d6bceddb41cdc8c10fdffeb68b364c5c48171149d1d8c73b4626bfbea7bea4a0c35580f58b4e6391bc2da7c82abc64d22124b85
 MISC metadata.xml 312 BLAKE2B 32456a81e027512746733dea293a638db960ecebb97e045e82bef5630ac064d59ee5b880ade0513d15619c49c52686b9b2e5b69c7e270c578a506465a40d5db3 SHA512 90c844a5041ab91cacc279bc0a404d42c188311bd71cd643d52dc8f586e4fca101d09236407e6a3701ef18816d5f01ad2194f5446d47c6670aaa1a33edada63b
diff --git a/app-editors/jedit/jedit-5.4.0-r1.ebuild b/app-editors/jedit/jedit-5.4.0-r1.ebuild
index ace3b3f58bd4..991fc2326e7a 100644
--- a/app-editors/jedit/jedit-5.4.0-r1.ebuild
+++ b/app-editors/jedit/jedit-5.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,14 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 SLOT="0"
 
+# Same failure with 5.4.0.ebuild:
+# See reports at /var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build/test/reports/index.html
+# "Failure" "No tests found in org.jedit.io.Native2ASCIIEncodingTest"
+RESTRICT="test"
+
 CP_DEPEND="dev-java/jsr305:0"
 
 # Restricting to java 1.8 as it fails to compile with newer java versions, https://bugs.gentoo.org/828559
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0-r2.ebuild
index a54681fbf162..1394e4d5154d 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 JAVA_PKG_IUSE="doc test"
 inherit desktop java-pkg-2 java-ant-2 xdg-utils
@@ -11,18 +11,29 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
 
+# Same failure with 5.4.0.ebuild:
+# See reports at /var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build/test/reports/index.html
+# "Failure" "No tests found in org.jedit.io.Native2ASCIIEncodingTest"
+RESTRICT="test"
+
 CP_DEPEND="dev-java/jsr305:0"
 
+# Restricting to java 1.8 as it fails to compile with newer java versions, https://bugs.gentoo.org/828559
+#init:
+#     [echo] Buildfile for jedit (/var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build.xml)
+#Class org.apache.tools.ant.types.resources.selectors.Not loaded from parent loader (parentFirst)
+#Class org.apache.tools.ant.taskdefs.condition.Equals loaded from parent loader (parentFirst)
+#     [fail] failing due to Java 1.8 is needed for jEdit to build, please install it and rerun (found Java version: '11')
 RDEPEND="
 	${CP_DEPEND}
-	>=virtual/jre-1.8"
+	virtual/jre:1.8"
 
 DEPEND="
 	${CP_DEPEND}
-	>=virtual/jdk-1.8
+	virtual/jdk:1.8
 	dev-java/ant-contrib:0
 	dev-java/ant-apache-bsf:0
 	dev-java/bsh:0