applied a patch which was suggested by Diego Pettenò <dgp85@users.sourceforge.net> and made further improvements to the ebuild. Fixes #81884.

Package-Manager: portage-2.0.51.17

4 files changed, 108 insertions, 6 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 32d910c3eb2d..0b223f7ad599 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.49 2005/01/01 13:28:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.50 2005/02/28 13:23:54 luckyduck Exp $
+
+*jedit-4.2-r1 (28 Feb 2005)
+
+  28 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +jedit-4.2-r1.ebuild:
+  applied a patch which was suggested by Diego Pettenò
+  <dgp85@users.sourceforge.net> and made further improvements to the ebuild.
+  Fixes #81884.
 
   27 Dec 2004; Ray Russell Reese III <anti@gentoo.org> jedit-4.2.ebuild:
   Added kde and gnome USE flags that provide a jedit.desktop. Resolves bug #49406
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index f5cec2d5ee36..2d2e79cef832 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,10 +1,12 @@
-MD5 cd207a5994268227d6592eae934be75d ChangeLog 7139
-MD5 dead89ea18c892aa1b81002a05bc0e94 jedit-4.1.ebuild 1863
-MD5 0c1bc759b6cafc454c336cb35fd05550 metadata.xml 257
+MD5 29f249df192adb64381f4d658ea14a94 jedit-4.2-r1.ebuild 2182
 MD5 f86b2b15740143cb16c5e0108c4257bd jedit-4.1-r1.ebuild 2272
 MD5 07fd68fb92c3a7d3f88e98708425d2e1 jedit-4.2.ebuild 2444
-MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
+MD5 dead89ea18c892aa1b81002a05bc0e94 jedit-4.1.ebuild 1863
+MD5 7282ca82253d58fd338d40141fc90827 ChangeLog 7391
+MD5 0c1bc759b6cafc454c336cb35fd05550 metadata.xml 257
 MD5 c8305f25e0689d0224f1c0f565a92709 files/jedit-4.1-jikes-fix.patch 492
+MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
+MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2 66
 MD5 e4b1187284c6be90f0acaa0d919da8ba files/jedit.desktop 186
 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1-r1 66
-MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2 66
+MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2-r1 66
diff --git a/app-editors/jedit/files/digest-jedit-4.2-r1 b/app-editors/jedit/files/digest-jedit-4.2-r1
new file mode 100644
index 000000000000..152f376a8118
--- /dev/null
+++ b/app-editors/jedit/files/digest-jedit-4.2-r1
@@ -0,0 +1 @@
+MD5 c7fa902fd5ad3207efb45c9171eaacf1 jedit42source.tar.gz 1685253
diff --git a/app-editors/jedit/jedit-4.2-r1.ebuild b/app-editors/jedit/jedit-4.2-r1.ebuild
new file mode 100644
index 000000000000..669ec7bda2e9
--- /dev/null
+++ b/app-editors/jedit/jedit-4.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r1.ebuild,v 1.1 2005/02/28 13:23:54 luckyduck Exp $
+
+inherit java-utils
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV//_}"
+
+DESCRIPTION="Programmer's editor written in Java"
+HOMEPAGE="http://www.jedit.org"
+SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+SLOT="0"
+IUSE="doc jikes"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	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
+	jikes? ( >=dev-java/jikes-1.17 )"
+
+S="${WORKDIR}/jEdit"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local xsl=$(best_version docbook-xsl-stylesheets);
+	xml=${xml/docbook-};
+	xml=${xml/*\/}
+
+	local xml=$(best_version docbook-xml-dtd)
+	xsl=${xsl/docbook-}
+	xsl=${xsl/*\/}
+
+	if use doc; then
+		echo "build.directory=." > build.properties
+		echo "docbook.dtd.catalog=/usr/share/sgml/docbook/${xml}/docbook.cat" \
+			 >> build.properties
+		echo "docbook.xsl=/usr/share/sgml/docbook/${xsl}" \
+			 >> build.properties
+	fi
+}
+src_compile() {
+	local antflags="dist"
+	use doc && antflags="${antflags} javadoc docs-html"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install () {
+	java-pkg-dojar jedit.jar
+
+	dodir /usr/share/jedit
+	dodir /usr/bin
+
+	insinto /usr/share/jedit
+	doins -r jars doc macro modes properties startup
+	keepdir /usr/share/jedit/jars
+
+	cat ${PN} <<EOF
+#!/bin/bash
+
+\$(java-config -J) -jar $(java-config -p jedit) \$@
+EOF
+	dobin ${PN}
+
+	insinto /usr/share/icons/hicolor/128x128/apps
+	newins ${S}/doc/jedit.png jedit.pngs
+
+	make_desktop_entry jedit "jEdit" jedit
+}
+
+pkg_postinst() {
+	einfo "The system directory for jEdit plugins is"
+	einfo "/usr/share/jedit/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 /usr/share/jedit"
+}