From b9a2eba0cdc70f9c974293099d1087bbc44fba84 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 1 May 2012 14:41:51 +0000 Subject: Disable check for CEDET version, bug 414109. Package-Manager: portage-2.1.10.57/cvs/Linux x86_64 --- app-emacs/ecb/ChangeLog | 8 ++++++-- app-emacs/ecb/Manifest | 23 +++++++++++++++++------ app-emacs/ecb/ecb-2.40-r1.ebuild | 5 +++-- app-emacs/ecb/files/ecb-2.40-cedet-version.patch | 11 +++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 app-emacs/ecb/files/ecb-2.40-cedet-version.patch (limited to 'app-emacs') 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 ecb-2.40-r1.ebuild, + +files/ecb-2.40-cedet-version.patch: + Disable check for CEDET version, bug 414109. 23 May 2010; Ulrich Mueller -ecb-2.40.ebuild: Remove old. diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest index dd1056366e51..fed1929ac23d 100644 --- a/app-emacs/ecb/Manifest +++ b/app-emacs/ecb/Manifest @@ -3,14 +3,25 @@ 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 DIST ecb-2.40.tar.gz 986581 RMD160 f0ccbbb4f8303f2557ce32c93a65de12226116b9 SHA1 9d790b10572711cbcd032b306dfa2245950835f0 SHA256 5a6609699b844b535cc26fac1d6740ffeeb07d9895e8eb8214d3dbe77a34e53e -EBUILD ecb-2.40-r1.ebuild 1315 RMD160 952febc628fb1af1fa3b1c818edd55259bcc48ca SHA1 3b33667685f9d741a1a6f71b3c8cedcf2ed9d20d SHA256 8d16094859faec7c8d5d0ca35602b255c246f3b285f60eb8e2c96036e71952e6 -MISC ChangeLog 6755 RMD160 ef5019bfd2b4aec97e9d840437ade1cb7c378b98 SHA1 e1db2bd269695404b66548e041e97cc834f3dcca SHA256 0439c8eafa479e6eadd61b2d520127e34f39f6e0bf5564cd30086c5fcf243fdc +EBUILD ecb-2.40-r1.ebuild 1360 RMD160 a62076ac9c3dd1ea27b75dcd0243c4beebb3de87 SHA1 05e7aa5494b079a55f8863e38d3db057b4ce6c93 SHA256 b06a3981473e030580c79769718c6a2cc7c18a05d5e279a79e1353fc4f28670f +MISC ChangeLog 6909 RMD160 cf88271b97e6166804b0757aeca687a1c02ee567 SHA1 419955050ad37897c031d09fcb7d21f84d69aa7a SHA256 51d2c78162af046951831c351b76ffd960faf22764a47b7b4982a1069cb5497e MISC metadata.xml 1398 RMD160 4ce4e7da48f41a12e98863b9b268bd928ec30796 SHA1 d5d6f39386ce38918e2712778b8ebdb0af625321 SHA256 033a796a647a5c7163b85e00819fb927b4f6b3d2eb4195f43c9e16f69ed17a31 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEUEARECAAYFAkv5iAMACgkQOeoy/oIi7uzXlACfdJ8IRJ8R/YcnPXaZc1Zj1zog -wNAAmOsINL0AO/OXtkj9PrOUh9T3aW8= -=ABYG +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 -----END PGP SIGNATURE----- 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 : 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) + -- cgit v1.2.3-65-gdbad