clean up

Package-Manager: portage-2.1.8.3/cvs/Linux i686

8 files changed, 19 insertions, 471 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index ea7b3850a778..6d5b01bd6cca 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/jde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.40 2010/10/14 15:01:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.41 2010/10/14 15:51:03 fauli Exp $
+
+  14 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
+  -jde-2.3.5.1-r2.ebuild, -files/jde-2.3.5.1-fix-efc.patch,
+  -files/jde-2.3.5.1-import.patch, -jde-2.3.6_pre20081208.ebuild,
+  -files/jde-2.3.6_pre20081208-classpath-gentoo.patch,
+  -files/jde-2.3.6_pre20081208-fix-paths-gentoo.patch:
+  clean up
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> jde-2.4.0.1.ebuild:
   Marking jde-2.4.0.1 ppc for bug 325939
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index ce77260d65f2..7ecc2d72c4c7 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -1,16 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70jde-gentoo-2.3.5.1.el 67 RMD160 a38b81029a269d12878f1de0d440c77473cc0d64 SHA1 984f8a79e9ec6ed94886e0cf09076f6c6a253c49 SHA256 d064070687999fddee94b820dc237cf9e67a428dc7f84648a9f68439e64cc326
 AUX 70jde-gentoo.el 372 RMD160 0ad1c8b7714cfcc410e7368371ad76d656bfdf82 SHA1 9f5d888101103e94e8e9a185563ebbb4b88ceb02 SHA256 f6bc7459e45d35fefb45e5cb6ade99950a67d6ebe0bb7e63e445244686daf147
-AUX jde-2.3.5.1-fix-efc.patch 1242 RMD160 b162982441b98945c0bc8e76e10dc773960b5e01 SHA1 fbaf50a9b646d66f92896d922d4a9655b267b6a8 SHA256 a401b051cc143c79fb38b5175bd5fb69c934d90f6b7468bd2a190e713d6cb1d9
-AUX jde-2.3.5.1-import.patch 1537 RMD160 4f002ccb420e8ef150911eda2a309356d351efcc SHA1 b7c170d3866f663d3e517df847630dd28393e785 SHA256 f607a9f89876adf73944d73c892be36e1817419b541f71bf901f1d4255b08823
-AUX jde-2.3.6_pre20081208-classpath-gentoo.patch 2557 RMD160 33aec9105ce71fe8c1a6c6aea4c1925ff034a252 SHA1 4067e02b252c581be269d9aeee9910e9cb054497 SHA256 fb1df43a13f5a429d18eba28ddf33dcc3157c06044c6460644a47053811cfdb2
-AUX jde-2.3.6_pre20081208-fix-paths-gentoo.patch 7584 RMD160 e96e80afc6fd35d10cbf74730044e8fbb2d00866 SHA1 bf82d7c7f06de09a80ca8e6f380910917ccdf5c0 SHA256 9881d62bc7be619b9fed691e3563a9d818cc905ff017cf123019804890a36792
 AUX jde-2.4.0.1-classpath-gentoo.patch 2291 RMD160 25094cf5a30a56c7fa1f46a6aa8151c505aab8a7 SHA1 82375042e10ac7180140e6e689df018961930faf SHA256 2b771ddecbed5ada026a1621ba92bcad29b0155549fa6a1a0495348c0c252504
 AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 RMD160 41cbfe19933706dd2cc852cc837f373162ee34c1 SHA1 ac50eb87cf1c9abdde849d9dc6bea17c8f6cbaf9 SHA256 aad7376741dfca76781d2e0d4e93a05f6e1b50fad60d2eb826da6550d7d192f0
-DIST jde-2.3.5.1.tar.gz 3717565 RMD160 e505dcb11b4177857bafeb48236f9cf850172917 SHA1 4fe73ee61ca0bc6a76fef808313b3e4610c09143 SHA256 8e1643444637853ed8fb7969055c1518f318166a7d1b4222f682e212868c19bf
-DIST jde-2.3.6_pre20081208.tar.bz2 3688041 RMD160 0b729315ff13e352e95babb6b92e0bb92a539179 SHA1 b663143adc8c26b001cc46d757507889a4115c24 SHA256 4e339a798ef3e91c01bdc70c3e54cf59b2203628b10e2e1a5c67ddbe9205914d
 DIST jde-2.4.0.1.tar.bz2 3719643 RMD160 1054ee460ecb967c60b27aa880455d8ff2b25c6f SHA1 07ebaf7882d8f49073865083efe17a04d8bd03bb SHA256 1481962464e18a11e6dc52a175200d726b0731cca5e09367f510266a424f822a
-EBUILD jde-2.3.5.1-r2.ebuild 1356 RMD160 0eef73005f7ac8a91ab691abd620053418c11f6e SHA1 88bbcf90f4549f76b09dfaad0c0b74606775fe7a SHA256 732ddb35ab40a42d5bb08ea5076ade1a017fbfc12dc05deedb821ded15d40ec5
-EBUILD jde-2.3.6_pre20081208.ebuild 1852 RMD160 4c1a98585f53fa65388ca0bda24069bb17441d97 SHA1 0dae0eb11e40eff7d879568ef4bb04589b7553f8 SHA256 4d62776916680034c42616d10238cd68bb47948c187c50315c8d794c79c6b69c
 EBUILD jde-2.4.0.1.ebuild 1888 RMD160 38ee219d1571e576895de40eb54580b83ccdf967 SHA1 94c0db202e20c54326959a94a71f1f5c1e8f52fc SHA256 9afdb4110cf5d4ff522776980155c7eee6f5d1ae87ab6c9b76749b7a925c19f9
-MISC ChangeLog 6630 RMD160 0e1347b5b5d99c145a70cef33cd0cc7bf35349c1 SHA1 953ec16312ffb4a4e1935ce8adf211472bf19a40 SHA256 80d6e382b244d89c2d7630f1c888045b4bd52da68120c360e878c1301d1d31c0
+MISC ChangeLog 6932 RMD160 66dd47df85d7cc218ce31c290de4ff32cb7426f6 SHA1 4f9e8a506a163facbfed29afe18ec7d6945efbb4 SHA256 5356eb20300bea3c760871cce9d59fe4a7baf0293965eb4d6532b51502547da4
 MISC metadata.xml 737 RMD160 1ffe7fbd32a23f6167b4d233b5917c8daca2ec7a SHA1 7577584fcc9f9af7eb5a4c2ae205181862ae9fe9 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky3J2gACgkQNQqtfCuFneN8HwCfbkDh90UwToB3jH3yhmoZlyFC
+ofcAoJhFOAIdOBX95e/inZhYl1r3/5Vn
+=fM/V
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/jde/files/jde-2.3.5.1-fix-efc.patch b/app-emacs/jde/files/jde-2.3.5.1-fix-efc.patch
deleted file mode 100644
index 496c6bfef7a5..000000000000
--- a/app-emacs/jde/files/jde-2.3.5.1-fix-efc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix byte compilation of efc.el, from upstream SVN repository.
-http://jdee.svn.sourceforge.net/viewvc/jdee/branches/2.3.6/jde/lisp/efc.el?r1=37&r2=43
-
---- jde/lisp/efc.el
-+++ jde/lisp/efc.el
-@@ -648,7 +648,7 @@
-   (if (efc-coll-type-compatible-p this item)
-       (oset this items (append (oref this items) (list item)))
-     (error "Tried to add an item of type %s to a list of items of type %s"
--	   (typep item) (oref this elem-type))))
-+	   (type-of item) (oref this elem-type))))
- 
- (defmethod efc-coll-iterator ((this efc-list))
-   "Return an iterator for this list."
-@@ -760,14 +760,14 @@
- (defmethod initialize-instance ((this efc-hash-table) &rest fields)
-   "Hash table constructor."
-   (call-next-method)
--  (oset table (make-hash-table)))
-+  (oset this table (make-hash-table)))
- 
- (defmethod efc-coll-put ((this efc-hash-table) key value)
-   "Put an item into the table."
-   (if (efc-coll-type-compatible-p this value)
-       (puthash key value (oref this table))      
-     (error "Tried to add an item of type %s to a hash table of items of type %s"
--	   (typep value) (oref this elem-type))))
-+	   (type-of value) (oref this elem-type))))
- 
- (defmethod efc-coll-get ((this efc-hash-table) key)
-   "Get an item from the table."
diff --git a/app-emacs/jde/files/jde-2.3.5.1-import.patch b/app-emacs/jde/files/jde-2.3.5.1-import.patch
deleted file mode 100644
index 8a520a6c9618..000000000000
--- a/app-emacs/jde/files/jde-2.3.5.1-import.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix error with jde-import-kill-extra-imports in Emacs 22.
-http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0008-lisp-jde-import.el-Fix-error-with-jde-import-kill-e.patch
-
---- jde-2.3.5.1-orig/lisp/jde-import.el	2006-02-19 15:22:36.000000000 +0100
-+++ jde-2.3.5.1/lisp/jde-import.el	2009-03-21 08:49:49.000000000 +0100
-@@ -494,16 +494,18 @@
-                    (name (semantic-tag-name import))
-                    (classname (jde-import-get-classname name))
-                    (case-fold-search nil)
--                   (number-of-matches 
--                    (substring (count-matches 
--                                (concat "\\b" classname "\\b")) 0 2)))
-+                   (number-of-matches
-+                    (count-matches (concat "\\b" classname "\\b"))))
-+              (when (stringp number-of-matches)
-+                (setq number-of-matches
-+                      (string-to-number (substring number-of-matches 0 2))))
-               (if (or 
-                    ;; If name is already listed in the set
-                    ;; of required imports...
-                    (member name required-imports)
-                    ;;or the class is not reference in the file
-                    ;;and is not an import of the whole package i.e. .*
--                   (and (< (string-to-number number-of-matches) 2)
-+                   (and (< number-of-matches 2)
-                         (not (string= classname "*")))
-                    ;; or imports a class in the current package...
-                    (and
diff --git a/app-emacs/jde/files/jde-2.3.6_pre20081208-classpath-gentoo.patch b/app-emacs/jde/files/jde-2.3.6_pre20081208-classpath-gentoo.patch
deleted file mode 100644
index 697d3a5440f1..000000000000
--- a/app-emacs/jde/files/jde-2.3.6_pre20081208-classpath-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Initialise classpath for beanshell and checkstyle using java-config.
-Gentoo specific patch.
-
---- jde-orig/lisp/beanshell.el	2009-03-25 11:12:01.000000000 +0100
-+++ jde/lisp/beanshell.el	2009-03-25 14:35:02.000000000 +0100
-@@ -785,6 +785,14 @@
-   "BeanShell intended to be used independently of any other 
- Emacs package.")
- 
-+(defun bsh-get-gentoo-classpath ()
-+  (or bsh-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "bsh")
-+	(skip-chars-backward "\n")
-+	(setq bsh-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
-   "Constructor for the standard bsh BeanShell instance."
-   (call-next-method)
-@@ -821,7 +829,7 @@
-         bsh-vm)
-      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
- 
--  (oset this cp bsh-classpath)
-+  (oset this cp (bsh-get-gentoo-classpath))
- 
-   (oset this startup-dir bsh-startup-directory))
- 
---- jde-orig/lisp/jde-checkstyle.el	2009-03-25 11:12:01.000000000 +0100
-+++ jde/lisp/jde-checkstyle.el	2009-03-25 14:35:41.000000000 +0100
-@@ -299,6 +299,14 @@
-        (format "-D%s=%s" (car prop) (cdr prop)))
-      jde-checkstyle-expanded-properties))
-   
-+(defun jde-checkstyle-get-gentoo-classpath ()
-+  (or jde-checkstyle-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "checkstyle")
-+	(skip-chars-backward "\n")
-+	(setq jde-checkstyle-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
- 
-   (jde-checkstyle-create-checker-buffer this)
-@@ -321,9 +329,8 @@
- 		  (jde-checkstyle-get-property-args this))
- 		(oref this :interactive-args)
- 		(list "-classpath" 
--		      (if jde-checkstyle-classpath
--			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path jde-checkstyle-jar-file)))
-+		      (jde-build-classpath
-+		       (jde-checkstyle-get-gentoo-classpath)))
- 		(list jde-checkstyle-class)		
- 		(list "-c" 
- 		      (if jde-checkstyle-style
---- jde-orig/lisp/jde.el	2009-03-25 11:12:01.000000000 +0100
-+++ jde/lisp/jde.el	2009-03-25 14:35:22.000000000 +0100
-@@ -2545,7 +2545,7 @@
-                        (jde-get-tools-jar)
-                        (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
--		      bsh-classpath
-+		      (bsh-get-gentoo-classpath)
-                       (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
diff --git a/app-emacs/jde/files/jde-2.3.6_pre20081208-fix-paths-gentoo.patch b/app-emacs/jde/files/jde-2.3.6_pre20081208-fix-paths-gentoo.patch
deleted file mode 100644
index 3c0b9e891c3a..000000000000
--- a/app-emacs/jde/files/jde-2.3.6_pre20081208-fix-paths-gentoo.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Make paths of directories and jar files configurable.
-
-Part of this patch was taken from Debian and heavily modified, see:
-http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0005-Set-the-location-of-needed-files-for-beanshell.el-an.patch
-
---- jde-orig/lisp/beanshell.el	2007-12-29 04:21:28.000000000 +0100
-+++ jde/lisp/beanshell.el	2009-03-20 22:00:01.000000000 +0100
-@@ -890,14 +890,18 @@
- 
- (add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode))
- 
-+(defcustom bsh-html-directory (bsh-find-bsh-data-directory)
-+  "Directory of the beanshell HTML documentation."
-+  :group 'bsh
-+  :type 'directory)
-+
- ;;;###autoload
- (defun bsh-script-help ()
-   "Display BeanShell User's Guide."
-   (interactive)
--  (let* ((bsh-dir (bsh-find-bsh-data-directory))
--         (bsh-help
--          (if bsh-dir
--	      (expand-file-name "bsh-ug.html" bsh-dir))))      
-+  (let ((bsh-help
-+	 (if bsh-html-directory
-+	     (expand-file-name "bsh-ug.html" bsh-html-directory))))
-     (if (and
-          bsh-help
-          (file-exists-p bsh-help))
---- jde-orig/lisp/jde-bug.el	2007-12-29 04:21:28.000000000 +0100
-+++ jde/lisp/jde-bug.el	2009-03-20 19:32:17.000000000 +0100
-@@ -2437,10 +2437,10 @@
- (defun jde-bug-help ()
-   "Displays the JDEbug User's Guide."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--         (jdebug-help
--          (if jde-dir
--	      (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir))))       
-+  (let ((jdebug-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jdebug-ug/jdebug-ug.html"
-+			       jde-html-directory))))
-     (if (and
-          jdebug-help
-          (file-exists-p jdebug-help))
---- jde-orig/lisp/jde-checkstyle.el	2007-12-29 04:21:28.000000000 +0100
-+++ jde/lisp/jde-checkstyle.el	2009-03-20 21:56:44.000000000 +0100
-@@ -316,10 +316,6 @@
- 	 (vm-path (oref (jde-run-get-vm) :path))
- 	 (source-file 
- 	  (concat (file-name-nondirectory buffer-file-name)))
--	 (jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/"))
- 	 (args (append
- 		(unless jde-checkstyle-expanded-properties-file
- 		  (jde-checkstyle-get-property-args this))
-@@ -327,13 +323,13 @@
- 		(list "-classpath" 
- 		      (if jde-checkstyle-classpath
- 			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path
--			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
-+			(jde-normalize-path jde-checkstyle-jar-file)))
- 		(list jde-checkstyle-class)		
- 		(list "-c" 
- 		      (if jde-checkstyle-style
- 			  (jde-normalize-path jde-checkstyle-style)
--			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
-+			(expand-file-name "lib/sun_checks.xml"
-+					  jde-java-directory)))
- 		(if jde-checkstyle-expanded-properties-file
-                     (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
- 		(if jde-checkstyle-module-package-names-file
---- jde-orig/lisp/jde-dbs.el	2007-12-29 04:21:28.000000000 +0100
-+++ jde/lisp/jde-dbs.el	2009-03-20 21:57:58.000000000 +0100
-@@ -899,9 +899,6 @@
- 		  (jde-normalize-path 'jde-run-working-directory)
- 		source-directory))	     
-              (vm (oref (jde-run-get-vm) :path))
--	     (jde-java-directory
--	      (expand-file-name "java"
--	       (jde-find-jde-data-directory)))
- 	     (vm-args 
- 		(let (args)
- 		  (setq args 
---- jde-orig/lisp/jde.el	2008-12-08 01:51:15.000000000 +0100
-+++ jde/lisp/jde.el	2009-03-20 21:40:13.000000000 +0100
-@@ -1731,14 +1731,19 @@
- jde.el."
-   (jde-find-jde-data-directory))
- 
-+(defcustom jde-html-directory
-+  (expand-file-name "doc/html" (jde-find-jde-doc-directory))
-+  "Directory of the JDE HTML documentation."
-+  :group 'jde-project
-+  :type 'directory)
-+
- ;;;###autoload
- (defun jde-show-help ()
-   "Displays the JDE User's Guide in a browser."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--         (jde-help
--          (if jde-dir
--	      (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir))))      
-+  (let ((jde-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jde-ug/jde-ug.html" jde-html-directory))))
-     (if (and
-          jde-help
-          (file-exists-p jde-help))
-@@ -2445,21 +2450,58 @@
-                    "The single instance of the JDEE's BeanShell."))
-   "Class of JDEE BeanShells. There is only one per Emacs session.")
- 
-+(defcustom jde-java-directory
-+  (expand-file-name "java" (jde-find-jde-data-directory))
-+  "Top-level directory of JDE Java files."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-bsh-commands-directory
-+  (expand-file-name "bsh-commands" jde-java-directory)
-+  "Directory of beanshell commands."
-+  :group 'bsh
-+  :type 'directory)
-+
-+(defcustom jde-classes-directory
-+  (expand-file-name "classes" jde-java-directory)
-+  "Directory of JDE classes."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-checkstyle-jar-file
-+  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)
-+  "Path of the checkstyle-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-regexp-jar-file
-+  (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)
-+  "Path of the regexp-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-jde-jar-file
-+  (expand-file-name "lib/jde.jar" jde-java-directory)
-+  "Path of the jde-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-bsh-jar-file
-+  (expand-file-name "lib/bsh.jar" jde-java-directory)
-+  "Path of the bsh-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
- (defmethod initialize-instance ((this jde-bsh) &rest fields)
-   "Constructor for the JDEE BeanShell instance."
-   (call-next-method)
--  (let* ((jde-java-directory
--          (concat
--           (jde-find-jde-data-directory)
--           "java/")))
--
--    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
--    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
--    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
--    (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
--    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
--    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
--    (oset-default 'jde-bsh the-bsh this)))
-+  (oset this bsh-cmd-dir jde-bsh-commands-directory)
-+  (oset this checkstyle-jar jde-checkstyle-jar-file)
-+  (oset this regexp-jar jde-regexp-jar-file)
-+  (oset this jde-classes-dir jde-classes-directory)
-+  (oset this jde-jar jde-jde-jar-file)
-+  (oset this jar jde-bsh-jar-file)
-+  (oset-default 'jde-bsh the-bsh this))
- 
- (defmethod bsh-create-buffer ((this jde-bsh))
-   "Creates the JDEE's beanshell buffer."
-@@ -2503,6 +2545,7 @@
-                        (jde-get-tools-jar)
-                        (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
-+		      bsh-classpath
-                       (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
---- jde-orig/lisp/jde-jdb.el	2007-12-29 04:21:28.000000000 +0100
-+++ jde/lisp/jde-jdb.el	2009-03-20 19:33:33.000000000 +0100
-@@ -1463,10 +1463,10 @@
- 
- (defun jde-jdb-help ()
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--         (jdb-ug-path
--          (if jde-dir
--	      (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir))))      
-+  (let ((jdb-ug-path
-+	 (if jde-html-directory
-+	     (expand-file-name "jdb-ug/jdb-ug-frame.html"
-+			       jde-html-directory))))
-     (if (and
-          jdb-ug-path
-          (file-exists-p jdb-ug-path))
diff --git a/app-emacs/jde/jde-2.3.5.1-r2.ebuild b/app-emacs/jde/jde-2.3.5.1-r2.ebuild
deleted file mode 100644
index 9280c041db4d..000000000000
--- a/app-emacs/jde/jde-2.3.5.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.5.1-r2.ebuild,v 1.5 2010/02/02 17:55:13 ulm Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jdee/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-emacs/elib
-	>=app-emacs/cedet-1.0_beta3"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.3"
-
-SITEFILE="70${PN}-gentoo-${PV}.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-efc.patch"
-	epatch "${FILESDIR}/${P}-import.patch"
-}
-
-src_compile() {
-	cd lisp
-	cat >jde-compile-script-init <<-EOF
-	(load "${SITELISP}/cedet/common/cedet")
-	(add-to-list 'load-path "${S}/lisp")
-	(require 'jde)
-	EOF
-	emacs -batch -l jde-compile-script-init -f batch-byte-compile *.el \
-		|| die "batch-byte-compile failed"
-}
-
-src_install() {
-	elisp-install ${PN}/lisp lisp/*.{el,elc,bnf} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	dobin lisp/jtags* || die "dobin failed"
-
-	# this should be installed outside of SITELISP
-	insinto ${SITELISP}/${PN}
-	doins -r java || die "doins failed"
-
-	dohtml -r doc/html/* || die "dohtml failed"
-	dodoc lisp/ChangeLog lisp/ReleaseNotes.txt
-}
diff --git a/app-emacs/jde/jde-2.3.6_pre20081208.ebuild b/app-emacs/jde/jde-2.3.6_pre20081208.ebuild
deleted file mode 100644
index 85681a530ce3..000000000000
--- a/app-emacs/jde/jde-2.3.6_pre20081208.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.6_pre20081208.ebuild,v 1.2 2010/02/02 17:55:13 ulm Exp $
-
-EAPI=2
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 elisp eutils
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.3
-	app-emacs/elib
-	>=app-emacs/cedet-1.0_beta3
-	dev-java/bsh
-	dev-java/junit:0
-	dev-util/checkstyle"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.3.5.1-import.patch"
-	epatch "${FILESDIR}/${P}-fix-paths-gentoo.patch"
-	epatch "${FILESDIR}/${P}-classpath-gentoo.patch"
-
-	local bshjar csjar
-	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
-	csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
-	sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
-		-e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
-
-	cd java/lib || die
-	java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from bsh
-}
-
-src_compile() {
-	eant dist \
-		-Dcedet.dir="${SITELISP}/cedet" \
-		-Delib.dir="${SITELISP}/elib"
-}
-
-src_install() {
-	java-pkg_dojar dist/java/lib/jde.jar
-	insinto "${JAVA_PKG_SHAREPATH}"
-	doins -r java/bsh-commands || die
-
-	use source && java-pkg_dosrc java/src/*
-	use doc && java-pkg_dojavadoc dist/doc/java/api
-
-	elisp-install ${PN} dist/lisp/*.{el,elc} || die
-	elisp-site-file-install "${SITEFILE}" || die
-
-	dobin lisp/jtags || die
-
-	dohtml -r dist/doc/html/* || die
-	dodoc lisp/readme.txt lisp/ChangeLog lisp/ReleaseNotes.txt
-}