11 files changed, 12 insertions, 253 deletions
diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 33b5bd8d86d1..a9ee2d1b310f 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.38 2004/07/31 18:39:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.39 2004/08/30 17:08:13 axxo Exp $
+
+*jedit-4.2 (30 Aug 2004)
+
+  30 Aug 2004; Thomas Matthijs <axxo@gentoo.org> +jedit-4.2.ebuild,
+  -jedit-4.2_pre12.ebuild, -jedit-4.2_pre13.ebuild, -jedit-4.2_pre14.ebuild,
+  -jedit-4.2_pre15.ebuild:
+  version bump + pruning _pre*
 
 *jedit-4.2_pre15 (31 Jul 2004)
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index ffc33c06731c..698365424699 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1147512bd02c5c4eb5052519097756a4 jedit-4.2_pre14.ebuild 1927
 MD5 4fe2c18357c7e0901e9d70fb1056dc9e jedit-4.1-r1.ebuild 2150
+MD5 41a1b90afa675ed77af131f972f36d0d jedit-4.2.ebuild 1773
 MD5 592be97706a86c648f5c2424075b5a4e jedit-4.2_pre13.ebuild 1927
 MD5 41a1b90afa675ed77af131f972f36d0d jedit-4.2_pre15.ebuild 1773
 MD5 fd6cc31cfb221879341ae3e8e0b244cc jedit-4.1.ebuild 1862
@@ -11,15 +9,9 @@ MD5 0c1bc759b6cafc454c336cb35fd05550 metadata.xml 257
 MD5 c4053418bbd3d9d5f4a87edad0e9f043 jedit-4.2_pre12.ebuild 1943
 MD5 c3d71c0ba59148476f840c60b999c6b6 files/jedit-4.2_pre12.jikes-and-lock-fix.patch 10873
 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
+MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2 66
 MD5 9310de740b7b3ffacf2c96fe446b1ab8 files/digest-jedit-4.2_pre12 71
 MD5 4ac4f20a8627c48f7d87491623f88c3a files/digest-jedit-4.2_pre13 71
 MD5 81f506cd1acce828eff86acf6dc18331 files/digest-jedit-4.2_pre14 71
 MD5 f7f1206ae0c12cdf8bc20efb8383dba5 files/digest-jedit-4.2_pre15 71
 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBC+e4/rLF9B432nYRAprFAKCk/I6onR7U2RMgPYgxfVChFd90+wCfQYGR
-KOkcGps2BQgWV3un5AfAhMY=
-=G211
------END PGP SIGNATURE-----
diff --git a/app-editors/jedit/files/digest-jedit-4.2 b/app-editors/jedit/files/digest-jedit-4.2
new file mode 100644
index 000000000000..152f376a8118
--- /dev/null
+++ b/app-editors/jedit/files/digest-jedit-4.2
@@ -0,0 +1 @@
+MD5 c7fa902fd5ad3207efb45c9171eaacf1 jedit42source.tar.gz 1685253
diff --git a/app-editors/jedit/files/digest-jedit-4.2_pre12 b/app-editors/jedit/files/digest-jedit-4.2_pre12
deleted file mode 100644
index 9de095129efa..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.2_pre12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a318c6676057873ca62fea2e0e66e6d jedit42pre12source.tar.gz 1636936
diff --git a/app-editors/jedit/files/digest-jedit-4.2_pre13 b/app-editors/jedit/files/digest-jedit-4.2_pre13
deleted file mode 100644
index 77450b6527ec..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.2_pre13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a391aa2877982eac17a6ed42ade01c2 jedit42pre13source.tar.gz 1816101
diff --git a/app-editors/jedit/files/digest-jedit-4.2_pre14 b/app-editors/jedit/files/digest-jedit-4.2_pre14
deleted file mode 100644
index bed262554d96..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.2_pre14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c37960df75e8fe8379a55c80f23b04c jedit42pre14source.tar.gz 1821873
diff --git a/app-editors/jedit/files/digest-jedit-4.2_pre15 b/app-editors/jedit/files/digest-jedit-4.2_pre15
deleted file mode 100644
index 40404008d91b..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.2_pre15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5d474797360ac3aeb1e7911d7111a8a jedit42pre15source.tar.gz 1837664
diff --git a/app-editors/jedit/jedit-4.2_pre15.ebuild b/app-editors/jedit/jedit-4.2.ebuild
index e9463fb16636..05e05738dc56 100644
--- a/app-editors/jedit/jedit-4.2_pre15.ebuild
+++ b/app-editors/jedit/jedit-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre15.ebuild,v 1.1 2004/07/31 18:39:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2.ebuild,v 1.1 2004/08/30 17:08:13 axxo Exp $
 
 inherit java-utils
 
diff --git a/app-editors/jedit/jedit-4.2_pre12.ebuild b/app-editors/jedit/jedit-4.2_pre12.ebuild
deleted file mode 100644
index 07339415c155..000000000000
--- a/app-editors/jedit/jedit-4.2_pre12.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre12.ebuild,v 1.4 2004/06/24 21:56:49 agriffis Exp $
-
-inherit eutils
-
-MY_PV="42pre12"
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE="jikes"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.5.4
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-S="${WORKDIR}/jEdit"
-
-src_compile() {
-	local antflags
-
-	epatch ${FILESDIR}/${P}.jikes-and-lock-fix.patch
-
-	if [ -z "$JAVA_HOME" ]; then
-		einfo
-		einfo "\$JAVA_HOME not set!"
-		einfo "Please use java-config to configure your JVM and try again."
-		einfo
-		die "\$JAVA_HOME not set."
-	fi
-
-	antflags=""
-	if use jikes ; then
-		einfo "Please ignore the following compiler warnings."
-		einfo "Jikes is just too pedantic..."
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/share/jedit
-	dodir /usr/bin
-
-	cp -R jedit.jar jars doc macros modes properties startup ${D}/usr/share/jedit
-	cd ${D}/usr/share/jedit
-	chmod -R u+rw,ug-s,go+u,go-w \
-		jedit.jar jars doc macros modes properties startup
-
-	cat >${D}/usr/share/jedit/jedit.sh <<-EOF
-		#!/bin/bash
-
-		java -jar /usr/share/jedit/jedit.jar \$@
-	EOF
-	chmod 755 ${D}/usr/share/jedit/jedit.sh
-
-	ln -s ../share/jedit/jedit.sh ${D}/usr/bin/jedit
-
-	keepdir /usr/share/jedit/jars
-}
-
-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"
-}
diff --git a/app-editors/jedit/jedit-4.2_pre13.ebuild b/app-editors/jedit/jedit-4.2_pre13.ebuild
deleted file mode 100644
index a2ad3bbb8a0a..000000000000
--- a/app-editors/jedit/jedit-4.2_pre13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre13.ebuild,v 1.3 2004/06/24 21:56:49 agriffis Exp $
-
-MY_PV="42pre13"
-
-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="jikes doc"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.5.4
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-S="${WORKDIR}/jEdit"
-
-src_compile() {
-	local antflags
-
-	if [ -z "$JAVA_HOME" ]; then
-		einfo
-		einfo "\$JAVA_HOME not set!"
-		einfo "Please use java-config to configure your JVM and try again."
-		einfo
-		die "\$JAVA_HOME not set."
-	fi
-
-	antflags=""
-	if use jikes ; then
-		einfo "Please ignore the following compiler warnings."
-		einfo "Jikes is just too pedantic..."
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	use doc && antflags="${antflags} javadoc"
-
-	ant dist ${antflags} || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/share/jedit
-	dodir /usr/bin
-
-	cp -R jedit.jar jars doc macros modes properties startup ${D}/usr/share/jedit
-	cd ${D}/usr/share/jedit
-	chmod -R u+rw,ug-s,go+u,go-w \
-		jedit.jar jars doc macros modes properties startup
-
-	cat >${D}/usr/share/jedit/jedit.sh <<-EOF
-		#!/bin/bash
-
-		java -jar /usr/share/jedit/jedit.jar \$@
-	EOF
-	chmod 755 ${D}/usr/share/jedit/jedit.sh
-
-	ln -s ../share/jedit/jedit.sh ${D}/usr/bin/jedit
-
-	keepdir /usr/share/jedit/jars
-}
-
-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"
-}
diff --git a/app-editors/jedit/jedit-4.2_pre14.ebuild b/app-editors/jedit/jedit-4.2_pre14.ebuild
deleted file mode 100644
index 493e2026a4b2..000000000000
--- a/app-editors/jedit/jedit-4.2_pre14.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre14.ebuild,v 1.2 2004/06/24 21:56:49 agriffis Exp $
-
-MY_PV="42pre14"
-
-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="jikes doc"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.5.4
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-S="${WORKDIR}/jEdit"
-
-src_compile() {
-	local antflags
-
-	if [ -z "$JAVA_HOME" ]; then
-		einfo
-		einfo "\$JAVA_HOME not set!"
-		einfo "Please use java-config to configure your JVM and try again."
-		einfo
-		die "\$JAVA_HOME not set."
-	fi
-
-	antflags=""
-	if use jikes ; then
-		einfo "Please ignore the following compiler warnings."
-		einfo "Jikes is just too pedantic..."
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	use doc && antflags="${antflags} javadoc"
-
-	ant dist ${antflags} || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/share/jedit
-	dodir /usr/bin
-
-	cp -R jedit.jar jars doc macros modes properties startup ${D}/usr/share/jedit
-	cd ${D}/usr/share/jedit
-	chmod -R u+rw,ug-s,go+u,go-w \
-		jedit.jar jars doc macros modes properties startup
-
-	cat >${D}/usr/share/jedit/jedit.sh <<-EOF
-		#!/bin/bash
-
-		java -jar /usr/share/jedit/jedit.jar \$@
-	EOF
-	chmod 755 ${D}/usr/share/jedit/jedit.sh
-
-	ln -s ../share/jedit/jedit.sh ${D}/usr/bin/jedit
-
-	keepdir /usr/share/jedit/jars
-}
-
-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"
-}