Does not work with app-editors/emacs-cvs; Resolves Bug #138047.

Package-Manager: portage-2.1.1_pre4-r4

6 files changed, 22 insertions, 10 deletions

diff --git a/app-emacs/ilisp-cvs/ChangeLog b/app-emacs/ilisp-cvs/ChangeLog
index d22b762994e9..2c5df707b1bb 100644
--- a/app-emacs/ilisp-cvs/ChangeLog
+++ b/app-emacs/ilisp-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/ilisp-cvs
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp-cvs/ChangeLog,v 1.3 2005/01/01 13:50:03 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp-cvs/ChangeLog,v 1.4 2006/08/09 05:03:00 mkennedy Exp $
+
+  09 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  ilisp-cvs-5.12.0.ebuild:
+  Does not work with app-editors/emacs-cvs; Resolves Bug #138047.
 
 *ilisp-cvs-5.12.0 (07 Jan 2004)
 
diff --git a/app-emacs/ilisp-cvs/files/digest-ilisp-cvs-5.12.0 b/app-emacs/ilisp-cvs/files/digest-ilisp-cvs-5.12.0
index e69de29bb2d1..8b137891791f 100644
--- a/app-emacs/ilisp-cvs/files/digest-ilisp-cvs-5.12.0
+++ b/app-emacs/ilisp-cvs/files/digest-ilisp-cvs-5.12.0
@@ -0,0 +1 @@
+
diff --git a/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild b/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild
index eadb16a9f2f7..d6c7a54d4bed 100644
--- a/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild
+++ b/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild,v 1.4 2005/01/01 13:50:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp-cvs/ilisp-cvs-5.12.0.ebuild,v 1.5 2006/08/09 05:03:00 mkennedy Exp $
 
 ECVS_SERVER="cvs-pserver.sourceforge.net:80/cvsroot/ilisp"
 ECVS_MODULE="ILISP"
@@ -19,7 +19,8 @@ IUSE="doc"
 
 DEPEND="virtual/emacs
 	dev-lisp/common-lisp-controller
-	doc? ( virtual/tetex sys-apps/texinfo app-text/texi2html )"
+	doc? ( virtual/tetex sys-apps/texinfo app-text/texi2html )
+	!app-editors/emacs-cvs"
 
 S=${WORKDIR}/ILISP
 
diff --git a/app-emacs/ilisp/ChangeLog b/app-emacs/ilisp/ChangeLog
index 399801872703..9cb2b4b3c410 100644
--- a/app-emacs/ilisp/ChangeLog
+++ b/app-emacs/ilisp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/ilisp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ChangeLog,v 1.13 2005/10/24 14:42:33 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ChangeLog,v 1.14 2006/08/09 05:00:54 mkennedy Exp $
+
+  09 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org> ilisp-5.12.0-r3.ebuild:
+  Does not work with app-editors/emacs-cvs; Resolves Bug #138047.
 
   24 Oct 2005; Joseph Jezak <josejx@gentoo.org> ilisp-5.12.0-r3.ebuild:
   Marked ~ppc.
diff --git a/app-emacs/ilisp/files/digest-ilisp-5.12.0-r3 b/app-emacs/ilisp/files/digest-ilisp-5.12.0-r3
index adc0857dfebe..6567cabd3de6 100644
--- a/app-emacs/ilisp/files/digest-ilisp-5.12.0-r3
+++ b/app-emacs/ilisp/files/digest-ilisp-5.12.0-r3
@@ -1 +1,3 @@
 MD5 ad39242c57f05acf7e45af309efff174 ilisp_5.12.0+cvs.2003.07.20.tar.gz 293728
+RMD160 da0d9e74d7d3a5bda80dfe83f593ec6f41548d8c ilisp_5.12.0+cvs.2003.07.20.tar.gz 293728
+SHA256 84b9c70b297844dcb7170fad7eac463c0f004d7dc4330105d56febe23309f9e0 ilisp_5.12.0+cvs.2003.07.20.tar.gz 293728
diff --git a/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild b/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
index db9d7655e1e9..d580cea91082 100644
--- a/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
+++ b/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild,v 1.11 2005/10/24 14:42:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild,v 1.12 2006/08/09 05:00:54 mkennedy Exp $
 
 inherit elisp
 
@@ -22,7 +22,8 @@ IUSE=""
 DEPEND="dev-lisp/common-lisp-controller
 	sys-apps/texinfo
 	virtual/tetex
-	app-text/texi2html"
+	app-text/texi2html
+	!app-editors/emacs-cvs"
 
 
 S="${WORKDIR}/${P}+${DEBCVS}"