Make jde-import.el work with Emacs 22.

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 42 insertions, 7 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index 2678470a6c41..a09c77570e68 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/jde
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.31 2009/03/02 23:01:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.32 2009/03/21 08:16:44 ulm Exp $
+
+*jde-2.3.5.1-r2 (21 Mar 2009)
+
+  21 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/jde-2.3.5.1-import.patch, -jde-2.3.5.1-r1.ebuild,
+  +jde-2.3.5.1-r2.ebuild:
+  Make jde-import.el work with Emacs 22. Patch from Debian.
 
 *jde-2.3.5.1-r1 (02 Mar 2009)
 
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 450373fb9b9c..09e2bd71acd4 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -3,15 +3,16 @@ Hash: SHA1
 
 AUX 70jde-gentoo.el 101 RMD160 927bbbf452562db0fdfb21540e39d1c128d53637 SHA1 cec193709142f6bf3a6843c8a350e03689f2e200 SHA256 3aa98e237f164406ac0d1ad94afb09473008d8d2b264bf0cd9069a641c081df8
 AUX jde-2.3.5.1-fix-efc.patch 1242 RMD160 b162982441b98945c0bc8e76e10dc773960b5e01 SHA1 fbaf50a9b646d66f92896d922d4a9655b267b6a8 SHA256 a401b051cc143c79fb38b5175bd5fb69c934d90f6b7468bd2a190e713d6cb1d9
+AUX jde-2.3.5.1-import.patch 1483 RMD160 3d426768aecd465a11276685d8f8e15861732b8b SHA1 3c31488ba7368445b36b356661628d4981fc34a1 SHA256 eecb15d5e161d2f6207aa8b1760bf6f04d878a3185de1110725c0d5331d15553
 DIST jde-2.3.5.1.tar.gz 3717565 RMD160 e505dcb11b4177857bafeb48236f9cf850172917 SHA1 4fe73ee61ca0bc6a76fef808313b3e4610c09143 SHA256 8e1643444637853ed8fb7969055c1518f318166a7d1b4222f682e212868c19bf
-EBUILD jde-2.3.5.1-r1.ebuild 1313 RMD160 cf02de34b44ac41cdcec177de7c56ced1a496928 SHA1 0d03992076b7c7874fd8b22be58a66cd6033a6c4 SHA256 9b72a9bb9ac31e2184238aca680f3849bb1207d816ca06ba13efcf71888461ba
+EBUILD jde-2.3.5.1-r2.ebuild 1313 RMD160 f61ddbbc92625c8eb568bd45c0548525374cc42d SHA1 3299b75716c81e7736f4b2173ea106d670c51519 SHA256 173e0452bdc8eeca420226add1a6b4854c5382841802683af72669a235208be5
 EBUILD jde-2.3.5.1.ebuild 1186 RMD160 0cf53c811075e186046bedec5d3d4ce1f101b253 SHA1 6dad570d68c97ef3fb6337f820de0cc35e598a97 SHA256 31f7c064390f53d901cfa2ea01ab0e3ebd6acf979f745acb142e9c9e492fee72
-MISC ChangeLog 4784 RMD160 e481984234836c645f39d9417016a315768f3b86 SHA1 0aaff29def68fcf8b6511f2c337d76386a0bed9c SHA256 55bac4d5b88b49c212327ba3d408c698f586c40b441d3710227820b904d608c5
+MISC ChangeLog 5008 RMD160 937acce5a94155615ac2f5a9c2ee53d34ed098e7 SHA1 49220ca620c0e820c5997e4d72074d8ac8553c64 SHA256 6460b33ada43146a6274909285185d169e506d77c910828a9207558dfa02f15c
 MISC metadata.xml 737 RMD160 1ffe7fbd32a23f6167b4d233b5917c8daca2ec7a SHA1 7577584fcc9f9af7eb5a4c2ae205181862ae9fe9 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkmsZa4ACgkQOeoy/oIi7uwrPACgw/x2vNqkRE6/5vIexw4pkhcg
-gPcAn3AvwJOkia/B7LMtvx6J+HRU1EOP
-=7dHL
+iEYEARECAAYFAknEor0ACgkQOeoy/oIi7uylNgCfY0ezfEFYuwAqaDLeayM6s7pq
+TDwAn0G5NiJfYw1UypgW65ZFtMEqDbcm
+=/Lvz
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..b8c826e6ad9e
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.3.5.1-import.patch
@@ -0,0 +1,27 @@
+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
+@@ -495,15 +495,17 @@
+                    (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/jde-2.3.5.1-r1.ebuild b/app-emacs/jde/jde-2.3.5.1-r2.ebuild
index a52bd9002e19..9c8f10485f89 100644
--- a/app-emacs/jde/jde-2.3.5.1-r1.ebuild
+++ b/app-emacs/jde/jde-2.3.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/03/02 23:01:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.5.1-r2.ebuild,v 1.1 2009/03/21 08:16:44 ulm Exp $
 
 inherit elisp eutils