public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/
@ 2017-08-28 21:41 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2017-08-28 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     d293af622d374f760820798bf451601b70929aab
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 21:38:25 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 21:40:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d293af62

app-editors/jedit: Version bump to 5.4.0

The bsh sources are currently bundled but the package is still needed
for its Ant task at build time. I don't have time to dig into this
now.

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 app-editors/jedit/Manifest                         |   1 +
 .../jedit/files/jedit-5.4.0-build-xml.patch        |  12 +++
 app-editors/jedit/jedit-5.4.0.ebuild               | 106 +++++++++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index dbd6537dab0..e4f8790fd14 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1 +1,2 @@
 DIST jedit5.2.0source.tar.bz2 2456541 SHA256 1d444d2ceab62e449523ae336603fedee322d3655c9e5606d3b4d00c125c950f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126 WHIRLPOOL e6a8e837317a2068fe808bc3ada39bf4730a5aaebeca60f7501b5fad2353a5f889b76778c59ffe39b34563107ba3ec02eec550cd612ddcbd00ee03616910cc19
+DIST jedit5.4.0source.tar.bz2 2535992 SHA256 b42dec6c81936b8974308f03c8f356487586cec782d79659b8ae67953c8edf71 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112 WHIRLPOOL f2cac85e820e4db1d619d0527ac6af48703b2e40b68982ae8e75843bf1447672b1eb9d414a12f34358acfdfa18b7eb424d2c4b1d856b7b8e085d347a8727cb48

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
new file mode 100644
index 00000000000..e8ad5f9e8bb
--- /dev/null
+++ b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
@@ -0,0 +1,12 @@
+Subject: [PATCH] Do not have target "build" call target "test"
+--- a/build.xml	2017-03-18 16:30:34.000000000 +0300
++++ b/build.xml	2017-08-25 12:24:24.000000000 +0300
+@@ -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.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
new file mode 100644
index 00000000000..b196136d911
--- /dev/null
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-ant-2 eutils fdo-mime
+
+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"
+
+CP_DEPEND="dev-java/jsr305:0"
+
+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
+
+	epatch "${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() {
+	fdo-mime_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
+		fdo-mime_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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/
@ 2018-04-14 21:04 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2018-04-14 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     dde4187a451fff540fa9a90f39ff8cc375441cc7
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Apr 10 21:46:58 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 21:03:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde4187a

app-editors/jedit: epatch->eapply.

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7932

 app-editors/jedit/files/jedit-5.4.0-build-xml.patch | 5 ++---
 app-editors/jedit/jedit-5.4.0.ebuild                | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

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
index e8ad5f9e8bb..6a686a6f4a7 100644
--- a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
+++ b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
@@ -1,6 +1,5 @@
-Subject: [PATCH] Do not have target "build" call target "test"
---- a/build.xml	2017-03-18 16:30:34.000000000 +0300
-+++ b/build.xml	2017-08-25 12:24:24.000000000 +0300
+--- a/build.xml
++++ b/build.xml
 @@ -505,7 +505,7 @@
  	</target>
  

diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
index b196136d911..b91e0863229 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ JEDIT_HOME="/usr/share/${PN}"
 src_prepare() {
 	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die
 
-	epatch "${FILESDIR}"/${P}-build-xml.patch
+	eapply "${FILESDIR}"/${P}-build-xml.patch
 
 	java-ant_xml-rewrite -f "${S}/build.xml" -c \
 		-e javadoc \


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/
@ 2021-11-26  9:29 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-11-26  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9f17a805baf9448fd15ccb295cdd2253fbbe50ce
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 09:29:28 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 09:29:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f17a805

app-editors/jedit: removed obsolete 5.2.0-r1

Bug: https://bugs.gentoo.org/783639
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-editors/jedit/Manifest                         |   1 -
 .../jedit/files/jedit-5.2.0-build-xml.patch        |  24 -----
 app-editors/jedit/jedit-5.2.0-r1.ebuild            | 102 ---------------------
 3 files changed, 127 deletions(-)

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index e18bb3da8221..a3f2a1f02ddc 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,2 +1 @@
-DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112

diff --git a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch b/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
deleted file mode 100644
index da0a91d54d22..000000000000
--- a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4dc53a4c320af0894bd600c77d4432c414cdee16 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 00:05:20 +0200
-Subject: [PATCH] Do not have target "build" call target "test"
-
----
- build.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index f34934f..da5272a 100644
---- a/build.xml
-+++ b/build.xml
-@@ -504,7 +504,6 @@
- 				</copy>
- 			</contrib:then>
- 		</contrib:if>
--		<antcall target="test" />
- 	</target>
- 
- 	<target name="build-exe-launcher"
--- 
-2.5.0
-

diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
deleted file mode 100644
index e6ff8beafda0..000000000000
--- a/app-editors/jedit/jedit-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc test"
-
-inherit epatch 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"
-IUSE=""
-
-CDEPEND="
-	dev-java/bsh:0
-	dev-java/jsr305:0
-	dev-java/ant-contrib:0
-	dev-java/ant-apache-bsf:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-java_prepare() {
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting} || die
-
-	epatch "${FILESDIR}"/${P}-build-xml.patch
-
-	java-ant_xml-rewrite -f "${S}/build.xml" -c \
-		-e javadoc \
-		-a failonerror \
-		-v no || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh"
-EANT_GENTOO_CLASSPATH="jsr305"
-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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/
@ 2023-04-09  7:01 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2023-04-09  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     db74ff3eb6ba8e583c16bd16421d87e4145874a3
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Apr  7 18:07:03 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr  9 07:01:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db74ff3e

app-editors/jedit: add 5.6.0, enable tests

Simple version bump with minimal changes

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30518
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-editors/jedit/Manifest                         |   1 +
 .../files/jedit-5.6.0-skip-failing-test.patch      |  36 ++++++++
 app-editors/jedit/jedit-5.6.0.ebuild               | 100 +++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index a3f2a1f02ddc..7905e60a6daf 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1 +1,2 @@
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
+DIST jedit5.6.0source.tar.bz2 2572329 BLAKE2B d9815feef6fb03cb4a15e7101383944776ca593884de6965aaa3e74a411f8915d0542ab62be8e4551e04dd410c1da4ebedfb8a2c2869d33eb205100d6bd84352 SHA512 89e65998ea49b5b3da4f1daad001d7cf763e196e7110b604e99e3fad038ca126cf108a471ee611ef76b5491b91d618f47cdc24b270cabccb6a80858a37720af7

diff --git a/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch b/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch
new file mode 100644
index 000000000000..628e944136db
--- /dev/null
+++ b/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch
@@ -0,0 +1,36 @@
+# There was 1 failure:
+# 1) abbreviateUserHomeWindows(org.gjt.sp.jedit.MiscUtilitiesTest)
+# java.lang.AssertionError
+#         at org.junit.Assert.fail(Assert.java:87)
+#         at org.junit.Assert.assertTrue(Assert.java:42)
+#         at org.junit.Assert.assertTrue(Assert.java:53)
+#         at org.gjt.sp.jedit.MiscUtilitiesTest.abbreviateUserHomeWindows(MiscUtilitiesTest.java:227)
+#
+# FAILURES!!!
+# Tests run: 353,  Failures: 1
+--- a/test/org/gjt/sp/jedit/MiscUtilitiesTest.java
++++ b/test/org/gjt/sp/jedit/MiscUtilitiesTest.java
+@@ -24,6 +24,7 @@ package org.gjt.sp.jedit;
+ import org.junit.After;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.runner.RunWith;
+ import org.mockito.Mock;
+ import org.mockito.junit.MockitoJUnitRunner;
+@@ -218,7 +219,7 @@ public class MiscUtilitiesTest
+ 		assertEquals("${" + key, MiscUtilities.expandVariables("${" + key));
+ 	}
+ 
+-	@Test
++	@Test @Ignore
+ 	public void abbreviateUserHomeWindows() throws Exception
+ 	{
+ 		updateOS(WINDOWS_NT);
+@@ -736,4 +737,4 @@ public class MiscUtilitiesTest
+ 		os.set(OperatingSystem.class, newValue);
+ 		return oldValue;
+ 	}
+-}
+\ No newline at end of file
++}

diff --git a/app-editors/jedit/jedit-5.6.0.ebuild b/app-editors/jedit/jedit-5.6.0.ebuild
new file mode 100644
index 000000000000..432bdddd6f20
--- /dev/null
+++ b/app-editors/jedit/jedit-5.6.0.ebuild
@@ -0,0 +1,100 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-04-09  7:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-26  9:29 [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2023-04-09  7:01 Miroslav Šulc
2018-04-14 21:04 Patrice Clement
2017-08-28 21:41 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox