Version bump, bug 394365. This version depends on CEDET included with >=emacs-23...

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index 6a7dc56a1a0c840b15e34c7e7a7bb845eeb96c5e..a4c3cc941a23929047ededfe6740d8256166fa94 100644 (file)
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2010/10/14 16:29:11 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.43 2011/12/13 17:29:40 ulm Exp $
+
+*jde-2.4.1_pre20110622 (13 Dec 2011)
+
+  13 Dec 2011; Ulrich Mueller <ulm@gentoo.org> +jde-2.4.1_pre20110622.ebuild,
+  +files/jde-2.4.1-doc-directory.patch,
+  +files/jde-2.4.1-semantic-emacs-24.patch:
+  Version bump, bug 394365. This version depends on CEDET included with
+  >=emacs-23.2. Thanks to Alex Bennee <alex@bennee.com>.
 
   14 Oct 2010; Ulrich Mueller <ulm@gentoo.org> -files/70jde-gentoo-2.3.5.1.el:
   More cleanup.

diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index b5e526145b50b5bfd66f5e29c5cd30c7b4988fbb..e5fb2b36fd5a916657563d9d5ce207b63ec9137a 100644 (file)
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -4,14 +4,18 @@ Hash: SHA1
 AUX 70jde-gentoo.el 372 RMD160 0ad1c8b7714cfcc410e7368371ad76d656bfdf82 SHA1 9f5d888101103e94e8e9a185563ebbb4b88ceb02 SHA256 f6bc7459e45d35fefb45e5cb6ade99950a67d6ebe0bb7e63e445244686daf147
 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
+AUX jde-2.4.1-doc-directory.patch 1806 RMD160 5a7670878663aaaaae680dc7acdd3576519d4b45 SHA1 b561109716630077ff8778088acec562713c048a SHA256 1c6b745d3be3b6dd4641a90638d0429dece6f5729dae575b8be0a280400523bc
+AUX jde-2.4.1-semantic-emacs-24.patch 1140 RMD160 a443d8d957d744ba32d993c8d41639b6ba0b36bb SHA1 fd0663b33150b0fbe6c9e9a8eedc1c36d5d88b96 SHA256 3e6e3a9cb923a462433b6cc59495996ece78119ba32c5e88a137ea21333966d0
 DIST jde-2.4.0.1.tar.bz2 3719643 RMD160 1054ee460ecb967c60b27aa880455d8ff2b25c6f SHA1 07ebaf7882d8f49073865083efe17a04d8bd03bb SHA256 1481962464e18a11e6dc52a175200d726b0731cca5e09367f510266a424f822a
+DIST jde-2.4.1_pre20110622.tar.gz 3813917 RMD160 7f891e3528381533ad61b2c3f91e02be2afb4633 SHA1 86f9d1fa1332204e195f4037d033e959aa18c5c7 SHA256 ed565e4c644ade7d30d2f7c3e811d9c10df9e86b1aa1ebc81a8d66d62537b5f8
 EBUILD jde-2.4.0.1.ebuild 1888 RMD160 38ee219d1571e576895de40eb54580b83ccdf967 SHA1 94c0db202e20c54326959a94a71f1f5c1e8f52fc SHA256 9afdb4110cf5d4ff522776980155c7eee6f5d1ae87ab6c9b76749b7a925c19f9
-MISC ChangeLog 7026 RMD160 33c8775002cb5177235a2f0e06e3f36cea59b2f9 SHA1 3c357535b76459cae74c977d54b8e689cc21a196 SHA256 960c94c4b936e331a033fb834a701cc448ee0ba0820cf9cfe26676c2aaac3319
+EBUILD jde-2.4.1_pre20110622.ebuild 2052 RMD160 822874851f00af477f4c772a932d6fd18d146503 SHA1 73943efc69c0a382fb6e54244d296c1aaa6e06d3 SHA256 471c8fb4015a04b9a8972ce5198d23259342cb3516601e8a0f9e21744299264d
+MISC ChangeLog 7356 RMD160 e6ef194d9e5748a814ebba4062e2d80f3151fc11 SHA1 397c7e056bafef9739e96055c120135f39706647 SHA256 bb96d8f808b6012703ed2897dc7bd8958ec51940f25369014e249423f2c0c950
 MISC metadata.xml 737 RMD160 1ffe7fbd32a23f6167b4d233b5917c8daca2ec7a SHA1 7577584fcc9f9af7eb5a4c2ae205181862ae9fe9 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAky3MFUACgkQOeoy/oIi7uy2LwCfZQ7gNJO9g4kPnKZ9CKQs6YAu
-/DEAoOdR+NAYsJ1WiaCgBpem/8i3YwSl
-=MCOf
+iEYEARECAAYFAk7njd4ACgkQOeoy/oIi7uy9LwCgxjEOGaFeN9Rv4RrwIO6WIdY/
+u3oAoNlem+gtyHNaQncJgNUhodxDdezR
+=fBu+
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
new file mode 100644 (file)
index 0000000..c96fcd8
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
@@ -0,0 +1,53 @@
+Move definition of jde-find-jde-doc-directory to jde-util.el.
+
+--- jdee-orig/lisp/beanshell.el
++++ jdee/lisp/beanshell.el
+@@ -82,7 +82,7 @@
+ (eval-when-compile
+   (require 'cl))
+ 
+-(declare-function jde-find-jde-doc-directory "jde" nil)
++(require 'jde-util)
+ 
+ (defgroup bsh nil
+   "Customizations for the Emacs inteface to Pat Neimeyer's Java
+--- jdee-orig/lisp/jde-util.el
++++ jdee/lisp/jde-util.el
+@@ -139,6 +139,17 @@
+         (if dir dir (jde-root)))
+       (jde-root))))
+ 
++(defun jde-find-jde-doc-directory ()
++  "Return the path of the JDE documentation directory.
++Returns  nil if the directory cannot be found. At some
++point, XEmacs will include the JDE. Versions of XEmacs
++that include JDE will store the JDE doc in a data
++directory called jde. On all other Emacs versions, the JDE
++expects to find the documentation in a subdirectory
++named doc of the directory that contains the file
++jde.el."
++  (jde-find-jde-data-directory))
++
+ (defun jde-temp-directory ()
+ "Get the location used by the host system to store temporary files."
+   (or (if (boundp 'temporary-file-directory) temporary-file-directory)
+--- jdee-orig/lisp/jde.el
++++ jdee/lisp/jde.el
+@@ -1762,17 +1762,6 @@
+ 
+ 
+ ;; JDE help
+-(defun jde-find-jde-doc-directory ()
+-  "Return the path of the JDE documentation directory.
+-Returns  nil if the directory cannot be found. At some
+-point, XEmacs will include the JDE. Versions of XEmacs
+-that include JDE will store the JDE doc in a data
+-directory called jde. On all other Emacs versions, the JDE
+-expects to find the documentation in a subdirectory
+-named doc of the directory that contains the file
+-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."

diff --git a/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch b/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
new file mode 100644 (file)
index 0000000..cafcc5a
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
@@ -0,0 +1,36 @@
+semantic-add-minor-mode accepts two arguments only.
+http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/100114
+
+--- jdee-orig/lisp/jde-bug.el
++++ jdee/lisp/jde-bug.el
+@@ -570,7 +570,7 @@
+ 
+   (run-hook-with-args 'jde-bug-minor-mode-hook jde-bug-minor-mode))
+ 
+-(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug" jde-bug-mode-map)
++(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug")
+ 
+ ;; (fmakunbound 'jde-bug-key-bindings)
+ (defcustom jde-bug-key-bindings
+--- jdee-orig/lisp/jde-jdb.el
++++ jdee/lisp/jde-jdb.el
+@@ -1830,7 +1830,7 @@
+     (if (featurep 'xemacs)
+       (easy-menu-remove jde-jdb-xemacs-menu-spec))))
+ 
+-(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb" jde-jdb-mode-map)
++(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb")
+ 
+ 
+ ;; (fmakunbound 'jde-jdb-key-bindings)
+--- jdee-orig/lisp/jde-plugins.el
++++ jdee/lisp/jde-plugins.el
+@@ -194,7 +194,7 @@
+               (easy-menu-add menu-spec jde-plugin-mode-map)
+             (easy-menu-remove menu-spec))))))
+ 
+-(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin" jde-plugin-mode-map)
++(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin")
+ 
+ 
+ (provide 'jde-plugins)

diff --git a/app-emacs/jde/jde-2.4.1_pre20110622.ebuild b/app-emacs/jde/jde-2.4.1_pre20110622.ebuild
new file mode 100644 (file)
index 0000000..f3c23cc
--- /dev/null
+++ b/app-emacs/jde/jde-2.4.1_pre20110622.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1_pre20110622.ebuild,v 1.1 2011/12/13 17:29:40 ulm Exp $
+
+EAPI=4
+NEED_EMACS=23
+WANT_ANT_TASKS="ant-nodeps ant-contrib"
+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/"
+# taken from: http://jdee.svn.sourceforge.net/viewvc/jdee/trunk/jdee/?view=tar&pathrev=254
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.3
+       app-emacs/elib
+       virtual/emacs-cedet
+       dev-java/bsh
+       dev-java/junit:0
+       dev-util/checkstyle"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/jdee"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+       epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+       epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+       epatch "${FILESDIR}/${PN}-2.4.1-semantic-emacs-24.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 bindist -Delib.dir="${EPREFIX}${SITELISP}/elib"
+       use doc && eant source-doc
+}
+
+src_install() {
+       local dist="dist/jdee-${PV%_*}"
+
+       java-pkg_dojar ${dist}/java/lib/jde.jar
+       insinto "${JAVA_PKG_SHAREPATH}"
+       doins -r java/bsh-commands
+
+       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 ${dist}/lisp/jtags
+
+       dohtml -r doc/html/*
+}