Make it work with Emacs 24, bug 420237. Change EAPI to 4.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 84 insertions, 1 deletions

diff --git a/app-emacs/ecb/ChangeLog b/app-emacs/ecb/ChangeLog
index cb4c53e888fd..4064455e6aec 100644
--- a/app-emacs/ecb/ChangeLog
+++ b/app-emacs/ecb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/ecb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.49 2012/05/01 14:41:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.50 2012/06/13 19:48:14 ulm Exp $
+
+*ecb-2.40-r2 (13 Jun 2012)
+
+  13 Jun 2012; Ulrich Müller <ulm@gentoo.org> +ecb-2.40-r2.ebuild,
+  +files/ecb-2.40-emacs-24.patch:
+  Make it work with Emacs 24, bug 420237. Change EAPI to 4.
 
   01 May 2012; Ulrich Müller <ulm@gentoo.org> ecb-2.40-r1.ebuild,
   +files/ecb-2.40-cedet-version.patch:
diff --git a/app-emacs/ecb/ecb-2.40-r2.ebuild b/app-emacs/ecb/ecb-2.40-r2.ebuild
new file mode 100644
index 000000000000..70a90b28b101
--- /dev/null
+++ b/app-emacs/ecb/ecb-2.40-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r2.ebuild,v 1.1 2012/06/13 19:48:14 ulm Exp $
+
+EAPI=4
+
+inherit elisp eutils
+
+DESCRIPTION="Source code browser for Emacs"
+HOMEPAGE="http://ecb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ecb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java"
+
+DEPEND=">=app-emacs/cedet-1.0_pre6
+	java? ( app-emacs/jde )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
+	epatch "${FILESDIR}/${P}-cedet-version.patch"
+	epatch "${FILESDIR}/${P}-emacs-24.patch"
+	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
+}
+
+src_compile() {
+	local loadpath="" sl=${EPREFIX}${SITELISP}
+	if use java; then
+		loadpath="${sl}/elib ${sl}/jde ${sl}/jde/lisp"
+	fi
+
+	emake CEDET="${sl}/cedet" LOADPATH="${loadpath}"
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins -r ecb-images
+
+	doinfo info-help/ecb.info*
+	dohtml html-help/*.html
+	dodoc NEWS README RELEASE_NOTES
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "ECB is now autoloaded in site-gentoo.el. Add the line"
+	elog "  (require 'ecb)"
+	elog "to your ~/.emacs file to enable all features on Emacs startup."
+}
diff --git a/app-emacs/ecb/files/ecb-2.40-emacs-24.patch b/app-emacs/ecb/files/ecb-2.40-emacs-24.patch
new file mode 100644
index 000000000000..08cb5895ed3c
--- /dev/null
+++ b/app-emacs/ecb/files/ecb-2.40-emacs-24.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/420237
+
+--- ecb-2.40-orig/ecb.el
++++ ecb-2.40/ecb.el
+@@ -1312,7 +1312,6 @@
+         (ecb-select-ecb-frame)
+         (ecb-update-directories-buffer))
+ 
+-    (let ((stack-trace-on-error stack-trace-on-error))
+       ;; we activate only if all before-hooks return non nil
+       (when (run-hook-with-args-until-failure 'ecb-before-activate-hook)
+ 
+@@ -1602,7 +1601,7 @@
+           (error
+            (ecb-clean-up-after-activation-failure
+             "Errors during the snapshot of the windows-configuration." err-obj)))
+-        ))))
++        )))
+ 
+ 
+ (defun ecb-deactivate ()