*** empty log message ***

12 files changed, 63 insertions, 90 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index d431aafe19f6..a59781b2b3c1 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/jde
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.11 2005/01/01 13:51:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.12 2005/01/12 18:09:48 mkennedy Exp $
+
+*jde-2.3.3-r1 (12 Jan 2005)
+
+  12 Jan 2005; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml,
+  +files/2.3.3-jde-new-buffer-menu-gentoo.patch, -jde-2.2.8.ebuild,
+  -jde-2.3.2.ebuild, +jde-2.3.3-r1.ebuild, -jde-2.3.4_beta5.ebuild,
+  +jde-2.3.5.ebuild:
+  Minor version update; Resolves Bug #73837; Added fix for JDE 2.3.3 when used
+  with CVS Emacs (see also Bug #73837); Removed old ebuilds.
 
   21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jde-2.3.3.ebuild:
   x86
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 208551d4ca86..5eef0d7cd785 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -1,11 +1,10 @@
-MD5 87575a58204ac9524d980db0ef85207b ChangeLog 1479
-MD5 b61df750247445e9fe069851f984310e jde-2.2.8.ebuild 1304
-MD5 68f97f7488ec5feb5f8c1120f7b9574c jde-2.3.2.ebuild 1166
 MD5 f55e226bbfa9f5e1d1609b07a382f49c jde-2.3.3.ebuild 1105
-MD5 8c144cf6053d420b8e0bb2c46d8cca80 metadata.xml 176
-MD5 e69056b3c3712d4356cbbb1a39ee1588 jde-2.3.4_beta5.ebuild 1076
-MD5 7158a0f444921d301f3048ce0c65435c files/70jde-gentoo.el 223
-MD5 9bf66430f17828ee5b44b301ef32b007 files/digest-jde-2.2.8 62
-MD5 9c5023efbe90c9b0fe4a567f66776075 files/digest-jde-2.3.2 62
+MD5 9dfd01031daeceb6a1c7cbd97e44a61e jde-2.3.5.ebuild 1109
+MD5 28614662b7baa66d4e3087cabb74c10b jde-2.3.3-r1.ebuild 1299
+MD5 ceb45cbe1617165cba933c19085feabe ChangeLog 1873
+MD5 b6c7ee3b6ef85ad220fab5240fb1a05e metadata.xml 737
+MD5 9f280cc7e0e050bd10d6585bf23ef45a files/digest-jde-2.3.3-r1 62
 MD5 9f280cc7e0e050bd10d6585bf23ef45a files/digest-jde-2.3.3 62
-MD5 521062a4148cfc0048c3ed18b6efacba files/digest-jde-2.3.4_beta5 68
+MD5 54c2c6fef8729628f62a445430024f44 files/digest-jde-2.3.5 62
+MD5 7158a0f444921d301f3048ce0c65435c files/70jde-gentoo.el 223
+MD5 978bb89eb6293ac482b193ade2a80b94 files/2.3.3-jde-new-buffer-menu-gentoo.patch 509
diff --git a/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch b/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch
new file mode 100644
index 000000000000..ec00c8b48806
--- /dev/null
+++ b/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch
@@ -0,0 +1,13 @@
+diff -ur jde-2.3.3.orig/lisp/jde.el jde-2.3.3/lisp/jde.el
+--- jde-2.3.3.orig/lisp/jde.el	2003-12-07 21:22:40.000000000 -0600
++++ jde-2.3.3/lisp/jde.el	2005-01-12 11:46:13.213198782 -0600
+@@ -1260,7 +1260,7 @@
+ 			     (easy-menu-create-menu 
+ 			      (car val) (cdr val))))
+ 		   (menu-name (car val)))
+-	      (define-key-after (cdr (cdr files)) [jde-new]
++	      (define-key-after (or (cdr (cdr files)) (make-keymap)) [jde-new]
+ 		(cons menu-name menu)
+ 		'open-file)))))
+ 
+Only in jde-2.3.3/lisp: jde.el~
diff --git a/app-emacs/jde/files/digest-jde-2.2.8 b/app-emacs/jde/files/digest-jde-2.2.8
deleted file mode 100644
index 7e317b44d67b..000000000000
--- a/app-emacs/jde/files/digest-jde-2.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 072b1f25d0198621fa46178776aa817b jde-2.2.8.tar.gz 1469896
diff --git a/app-emacs/jde/files/digest-jde-2.3.2 b/app-emacs/jde/files/digest-jde-2.3.2
deleted file mode 100644
index 40338ce2b09c..000000000000
--- a/app-emacs/jde/files/digest-jde-2.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7dabdfb0b1b11a1e9dfd9e5ee5b9ce2 jde-2.3.2.tar.gz 2181034
diff --git a/app-emacs/jde/files/digest-jde-2.3.3-r1 b/app-emacs/jde/files/digest-jde-2.3.3-r1
new file mode 100644
index 000000000000..62d7965fef09
--- /dev/null
+++ b/app-emacs/jde/files/digest-jde-2.3.3-r1
@@ -0,0 +1 @@
+MD5 070b2a4c0e106dbe23343f6f1a659b41 jde-2.3.3.tar.gz 3420886
diff --git a/app-emacs/jde/files/digest-jde-2.3.4_beta5 b/app-emacs/jde/files/digest-jde-2.3.4_beta5
deleted file mode 100644
index b88bec6d4d08..000000000000
--- a/app-emacs/jde/files/digest-jde-2.3.4_beta5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88a82abe2e5728bc5bc50a713f733f32 jde-2.3.4_beta5.tar.gz 3480775
diff --git a/app-emacs/jde/files/digest-jde-2.3.5 b/app-emacs/jde/files/digest-jde-2.3.5
new file mode 100644
index 000000000000..c6811c6cd362
--- /dev/null
+++ b/app-emacs/jde/files/digest-jde-2.3.5
@@ -0,0 +1 @@
+MD5 298c9b99aa61c2a704487a83b4d988ac jde-2.3.5.tar.gz 3699059
diff --git a/app-emacs/jde/jde-2.2.8.ebuild b/app-emacs/jde/jde-2.2.8.ebuild
deleted file mode 100644
index 26e611153d6e..000000000000
--- a/app-emacs/jde/jde-2.2.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.2.8.ebuild,v 1.6 2005/01/01 13:51:21 eradicator Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sunsite.dk/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs
-	virtual/jdk
-	app-emacs/speedbar
-	app-emacs/eieio
-	app-emacs/semantic
-	app-emacs/elib"
-
-src_compile() {
-	cd ${S}/lisp
-	rm -f jde-compile-script-init
-	for i in ${SITELISP}/speedbar ${SITELISP}/eieio ${SITELISP}/semantic ${PWD}
-	do
-		echo "(add-to-list 'load-path \"$i\")" >>jde-compile-script-init
-	done
-	emacs -batch -l jde-compile-script-init -f batch-byte-compile *.el
-}
-
-src_install() {
-	dodir ${SITELISP}/${PN}
-	cp -r java ${D}/${SITELISP}/${PN}/
-
-	dodir /usr/share/doc/${P}
-	cp -r doc/* ${D}/usr/share/doc/${P}/
-
-	cd ${S}/lisp
-	elisp-install ${PN}/lisp *.el *.elc *.bnf
-
-	elisp-site-file-install ${FILESDIR}/70jde-gentoo.el
-	exeinto /usr/bin
-	doexe jtags*
-	dodoc ChangeLog ReleaseNotes.txt
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo ""
-	einfo "To use JDE, add the following for your ~/.emacs:"
-	einfo "	(require 'jde)"
-	einfo ""
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/jde/jde-2.3.2.ebuild b/app-emacs/jde/jde-2.3.3-r1.ebuild
index e4e1a6053eaf..c4c30a6f621f 100644
--- a/app-emacs/jde/jde-2.3.2.ebuild
+++ b/app-emacs/jde/jde-2.3.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.2.ebuild,v 1.6 2005/01/01 13:51:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.3-r1.ebuild,v 1.1 2005/01/12 18:09:48 mkennedy Exp $
 
-inherit elisp
+inherit elisp eutils
 
 IUSE=""
 
@@ -11,14 +11,20 @@ HOMEPAGE="http://jdee.sunsite.dk/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND="virtual/emacs
-	>=virtual/jdk-1.2
+	>=virtual/jdk-1.2.2
 	app-emacs/eieio
 	app-emacs/semantic
 	app-emacs/elib"
 
+src_unpack() {
+	unpack ${A}
+	# Fix for CVS versions of Emacs http://www.mail-archive.com/jde@sunsite.dk/msg07917.html
+	epatch ${FILESDIR}/${PV}-jde-new-buffer-menu-gentoo.patch || die
+}
+
 src_compile() {
 	cd ${S}/lisp
 	rm -f jde-compile-script-init
@@ -44,11 +50,3 @@ src_install() {
 	doexe jtags*
 	dodoc ChangeLog ReleaseNotes.txt
 }
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/jde/jde-2.3.4_beta5.ebuild b/app-emacs/jde/jde-2.3.5.ebuild
index 40fa200baa43..04ecc15193b0 100644
--- a/app-emacs/jde/jde-2.3.4_beta5.ebuild
+++ b/app-emacs/jde/jde-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.4_beta5.ebuild,v 1.3 2005/01/01 13:51:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.5.ebuild,v 1.1 2005/01/12 18:09:48 mkennedy Exp $
 
 inherit elisp
 
@@ -18,7 +18,7 @@ DEPEND="virtual/emacs
 	app-emacs/elib
 	>=app-emacs/cedet-1.0_beta3"
 
-S=${WORKDIR}/${P/_beta/beta}
+S=${WORKDIR}/${P}
 
 src_compile() {
 	cd ${S}/lisp
@@ -32,15 +32,13 @@ EOF
 src_install() {
 	dodir ${SITELISP}/${PN}
 	cp -r java ${D}/${SITELISP}/${PN}/
-
 	dodir /usr/share/doc/${P}
 	cp -r doc/* ${D}/usr/share/doc/${P}/
-
 	cd ${S}/lisp
 	elisp-install ${PN}/lisp *.el *.elc *.bnf
-
 	elisp-site-file-install ${FILESDIR}/70jde-gentoo.el
+	dodoc ChangeLog ReleaseNotes.txt
+	find ${D} -type f -print0 |xargs -0 chmod 644
 	exeinto /usr/bin
 	doexe jtags*
-	dodoc ChangeLog ReleaseNotes.txt
 }
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index 99df102501c5..f75c85528b98 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -3,4 +3,20 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <herd>java</herd>
+<longdescription>
+ The Java Development Environment for Emacs is a software package that
+ interfaces Emacs to command-line Java development tools (for example,
+ JavaSoft's JDK). JDEE features include:
+
+    * JDEE menu with compile, run, debug, build, browse, project, and help
+      commands
+    * syntax coloring
+    * auto indentation
+    * compile error to source links
+    * source-level debugging
+    * source code browsing
+    * make file support
+    * automatic code generation
+    * Java source interpreter (Pat Neimeyer's BeanShell)
+</longdescription>
 </pkgmetadata>