clean up

(Portage version: 2.1.6.11/cvs/Linux i686)

5 files changed, 7 insertions, 116 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 17cb5e532f66..95c76f2386bd 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/cedet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.44 2009/04/14 09:52:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.45 2009/06/03 16:18:02 fauli Exp $
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/1.0_pre3-eieio-tests-gentoo.patch,
+  -files/1.0_pre4-semantic-build.patch, -files/60cedet-gentoo.el,
+  -cedet-1.0_pre4-r2.ebuild:
+  clean up
 
   14 Apr 2009; Raúl Porcel <armin76@gentoo.org> cedet-1.0_pre6.ebuild:
   x86 stable wrt #264792
diff --git a/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild b/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild
deleted file mode 100644
index 562c38fa06ca..000000000000
--- a/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0_pre4-r2.ebuild,v 1.8 2009/03/01 15:38:25 ulm Exp $
-
-inherit elisp eutils versionator
-
-MY_PV=$(delete_version_separator 2)
-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 FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-emacs/semantic
-	!app-emacs/eieio
-	!app-emacs/speedbar"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/1.0_pre3-eieio-tests-gentoo.patch" # bug 124598
-	epatch "${FILESDIR}/1.0_pre4-semantic-build.patch" # bugs 183205/191341
-}
-
-src_compile() {
-	emake -j1 EMACS=/usr/bin/emacs || die "emake failed"
-}
-
-src_install() {
-	find "${S}" -type f -print | while read target; do
-		local directory=$(dirname ${target}) file=$(basename ${target})
-		local sub_directory=$(echo ${directory} | sed "s%^${S}/*%%;s/^$/./")
-		case $file in
-			*~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST \
-				| Project.ede | IMPLICIT_TARGETS)
-				;;
-			ChangeLog | README | AUTHORS | *NEWS | INSTALL)
-				docinto ${sub_directory}
-				dodoc ${target}
-				;;
-			*.png)
-				insinto /usr/share/doc/${PF}/${sub_directory}
-				doins ${target}
-				;;
-			*.el | *.elc)
-				insinto ${SITELISP}/${PN}/${sub_directory}
-				doins ${target}
-				;;
-			*.info*)
-				doinfo ${target}
-				;;
-			*)
-				insinto ${SITELISP}/${PN}/${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
deleted file mode 100644
index 0ccc864216c7..000000000000
--- a/app-emacs/cedet/files/1.0_pre3-eieio-tests-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/1.0_pre4-semantic-build.patch b/app-emacs/cedet/files/1.0_pre4-semantic-build.patch
deleted file mode 100644
index 45e9de569639..000000000000
--- a/app-emacs/cedet/files/1.0_pre4-semantic-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cedet-1.0pre4/semantic/Makefile~	2007-06-06 04:00:10.000000000 +0200
-+++ cedet-1.0pre4/semantic/Makefile	2007-06-27 00:45:06.000000000 +0200
-@@ -114,7 +114,7 @@
- 	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f batch-byte-compile $^
- 
- .PHONY:wisent
--wisent:
-+wisent: bovinator
- 	cd wisent; $(MAKE)
- 
- .PHONY:Tests
---- cedet-1.0pre4/semantic/document.el~	2007-06-06 04:00:09.000000000 +0200
-+++ cedet-1.0pre4/semantic/document.el	2007-09-07 00:40:24.000000000 +0200
-@@ -41,9 +41,6 @@
- (require 'document-vars)
- 
- ;; XEmacs change: needed to define macros at compile time.
--(condition-case nil
--    (require 'ede)
--  (error nil))
- (require 'semantic)
- (require 'semantic-util)
- 
diff --git a/app-emacs/cedet/files/60cedet-gentoo.el b/app-emacs/cedet/files/60cedet-gentoo.el
deleted file mode 100644
index fb345e79c607..000000000000
--- a/app-emacs/cedet/files/60cedet-gentoo.el
+++ /dev/null
@@ -1,8 +0,0 @@
-
-;;; cedet site-lisp configuration
-
-(load "@SITELISP@/common/cedet" nil t)
-
-;; If you wish to customize CEDET, you will need to follow the
-;; directions in the INSTALL (installed in the documentation) file and
-;; customize your ~/.emacs /before/ site-gentoo is loaded.