app-editors/jedit: Remove bsf USE flag.

Package-Manager: portage-2.2.26

3 files changed, 19 insertions, 117 deletions

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index c45a9ad642b3..dbd6537dab0f 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,2 +1 @@
-DIST jedit5.0.0source.tar.bz2 2224469 SHA256 4464cbfe8a01cae15476d6b0cf57b4b89c1cb3d7b541ec2f48ed283385c015ce SHA512 376803339251ee389e6be0cd5267140e36a09120882a9fb8d989c0ed424e6680ede3c509d10fc3d3b8956d1219ff5c009d9b4fbd04e76b81a9be38f77383562d WHIRLPOOL efa3dc731086ecffbf4490c14a597b24ec7849b5c16f1f5df9d1483b08004433b4a478e96963e9e70ec5f7d584075fb65c2d3e63bd516125907998de649c1a70
 DIST jedit5.2.0source.tar.bz2 2456541 SHA256 1d444d2ceab62e449523ae336603fedee322d3655c9e5606d3b4d00c125c950f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126 WHIRLPOOL e6a8e837317a2068fe808bc3ada39bf4730a5aaebeca60f7501b5fad2353a5f889b76778c59ffe39b34563107ba3ec02eec550cd612ddcbd00ee03616910cc19
diff --git a/app-editors/jedit/jedit-5.0.0.ebuild b/app-editors/jedit/jedit-5.0.0.ebuild
deleted file mode 100644
index c581c70a14ae..000000000000
--- a/app-editors/jedit/jedit-5.0.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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="GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="0"
-IUSE=""
-
-# missing from tarball
-RESTRICT="test"
-
-COMMON_DEP="
-	dev-java/jsr305:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	dev-java/ant-apache-bsf:0
-	dev-java/ant-contrib:0
-	dev-java/bsh[bsf]
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-java_prepare() {
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting} || die
-
-	# don't unconditionally run tests (which aren't even shipped)
-	sed -i -e 's|\(depends="init,retrieve,setup,compile\),test|\1|' \
-		build.xml || 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() {
-	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
-}
diff --git a/app-editors/jedit/jedit-5.2.0.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
index 7c87206a5ce5..2f7045e519f6 100644
--- a/app-editors/jedit/jedit-5.2.0.ebuild
+++ b/app-editors/jedit/jedit-5.2.0-r1.ebuild
@@ -17,21 +17,19 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
-# missing from tarball
-RESTRICT="test"
+CDEPEND="
+	dev-java/bsh:0
+	dev-java/jsr305:0
+	dev-java/ant-contrib:0
+	dev-java/ant-apache-bsf:0"
 
-COMMON_DEP="
-	dev-java/jsr305:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	dev-java/ant-apache-bsf:0
-	dev-java/ant-contrib:0
-	dev-java/bsh[bsf]
-	test? (
-		dev-java/ant-junit:0
-	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
 
 S="${WORKDIR}/jEdit"
 
@@ -41,6 +39,11 @@ 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"
@@ -61,12 +64,13 @@ 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_regjar "${JEDIT_HOME}/${PN}.jar"
 
-	java-pkg_dolauncher ${PN} --main org.gjt.sp.jedit.jEdit
+	java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit
 
 	use doc && java-pkg_dojavadoc build/classes/javadoc/api