Fixed gnu-regexp not getting on the classpath and fixed building of javadoc, bug #155443.

(Portage version: 2.1.2_pre3-r5)

3 files changed, 104 insertions, 1 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index f70f2ca53e60..2b9b7d5097b1 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.67 2006/11/17 15:53:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.68 2006/11/17 19:10:30 nichoj Exp $
+
+*jedit-4.3_pre7-r1 (17 Nov 2006)
+
+  17 Nov 2006; Joshua Nichols <nichoj@gentoo.org> +jedit-4.3_pre7-r1.ebuild:
+  Fixed gnu-regexp not getting on the classpath and fixed building of javadoc,
+  bug #155443.
 
   17 Nov 2006; nixnut <nixnut@gentoo.org> jedit-4.2-r2.ebuild:
   Stable on ppc wrt bug 154857
diff --git a/app-editors/jedit/files/digest-jedit-4.3_pre7-r1 b/app-editors/jedit/files/digest-jedit-4.3_pre7-r1
new file mode 100644
index 000000000000..5bad311635e1
--- /dev/null
+++ b/app-editors/jedit/files/digest-jedit-4.3_pre7-r1
@@ -0,0 +1,3 @@
+MD5 8410a1211d918e0672f12451ca05dc94 jedit4.3pre7source.tar.bz2 1394321
+RMD160 bb7d5a2417a9d147d42c4a629635c25f857704c4 jedit4.3pre7source.tar.bz2 1394321
+SHA256 327fea5467fbd3d104b8613edee0b5f90d72df6fb608c587e1df506ac0173611 jedit4.3pre7source.tar.bz2 1394321
diff --git a/app-editors/jedit/jedit-4.3_pre7-r1.ebuild b/app-editors/jedit/jedit-4.3_pre7-r1.ebuild
new file mode 100644
index 000000000000..8685fa42bb9d
--- /dev/null
+++ b/app-editors/jedit/jedit-4.3_pre7-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre7-r1.ebuild,v 1.1 2006/11/17 19:10:30 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+# TODO use versionator
+MY_PV="${PV//_/}"
+
+DESCRIPTION="Programmer's editor written in Java"
+HOMEPAGE="http://www.jedit.org"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}source.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.5
+	=dev-java/gnu-regexp-1*"
+DEPEND=">=virtual/jdk-1.5
+	doc? (
+		=app-text/docbook-xml-dtd-4.3*
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		dev-libs/libxslt
+	)
+	>=dev-java/ant-1.5.4
+	=dev-java/gnu-regexp-1*"
+
+S="${WORKDIR}/jEdit"
+
+JEDIT_HOME="/usr/share/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# we need to use our own classpath
+	java-ant_rewrite-classpath build.xml
+
+	if use doc; then
+		local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*)
+		xsl=${xsl// *}
+
+		local xml=$(echo /usr/share/sgml/docbook/xml-dtd-4.3*)
+		xml=${xml// *}
+
+		echo "build.directory=." > build.properties
+		echo "docbook.dtd.catalog=${xml}/docbook.cat" >> build.properties
+		echo "docbook.xsl=${xsl}" >> build.properties
+	fi
+
+	# remove bundled sources
+	rm -r gnu/* # gnu-regexp
+	# still need to do: bsh, com.microstar.xml.*, org.gjt.*
+}
+src_compile() {
+	# TODO could build more docs, ie userdocs target instead of generate-javadoc
+	eant build $(use_doc generate-javadoc) \
+		-Dgentoo.classpath=$(java-pkg_getjars gnu-regexp-1):$(java-config --tools)
+}
+
+src_install () {
+	dodir ${JEDIT_HOME}
+	cp -R build/${PN}.jar jars doc macros modes properties startup \
+		${D}/usr/share/jedit
+
+	java-pkg_regjar ${JEDIT_HOME}/${PN}.jar
+
+	java-pkg_dolauncher ${PN} --pwd ${JEDIT_HOME} --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 \
+		"Application;Development;"
+
+	# keep the plugin directory
+	keepdir ${JEDIT_HOME}/jars
+}
+
+pkg_postinst() {
+	einfo "The system directory for jEdit plugins is"
+	einfo "${JEDIT_HOME}/jars"
+}
+
+pkg_postrm() {
+	einfo "jEdit plugins installed into /usr/share/jedit/jars"
+	einfo "(after installation of jEdit itself) haven't been"
+	einfo "removed. To get rid of jEdit completely, you may"
+	einfo "want to run"
+	einfo ""
+	einfo "\trm -r ${JEDIT_HOME}"
+}