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

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

4 files changed, 100 insertions, 15 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/Manifest b/app-emacs/ecb/Manifest
index fed1929ac23d..bc146b039d6b 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -4,24 +4,26 @@ Hash: SHA1
 AUX 70ecb-gentoo.el 63 RMD160 53655b5e43a62410d9a40dc54678ffe1184e263e SHA1 b21c1b38fc047037601cea8f2b44d3ed8717ede8 SHA256 4a5b9c1b94bc957986079806c1dfd7a52dd99a1f11ec053e7f1c6e3c533c7e46
 AUX ecb-2.32-gentoo.patch 3430 RMD160 cd2fd19d905fc5fc6b55776068f925952cf3e0b4 SHA1 33bd120bfb659a83fbba6aa8f3ed4e64b0f5c6b7 SHA256 cf563365153c543980385fc7dfa5eda0842e48413a260439643cf3b457d8e351
 AUX ecb-2.40-cedet-version.patch 375 RMD160 ef5385997cc62ea897635f08986f2be826f2a61e SHA1 a5abfc8ed03749964b8c284dbbe570a2cb80f606 SHA256 ef4f25ae11460a5033e0eeeddd5d0583b4f656077028908a154b5dca19b35ec7
+AUX ecb-2.40-emacs-24.patch 600 RMD160 ca21e8caad85e683811b7a7013270a3f11286059 SHA1 a42f7a2629f8e4f4d4e92ac1baff19775f0fc04f SHA256 f33edf1317b2befa67c25f6897c934ad13e4ece1d4fdfe7110a2646fc4222620
 DIST ecb-2.40.tar.gz 986581 RMD160 f0ccbbb4f8303f2557ce32c93a65de12226116b9 SHA1 9d790b10572711cbcd032b306dfa2245950835f0 SHA256 5a6609699b844b535cc26fac1d6740ffeeb07d9895e8eb8214d3dbe77a34e53e
 EBUILD ecb-2.40-r1.ebuild 1360 RMD160 a62076ac9c3dd1ea27b75dcd0243c4beebb3de87 SHA1 05e7aa5494b079a55f8863e38d3db057b4ce6c93 SHA256 b06a3981473e030580c79769718c6a2cc7c18a05d5e279a79e1353fc4f28670f
-MISC ChangeLog 6909 RMD160 cf88271b97e6166804b0757aeca687a1c02ee567 SHA1 419955050ad37897c031d09fcb7d21f84d69aa7a SHA256 51d2c78162af046951831c351b76ffd960faf22764a47b7b4982a1069cb5497e
+EBUILD ecb-2.40-r2.ebuild 1355 RMD160 082118a038fdaf5859999fca05214830d082f579 SHA1 dd52364f00098eab0a099e3b0380644505162a1c SHA256 92544b1a9aebe413e846739e06b6fd78fbfc4397b9d43281bdbe3348e6b2bf7a
+MISC ChangeLog 7100 RMD160 4d62eb2e466f086e381664c93e7f6a1e9add8869 SHA1 ed65b30c877b5288a80361f66585e9669a73a6b5 SHA256 d97989838eba3f8dbd2bce954ebaba8148d2fa3cd13ca1830be2a9c479afec09
 MISC metadata.xml 1398 RMD160 4ce4e7da48f41a12e98863b9b268bd928ec30796 SHA1 d5d6f39386ce38918e2712778b8ebdb0af625321 SHA256 033a796a647a5c7163b85e00819fb927b4f6b3d2eb4195f43c9e16f69ed17a31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPn/ccAAoJEDxpGckxwJCBhtoP/1MHIG9+jToRX5jH2hMvZbD6
-FbnWuFoGpWPjE3y1qDG5mhJyhIqSjdkxX6a8B3AVuU6+SufZMjV7VzyyhxeOA8LX
-Js5bzy4olEv1srS/xru3TfnlV6J1ML6f1W5mUNYYZsXpimQqcoJuKLkY7t1sYbJq
-NYlUQPeVuXI7Q+7LQ0+3CH3xa1AD8jpND19wcHr0YnLKmiprx4NRYPgxy+nmemYH
-hs9lVZ+vHmK9cAH0BtkO0bwIsg7gIyiwLtrpuWMP04nnB5xryO6bg7IcjGt6NRn/
-27ueKtYoMv5fObgYiSNQW+kgsKQsP70UF1nIT9lPlbJDGggPgmVIYjjYugvgdApz
-5XtdC+jH4f0FapVFpL5wkgk61c+MxBuIhBxchZZA0wTFEXL09hblvzfBGNrPBtDR
-nNt5xmECTDQ2KydT/p6vhOevIqJVCYDlotOQ67GBBc9eD5TDnhq8HWIR2IC/a7R2
-u5jnAnQz0E4ZA8wI6sp9rcnZYuHEipnayB1sR1xsSCdVWTWkNOyo/s9fTahyRhws
-1WTDojoNmO6pcSvAbf0eSHvRLX2qn7IyvG/vTC7bYQbCF/XN3u01rfjEbLKcfsyF
-lmuo5nbuFWzgFKi7i87VGWSM/WQTIxdwmrFxixt/TDlhI1uAajWniAZSl1mUWLXR
-Iw02MSZroLMat4WSAxzp
-=BFC0
+iQIcBAEBAgAGBQJP2O++AAoJEDxpGckxwJCBQhAP/ipR0BR3GHsz52Bb8JCU3LfD
+d7pHF/cYryKDSASPh1BIKo4Uo/9oHr3zj3Yn9eQ/qYZQ1bH7BA9eLyDplOvj8o5V
+w/HslTGdViKDQNp+7oQEIhKNfOj340ILUBkpUKdUrRu2QTdEY1R6Ua8PbFXHb4tj
+NhGjSkn6pMWzc4tT/OD0qbwunNnZqmBYbR4pc8hqdeLDY0labjT7ZFCOz4P0M/0o
+YFrRTl5usQSAj+SA2VBXLv/FynkZZf13VlFGafKoR/Vge94nnvOtmFWJxJz/W+b8
+VCVDUG2WdHB8YLpbkvVuTKGNb3TqbPoaUysu5MCtbAmzwdg2rrExAQwjK44TCz2S
+6tlG8Kekw+TH1gaEszV+gnlX4oUhReUQUZUSaK/jZY4c0YosUg3diMh7M8JXJJU4
+5n0WzP7BigY0eo/GaeZIZUKsa7v4WvNhVRGbrMU4jv0f7f8CgnBLobe1ot3f53jQ
+EBgqJQIZTKJF/GB0Rwcb1gOLVr9GIPASDv+jaMaehv0qJNou9pwN6mm74bY08SY4
+glWfyad3O7DYCqb1LkZl8rMXSRe/pEQ+WCYQLY9811SlDK3szJunvvWmSYmdQUWV
+ZGxPPfdpwIaUgGxZXrI5wxUosoHImSU7jO2JQv+RCFcDmG3yfJOXaBt8LLMe/wCu
+kW3r7r+uiu1pttAYIrNr
+=78Oc
 -----END PGP SIGNATURE-----
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 ()