gentoo resync : 02.02.2022

3 files changed, 3 insertions, 120 deletions

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 9cab301d346e..10a833394af6 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,5 +1,4 @@
 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 3166 BLAKE2B 5590fd9ecc292e3b376e8a9c40b3ab052fefe7da9cfd632a90749ed1748fbed75302dd8cce7236a24496cce1d95e48983050de5cfe0e09560eb327748170c759 SHA512 3ed37bbb6443cf77ea90408b6d99bf7f5921a33e049682c841c5fffee4b5dda429e3d11479805a125ca92e224d2becf723f33c51e1d203b5cb3bd562a054df82
-EBUILD jedit-5.4.0-r2.ebuild 3169 BLAKE2B 1238d003d5e9b0b0d84ea7f9a4382ba1a3a701d7f57d7154f908cab34bef386bea20c6a1b473d6b791b45607f5686fa06663faf40ec59fd429a9a82f3c4d665f SHA512 1d6ba2a59b10c21920da1b846d6bceddb41cdc8c10fdffeb68b364c5c48171149d1d8c73b4626bfbea7bea4a0c35580f58b4e6391bc2da7c82abc64d22124b85
+EBUILD jedit-5.4.0-r2.ebuild 3166 BLAKE2B 9556a3a05d5c465b4ea8d874ecee4d564e63b65f5790e57b8321405b69b1c7bbdc020126252b2228a52c9f7de2e561ca9da3f2d276fc88c6f402d50010205f49 SHA512 8d7d6509d1c3b270371e3eb286c30083d0791df93b238cfc6794cd726ef99bf269189bfeac29fd6972aff00c3b6b4deec889e31a3b9be2c91786de464248300f
 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
deleted file mode 100644
index 991fc2326e7a..000000000000
--- a/app-editors/jedit/jedit-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc test"
-inherit desktop java-pkg-2 java-ant-2 xdg-utils
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
-
-LICENSE="BSD GPL-2"
-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"
-
-DEPEND="
-	${CP_DEPEND}
-	virtual/jdk:1.8
-	dev-java/ant-contrib:0
-	dev-java/ant-apache-bsf:0
-	dev-java/bsh:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/hamcrest-library:1.3
-	)"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-src_prepare() {
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die
-
-	eapply "${FILESDIR}"/${P}-build-xml.patch
-
-	java-ant_xml-rewrite -f "${S}/build.xml" -c \
-		-e javadoc \
-		-a failonerror \
-		-v no || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh"
-EANT_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3"
-EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true"
-EANT_BUILD_TARGET="build"
-# TODO could build more docs, ie generate-doc-faq generate-doc-news
-# generate-doc-users-guide ua.
-EANT_DOC_TARGET="generate-javadoc"
-# in fact needed only for docs, but shouldn't hurt
-EANT_NEEDS_TOOLS="true"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	dodir ${JEDIT_HOME}
-
-	cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \
-		"${D}${JEDIT_HOME}" || die
-
-	java-pkg_regjar "${JEDIT_HOME}/${PN}.jar"
-
-	java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit
-
-	use doc && java-pkg_dojavadoc build/classes/javadoc/api
-
-	make_desktop_entry ${PN} \
-		jEdit \
-		${JEDIT_HOME}/doc/${PN}.png \
-		"Development;Utility;TextEditor"
-
-	# keep the plugin directory
-	keepdir ${JEDIT_HOME}/jars
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	elog "The system directory for jEdit plugins is"
-	elog "${JEDIT_HOME}/jars"
-	elog "If you get plugin related errors on startup, first try updating them."
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		xdg_desktop_database_update
-		elog "jEdit plugins installed into /usr/share/jedit/jars"
-		elog "(after installation of jEdit itself) haven't been"
-		elog "removed. To get rid of jEdit completely, you may"
-		elog "want to run"
-		elog ""
-		elog "    rm -r ${JEDIT_HOME}"
-	fi
-}
diff --git a/app-editors/jedit/jedit-5.4.0-r2.ebuild b/app-editors/jedit/jedit-5.4.0-r2.ebuild
index 1394e4d5154d..5f66cb999af5 100644
--- a/app-editors/jedit/jedit-5.4.0-r2.ebuild
+++ b/app-editors/jedit/jedit-5.4.0-r2.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=8
@@ -11,7 +11,7 @@ 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: