gentoo auto-resync : 02:02:2024 - 17:45:32

4 files changed, 3 insertions, 116 deletions

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 0946c6b22287..1ed4b4b9ab0e 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,6 +1,4 @@
-AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 AUX jedit-5.6.0-skip-failing-test.patch 1183 BLAKE2B 0822a2a339b161cd6e66487b4506f7a0467eddae70da60d4e01897d171bd38c5959e5f0e26bf06b44970963743eb6aa2699dbcf381662dd8a290f27a84301fc4 SHA512 5fc6f859ddae3996e022d14b34cadf145a2b736aebeb2982346c2c43674817b8fee298291a318036a831e19b61c97f49ca013aa0afb7d83587e0975f6ff1bd6c
 DIST jedit5.6.0source.tar.bz2 2572329 BLAKE2B d9815feef6fb03cb4a15e7101383944776ca593884de6965aaa3e74a411f8915d0542ab62be8e4551e04dd410c1da4ebedfb8a2c2869d33eb205100d6bd84352 SHA512 89e65998ea49b5b3da4f1daad001d7cf763e196e7110b604e99e3fad038ca126cf108a471ee611ef76b5491b91d618f47cdc24b270cabccb6a80858a37720af7
-EBUILD jedit-5.6.0-r1.ebuild 3347 BLAKE2B bafa515c7a8cb5fc09e9bed519b8fbaeed98c89f2178134a77dbbd4b0f4586cad36ccdb74fd5183d915fee624b7c1a900175378ac543328ae92c4685acf4d9f8 SHA512 489ba042653f2ea4aab48feead8a5e021837d8fd57fbfdb56ef01a921ef8e8bb04bcf4209f5d31afc6d0ac8d0bccdb2ea48083a26ab70440fc2af28d670da0a1
-EBUILD jedit-5.6.0.ebuild 2202 BLAKE2B 7ae5bebb28e20cee37e6027cbc19ec5d295a914cb453eef43c86301345a34396b04c8020b43f1ede747838c4b604d5eae5c408fee3e0e5fb91b094364332a4fb SHA512 434b26b9d6bb005139149ecf0f4fce93696534ae24497d50d87b029cd9e6dd96a66ae74ea5b76b113afe616a50415a4ce2deff502cd566fcd35d441d69c6e534
+EBUILD jedit-5.6.0-r1.ebuild 3344 BLAKE2B 913578b5a843ca0c29c2e5ba477df0706d2dc22351177a5c0d087db3f250c1e7aefb57adffa4352884d58c69fcd7c7b37dd31900aaf7c855c582821bbebeee76 SHA512 d5dc001dfb303afe1405d9a5559567763ee39f01bea11319a630b6193a6d6e07da7db4c2ad8a347970f632052264315ebba41de4ae11b029a0f33a2c1d571f3f
 MISC metadata.xml 312 BLAKE2B 32456a81e027512746733dea293a638db960ecebb97e045e82bef5630ac064d59ee5b880ade0513d15619c49c52686b9b2e5b69c7e270c578a506465a40d5db3 SHA512 90c844a5041ab91cacc279bc0a404d42c188311bd71cd643d52dc8f586e4fca101d09236407e6a3701ef18816d5f01ad2194f5446d47c6670aaa1a33edada63b
diff --git a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
deleted file mode 100644
index 6a686a6f4a72..000000000000
--- a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -505,7 +505,7 @@
- 	</target>
- 
- 	<target name="build"
--		depends="init,retrieve,setup,compile,test"
-+		depends="init,retrieve,setup,compile"
- 		description="build the jEdit JAR-file with full debug-information">
- 		<mkdir dir="${jar.location}"/>
- 		<jar destfile="${jar.location}/${jar.filename}"
diff --git a/app-editors/jedit/jedit-5.6.0-r1.ebuild b/app-editors/jedit/jedit-5.6.0-r1.ebuild
index 56c118dd1ee4..ff797fc8ae3e 100644
--- a/app-editors/jedit/jedit-5.6.0-r1.ebuild
+++ b/app-editors/jedit/jedit-5.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/jedit/jedit/${PV}/jedit${PV}source.tar.bz2
 S="${WORKDIR}/jEdit"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/app-editors/jedit/jedit-5.6.0.ebuild b/app-editors/jedit/jedit-5.6.0.ebuild
deleted file mode 100644
index 778ef411f332..000000000000
--- a/app-editors/jedit/jedit-5.6.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/project/jedit/jedit/${PV}/jedit${PV}source.tar.bz2"
-S="${WORKDIR}/jEdit"
-
-LICENSE="BSD GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="0"
-
-CP_DEPEND="dev-java/jsr305:0"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-11:*"
-
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-11:*
-	dev-java/ant-contrib:0
-	dev-java/ant-apache-bsf:0
-	dev-java/bsh:0
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-library:1.3
-		dev-java/mockito:2
-	)"
-
-PATCHES=(
-	"${FILESDIR}/jedit-5.6.0-skip-failing-test.patch"
-	"${FILESDIR}"/jedit-5.4.0-build-xml.patch
-)
-
-JEDIT_HOME="/usr/share/${PN}"
-
-src_prepare() {
-	default
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die
-
-	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_ANT_TASKS="ant-junit4"
-EANT_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,mockito:2"
-EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true"
-# https://bugs.gentoo.org/904034
-# EANT_BUILD_TARGET="build docs-html"
-EANT_BUILD_TARGET="build"
-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}
-
-	# Conversion to HTML fails and we don't install xml files.
-	rm -r doc/{FAQ,whatsnew,users-guide} || die
-	cp -R build/${PN}.jar 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"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		xdg_desktop_database_update
-	fi
-}