[gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/

[James Le Cuirot]

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
+}