summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-05-01 14:41:51 +0000
committerUlrich Müller <ulm@gentoo.org>2012-05-01 14:41:51 +0000
commit4fa133c6f93443b0a82b071fbe96203fb7b35853 (patch)
treedecfa1b24e62e9bda20afbf8a865c6c30b24eea7 /app-emacs/ecb
parentRemove old. (diff)
downloadgentoo-2-4fa133c6f93443b0a82b071fbe96203fb7b35853.tar.gz
gentoo-2-4fa133c6f93443b0a82b071fbe96203fb7b35853.tar.bz2
gentoo-2-4fa133c6f93443b0a82b071fbe96203fb7b35853.zip
Disable check for CEDET version, bug 414109.
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs/ecb')
-rw-r--r--app-emacs/ecb/ChangeLog8
-rw-r--r--app-emacs/ecb/ecb-2.40-r1.ebuild5
-rw-r--r--app-emacs/ecb/files/ecb-2.40-cedet-version.patch11
3 files changed, 20 insertions, 4 deletions
diff --git a/app-emacs/ecb/ChangeLog b/app-emacs/ecb/ChangeLog
index 3ecc28ac703e..cb4c53e888fd 100644
--- a/app-emacs/ecb/ChangeLog
+++ b/app-emacs/ecb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/ecb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ChangeLog,v 1.48 2010/05/23 19:54:09 ulm Exp $
+# 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 $
+
+ 01 May 2012; Ulrich Müller <ulm@gentoo.org> ecb-2.40-r1.ebuild,
+ +files/ecb-2.40-cedet-version.patch:
+ Disable check for CEDET version, bug 414109.
23 May 2010; Ulrich Mueller <ulm@gentoo.org> -ecb-2.40.ebuild:
Remove old.
diff --git a/app-emacs/ecb/ecb-2.40-r1.ebuild b/app-emacs/ecb/ecb-2.40-r1.ebuild
index 5dc2da688f8f..f8db72ad3951 100644
--- a/app-emacs/ecb/ecb-2.40-r1.ebuild
+++ b/app-emacs/ecb/ecb-2.40-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.4 2010/05/23 18:24:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r1.ebuild,v 1.5 2012/05/01 14:41:51 ulm Exp $
EAPI=3
@@ -23,6 +23,7 @@ SITEFILE="70${PN}-gentoo.el"
src_prepare() {
epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
+ epatch "${FILESDIR}/${P}-cedet-version.patch"
sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
}
diff --git a/app-emacs/ecb/files/ecb-2.40-cedet-version.patch b/app-emacs/ecb/files/ecb-2.40-cedet-version.patch
new file mode 100644
index 000000000000..733384959065
--- /dev/null
+++ b/app-emacs/ecb/files/ecb-2.40-cedet-version.patch
@@ -0,0 +1,11 @@
+--- ecb-2.40-orig/ecb-upgrade.el
++++ ecb-2.40/ecb-upgrade.el
+@@ -1143,7 +1143,7 @@
+
+ ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should set this to pre6
+ (defconst ecb-required-cedet-version-min '(1 0 2 6))
+-(defconst ecb-required-cedet-version-max '(1 0 4 9))
++(defconst ecb-required-cedet-version-max '(1 1 4 0))
+
+ (defvar ecb-all-requirements-available nil)
+