Fix EIEIO test script for compile time fix; Resolves Bug #124598.

(Portage version: 2.1_pre10-r5)

5 files changed, 96 insertions, 2 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 1cb1040944a9..35d09afd246d 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/cedet
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.10 2005/09/06 05:30:54 mkennedy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.11 2006/05/15 16:38:03 mkennedy Exp $
+
+*cedet-1.0_pre3-r1 (15 May 2006)
+
+  15 May 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.0_pre3-eieio-tests-gentoo.patch, +cedet-1.0_pre3-r1.ebuild:
+  Fix EIEIO test script for compile time fix; Resolves Bug #124598.
 
   06 Sep 2005; Matthew Kennedy <mkennedy@gentoo.org> cedet-1.0_pre3.ebuild:
   Install missing sb-info.el; Rework ebuild not to use GNU specific tar options.
diff --git a/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild b/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild
new file mode 100644
index 000000000000..0b5441cf4a07
--- /dev/null
+++ b/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre3-r1.ebuild,v 1.1 2006/05/15 16:38:03 mkennedy Exp $
+
+inherit elisp eutils
+
+MY_PV=${PV:0:3}${PV:4:5}
+
+IUSE=""
+DESCRIPTION="CEDET: Collection of Emacs Development Tools"
+HOMEPAGE="http://cedet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cedet/${PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc-macos"
+DEPEND="virtual/emacs
+	!app-emacs/semantic
+	!app-emacs/eieio
+	!app-emacs/speedbar"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SITEFILE="60cedet-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/1.0_pre3-eieio-tests-gentoo.patch # Bug #124598
+}
+
+src_compile() {
+	make EMACS=/usr/bin/emacs || die
+}
+
+src_install() {
+	find ${S} -type f -print \
+		| while read target; do
+			local directory=`dirname $target` file=`basename $target`
+			local sub_directory=`basename $directory`
+			case $file in
+				*~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST | Project.ede)
+					rm -f $file
+					;;
+				ChangeLog | README | AUTHORS | *NEWS | INSTALL)
+					docinto $sub_directory
+					dodoc $target
+					;;
+				*.png)
+					insinto /usr/share/doc/${PF}/$sub_directory
+					doins $target
+					;;
+				IMPLICIT_TARGETS)
+					;;
+				*.el | *.elc)
+					insinto /usr/share/emacs/site-lisp/cedet/$sub_directory
+					doins $target
+					;;
+				*.info*)
+					doinfo $target
+					;;
+				*)
+					insinto /usr/share/emacs/site-lisp/cedet/$sub_directory
+					doins $target
+					echo $target >>${S}/IMPLICIT_TARGETS
+					;;
+			esac
+		done
+	elisp-site-file-install ${FILESDIR}/${SITEFILE}
+}
diff --git a/app-emacs/cedet/files/1.0_pre3-eieio-tests-gentoo.patch b/app-emacs/cedet/files/1.0_pre3-eieio-tests-gentoo.patch
new file mode 100644
index 000000000000..0ccc864216c7
--- /dev/null
+++ b/app-emacs/cedet/files/1.0_pre3-eieio-tests-gentoo.patch
@@ -0,0 +1,15 @@
+diff -ur cedet-1.0pre3.orig/eieio/eieio-tests.el cedet-1.0pre3/eieio/eieio-tests.el
+--- cedet-1.0pre3.orig/eieio/eieio-tests.el	2005-06-29 22:08:02.000000000 -0500
++++ cedet-1.0pre3/eieio/eieio-tests.el	2006-05-15 11:28:22.000000000 -0500
+@@ -469,8 +469,9 @@
+ 
+ ;;; Test function type in a class
+ ;;
+-(defvar class-typep-var 0
+-  "A variable used in an initform.")
++(eval-when-compile
++  (defvar class-typep-var 0
++    "A variable used in an initform."))
+ 
+ (setq class-typep-var 1)
+ 
diff --git a/app-emacs/cedet/files/digest-cedet-1.0_pre3 b/app-emacs/cedet/files/digest-cedet-1.0_pre3
index d15672d6fbb3..ef694f48d6f9 100644
--- a/app-emacs/cedet/files/digest-cedet-1.0_pre3
+++ b/app-emacs/cedet/files/digest-cedet-1.0_pre3
@@ -1 +1,3 @@
 MD5 2932fa2a8ab8fc63402ecb8194ca26b4 cedet-1.0pre3.tar.gz 1357388
+RMD160 5d71c5b966c162f86038e43988c5a890f43ccd2b cedet-1.0pre3.tar.gz 1357388
+SHA256 e62dfd7ce6761ee1df1b5abb17ce0693ecc59dfcc18803f00e1c5ce1f4096c82 cedet-1.0pre3.tar.gz 1357388
diff --git a/app-emacs/cedet/files/digest-cedet-1.0_pre3-r1 b/app-emacs/cedet/files/digest-cedet-1.0_pre3-r1
new file mode 100644
index 000000000000..ef694f48d6f9
--- /dev/null
+++ b/app-emacs/cedet/files/digest-cedet-1.0_pre3-r1
@@ -0,0 +1,3 @@
+MD5 2932fa2a8ab8fc63402ecb8194ca26b4 cedet-1.0pre3.tar.gz 1357388
+RMD160 5d71c5b966c162f86038e43988c5a890f43ccd2b cedet-1.0pre3.tar.gz 1357388
+SHA256 e62dfd7ce6761ee1df1b5abb17ce0693ecc59dfcc18803f00e1c5ce1f4096c82 cedet-1.0pre3.tar.gz 1357388