Remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 5 insertions, 460 deletions

diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 955c876c44cb..d6c485cb4277 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/cedet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.70 2012/01/14 18:34:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.71 2012/01/15 20:49:02 ulm Exp $
+
+  15 Jan 2012; Ulrich Müller <ulm@gentoo.org> -cedet-1.0-r1.ebuild,
+  -files/cedet-1.0-ede_security_fix.patch:
+  Remove old.
 
   14 Jan 2012; Raúl Porcel <armin76@gentoo.org> cedet-1.0.ebuild,
   cedet-1.0-r1.ebuild, cedet-1.0.1.ebuild:
diff --git a/app-emacs/cedet/cedet-1.0-r1.ebuild b/app-emacs/cedet/cedet-1.0-r1.ebuild
deleted file mode 100644
index 190565e2ee32..000000000000
--- a/app-emacs/cedet/cedet-1.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0-r1.ebuild,v 1.3 2012/01/14 18:34:22 armin76 Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp
-
-MY_P=${P/_}
-DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
-HOMEPAGE="http://cedet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-ede_security_fix.patch"
-SITEFILE="50${PN}-gentoo.el"
-EMACSFLAGS="${EMACSFLAGS} -L ${S}/eieio -L ${S}/semantic -L ${S}/srecode \
-	-L ${S}/ede -L ${S}/speedbar -L ${S}/cogre"
-
-src_compile() {
-	emake -j1 \
-		EMACS="${EMACS}" \
-		EMACSFLAGS="${EMACSFLAGS}"
-}
-
-src_test() {
-	emake -j1 \
-		EMACS="${EMACS}" \
-		EMACSFLAGS="${EMACSFLAGS}" \
-		utest
-}
-
-src_install() {
-	local target file dir
-	find . -type d -name tests -prune -o -type f -print | while read target
-	do
-		file=${target##*/}
-		dir=${target%/*}; dir=${dir#./}
-		case "${file}" in
-			*~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST \
-				| Project.ede | USING_CEDET_FROM_CVS | grammar-fw-ov.txt)
-				;;
-			ChangeLog | README | AUTHORS | *NEWS | INSTALL \
-				| renamelist.txt | semanticdb.sh)
-				docinto "${dir}"
-				dodoc "${target}" ;;
-			*.el | *.by | *.wy)
-				# install grammar sources along with the elisp files, since
-				# the location where semantic expects them is not configurable
-				insinto "${SITELISP}/${PN}/${dir}"
-				doins "${target}" ;;
-			*.elc)
-				# we are in a subshell, so collecting in a variable won't work
-				echo "${target}" >>"${T}/elc-list.txt" ;;
-			*.srt | *.xpm)
-				insinto "${SITEETC}/${PN}/${dir}"
-				doins "${target}" ;;
-			*.info* | grammar-fw-ov.png)
-				doinfo "${target}" ;;
-			*)
-				die "Unrecognised file ${target}" ;;
-		esac
-	done
-
-	# make sure that the compiled elisp files have a later time stamp than
-	# the corresponding sources, in order to suppress warnings at run time
-	while read target; do
-		dir=${target%/*}; dir=${dir#./}
-		insinto "${SITELISP}/${PN}/${dir}"
-		doins "${target}"
-	done <"${T}/elc-list.txt"
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
diff --git a/app-emacs/cedet/files/cedet-1.0-ede_security_fix.patch b/app-emacs/cedet/files/cedet-1.0-ede_security_fix.patch
deleted file mode 100644
index 8bf5632de585..000000000000
--- a/app-emacs/cedet/files/cedet-1.0-ede_security_fix.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00387.html
-https://bugs.gentoo.org/398227
-
---- cedet-1.0-orig/ede/ede-auto.el
-+++ cedet-1.0/ede/ede-auto.el
-@@ -57,6 +57,13 @@
- 	  :initform t
- 	  :documentation
- 	  "Non-nil if this is an option when a user creates a project.")
-+   (safe-p :initarg :safe-p
-+	   :initform t
-+	   :documentation
-+	   "Non-nil if the project load files are \"safe\".
-+An unsafe project is one that loads project variables via Emacs
-+Lisp code.  A safe project is one that loads project variables by
-+scanning files without loading Lisp code from them.")
-    )
-   "Class representing minimal knowledge set to run preliminary EDE functions.
- When more advanced functionality is needed from a project type, that projects
-@@ -68,13 +75,15 @@
- 			 :name "Make" :file 'ede-proj
- 			 :proj-file "Project.ede"
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "edeproject-automake"
- 			 :name "Automake" :file 'ede-proj
- 			 :proj-file "Project.ede"
- 			 :initializers '(:makefile-type Makefile.am)
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "automake"
- 			 :name "automake" :file 'project-am
- 			 :proj-file "Makefile.am"
-@@ -84,6 +93,8 @@
-    )
-   "List of vectors defining how to determine what type of projects exist.")
- 
-+(put 'ede-project-class-files 'risky-local-variable t)
-+
- ;;; EDE project-autoload methods
- ;;
- (defmethod ede-project-root ((this ede-project-autoload))
-@@ -122,6 +133,19 @@
-     (when (and f (file-exists-p f))
-       f)))
- 
-+(defmethod ede-auto-load-project ((this ede-project-autoload) dir)
-+  "Load in the project associated with THIS project autoload description.
-+THIS project description should be valid for DIR, where the project will
-+be loaded."
-+  ;; Last line of defense: don't load unsafe projects.
-+  (when (not (or (oref this :safe-p)
-+		 (ede-directory-safe-p dir)))
-+    (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
-+  ;; Things are good - so load the project.
-+  (let ((o (funcall (oref this load-type) dir)))
-+    (when (not o)
-+      (error "Project type error: :load-type failed to create a project"))
-+    (ede-add-project-to-global-list o)))
- 
- (provide 'ede-auto)
- 
---- cedet-1.0-orig/ede/ede-simple.el
-+++ cedet-1.0/ede/ede-simple.el
-@@ -51,7 +51,8 @@
- 	      :name "Simple" :file 'ede-simple
- 	      :proj-file 'ede-simple-projectfile-for-dir
- 	      :load-type 'ede-simple-load
--	      :class-sym 'ede-simple-project)
-+	      :class-sym 'ede-simple-project
-+	      :safe-p nil)
- 	     t)
- 
- (defcustom ede-simple-save-directory "~/.ede"
---- cedet-1.0-orig/ede/ede.el
-+++ cedet-1.0/ede/ede.el
-@@ -81,6 +81,42 @@
- (require 'ede-auto)
- (require 'ede-base)
- 
-+(defcustom ede-project-directories nil
-+  "Directories in which EDE may search for project files.
-+If the value is t, EDE may search in any directory.
-+
-+If the value is a function, EDE calls that function with one
-+argument, the directory name; the function should return t iff
-+EDE should look for project files in the directory.
-+
-+Otherwise, the value should be a list of fully-expanded directory
-+names.  EDE searches for project files only in those directories.
-+If you invoke the commands \\[ede] or \\[ede-new] on a directory
-+that is not listed, Emacs will offer to add it to the list.
-+
-+Any other value disables searching for EDE project files."
-+  :group 'ede
-+  :type '(choice (const :tag "Any directory" t)
-+		 (repeat :tag "List of directories"
-+			 (directory))
-+		 (function :tag "Predicate"))
-+  :version "23.4"
-+  :risky t)
-+
-+(defun ede-directory-safe-p (dir)
-+  "Return non-nil if DIR is a safe directory to load projects from.
-+Projects that do not load a project definition as Emacs Lisp code
-+are safe, and can be loaded automatically.  Other project types,
-+such as those created with Project.ede files, are safe only if
-+specified by `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir)))
-+  ;; Load only if allowed by `ede-project-directories'.
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      (and (listp ede-project-directories)
-+	   (member dir ede-project-directories))))
-+
- 
- ;;; Management variables
- ;;
-@@ -408,24 +444,42 @@
- Sets buffer local variables for EDE."
-   (let* ((ROOT nil)
- 	 (proj (ede-directory-get-open-project default-directory
--					       'ROOT)))
-+					       'ROOT))
-+	 (projauto nil))
-+
-     (when (or proj ROOT
--	      (ede-directory-project-p default-directory t))
-+	      ;; If there is no open project, look up the project
-+	      ;; autoloader to see if we should initialize.
-+	      (setq projauto (ede-directory-project-p default-directory t)))
-+
-+      (when (and (not proj) projauto)
-+
-+	;; No project was loaded, but we have a project description
-+	;; object.  This means that we can check if it is a safe
-+	;; project to load before requesting it to be loaded.
-+
-+	(when (or (oref projauto safe-p)
-+		  ;; The project style is not safe, so check if it is
-+		  ;; in `ede-project-directories'.
-+		  (let ((top (ede-toplevel-project default-directory)))
-+		    (ede-directory-safe-p top)))
-+
-+	  ;; The project is safe, so load it in.
-+	  (setq proj (ede-load-project-file default-directory 'ROOT))))
- 
--      (when (not proj)
--	;; @todo - this could be wasteful.
--	(setq proj (ede-load-project-file default-directory 'ROOT)))
-+      ;; Only initialize EDE state in this buffer if we found a project.
-+      (when proj
- 
--      (setq ede-object (ede-buffer-object (current-buffer)
-+	(setq ede-object (ede-buffer-object (current-buffer)
- 					  'ede-object-project))
- 
--      (setq ede-object-root-project
--	    (or ROOT (ede-project-root ede-object-project)))
-+	(setq ede-object-root-project
-+	      (or ROOT (ede-project-root ede-object-project)))
- 
--      (if (and (not ede-object) ede-object-project)
--	  (ede-auto-add-to-target))
-+	(if (and (not ede-object) ede-object-project)
-+	    (ede-auto-add-to-target))
- 
--      (ede-apply-target-options))))
-+	(ede-apply-target-options)))))
- 
- (defun ede-reset-all-buffers (onoff)
-   "Reset all the buffers due to change in EDE.
-@@ -534,13 +588,73 @@
- 
- ;;; Interactive method invocations
- ;;
--(defun ede (file)
--  "Start up EDE on something.
--Argument FILE is the file or directory to load a project from."
--  (interactive "fProject File: ")
--  (if (not (file-exists-p file))
--      (ede-new file)
--    (ede-load-project-file (file-name-directory file))))
-+(defun ede (dir)
-+  "Start up EDE for directory DIR.
-+If DIR has an existing project file, load it.
-+Otherwise, create a new project for DIR."
-+  (interactive
-+   ;; When choosing a directory to turn on, and we see some directory here,
-+   ;; provide that as the default.
-+   (let* ((top (ede-toplevel-project default-directory))
-+	  (promptdflt (or top default-directory)))
-+     (list (read-directory-name "Project directory: "
-+				promptdflt promptdflt t))))
-+  (unless (file-directory-p dir)
-+    (error "%s is not a directory" dir))
-+  (when (ede-directory-get-open-project dir)
-+    (error "%s already has an open project associated with it" dir))
-+
-+  ;; Check if the directory has been added to the list of safe
-+  ;; directories.  It can also add the directory to the safe list if
-+  ;; the user chooses.
-+  (if (ede-check-project-directory dir)
-+      (progn
-+	;; If there is a project in DIR, load it, otherwise do
-+	;; nothing.
-+	(ede-load-project-file dir)
-+
-+	;; Check if we loaded anything on the previous line.
-+	(if (ede-current-project dir)
-+
-+	    ;; We successfully opened an existing project.  Some open
-+	    ;; buffers may also be referring to this project.
-+	    ;; Resetting all the buffers will get them to also point
-+	    ;; at this new open project.
-+	    (ede-reset-all-buffers 1)
-+
-+	  ;; ELSE
-+	  ;; There was no project, so switch to `ede-new' which is how
-+	  ;; a user can select a new kind of project to create.
-+	  (let ((default-directory (expand-file-name dir)))
-+	    (call-interactively 'ede-new))))
-+
-+    ;; If the proposed directory isn't safe, then say so.
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   dir)))
-+
-+(defun ede-check-project-directory (dir)
-+  "Check if DIR should be in `ede-project-directories'.
-+If it is not, try asking the user if it should be added; if so,
-+add it and save `ede-project-directories' via Customize.
-+Return nil iff DIR should not be in `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing /
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      ;; If `ede-project-directories' is a list, maybe add it.
-+      (when (listp ede-project-directories)
-+	(or (member dir ede-project-directories)
-+	    (when (y-or-n-p (format "`%s' is not listed in `ede-project-directories'.
-+Add it to the list of allowed project directories? "
-+				    dir))
-+	      (push dir ede-project-directories)
-+	      ;; If possible, save `ede-project-directories'.
-+	      (if (or custom-file user-init-file)
-+		  (let ((coding-system-for-read nil))
-+		    (customize-save-variable
-+		     'ede-project-directories
-+		     ede-project-directories)))
-+	      t)))))
- 
- (defun ede-new (type &optional name)
-   "Create a new project starting of project type TYPE.
-@@ -574,6 +688,11 @@
-     (error "Cannot create project in non-existent directory %s" default-directory))
-   (when (not (file-writable-p default-directory))
-     (error "No write permissions for %s" default-directory))
-+  (unless (ede-check-project-directory default-directory)
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   default-directory))
-+  ;; Make sure the project directory is loadable in the future.
-+  (ede-check-project-directory default-directory)
-   ;; Create the project
-   (let* ((obj (object-assoc type 'name ede-project-class-files))
- 	 (nobj (let ((f (oref obj file))
-@@ -607,6 +726,10 @@
- 	(ede-add-subproject pp nobj)
- 	(ede-commit-project pp)))
-     (ede-commit-project nobj))
-+  ;; Once the project is created, load it again.  This used to happen
-+  ;; lazily, but with project loading occurring less often and with
-+  ;; security in mind, this is now the safe time to reload.
-+  (ede-load-project-file default-directory)
-   ;; Have the menu appear
-   (setq ede-minor-mode t)
-   ;; Allert the user
-@@ -629,11 +752,16 @@
- (defun ede-rescan-toplevel ()
-   "Rescan all project files."
-   (interactive)
--  (let ((toppath (ede-toplevel-project default-directory))
--	(ede-deep-rescan t))
--    (project-rescan (ede-load-project-file toppath))
--    (ede-reset-all-buffers 1)
--    ))
-+  (if (not (ede-directory-get-open-project default-directory))
-+      ;; This directory isn't open.  Can't rescan.
-+      (error "Attempt to rescan a project that isn't open")
-+
-+    ;; Continue
-+    (let ((toppath (ede-toplevel-project default-directory))
-+	  (ede-deep-rescan t))
-+
-+      (project-rescan (ede-load-project-file toppath))
-+      (ede-reset-all-buffers 1))))
- 
- (defun ede-new-target (&rest args)
-   "Create a new target specific to this type of project file.
-@@ -877,7 +1005,7 @@
-   ;; Do the load
-   ;;(message "EDE LOAD : %S" file)
-   (let* ((file dir)
--	 (path (expand-file-name (file-name-directory file)))
-+	 (path (file-name-as-directory (expand-file-name dir)))
- 	 (pfc (ede-directory-project-p path))
- 	 (toppath nil)
- 	 (o nil))
-@@ -906,13 +1034,11 @@
-       ;; See if its been loaded before
-       (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
- 			    ede-projects))
--      (if (not o)
--	  ;; If not, get it now.
--	  (let ((ede-constructing pfc))
--	    (setq o (funcall (oref pfc load-type) toppath))
--	    (when (not o)
--	      (error "Project type error: :load-type failed to create a project"))
--	    (ede-add-project-to-global-list o)))
-+
-+      ;; If not open yet, load it.
-+      (unless o
-+	(let ((ede-constructing pfc))
-+	  (setq o (ede-auto-load-project pfc toppath))))
- 
-       ;; Return the found root project.
-       (when rootreturn (set rootreturn o))
-@@ -967,13 +1093,7 @@
- 	     (and root
- 		  (ede-find-subproject-for-directory root updir))
- 	     ;; Try the all structure based search.
--	     (ede-directory-get-open-project updir)
--	     ;; Load up the project file as a last resort.
--	     ;; Last resort since it uses file-truename, and other
--	     ;; slow features.
--	     (and (ede-directory-project-p updir)
--		  (ede-load-project-file
--		   (file-name-as-directory updir))))))))))
-+	     (ede-directory-get-open-project updir))))))))
- 
- (defun ede-current-project (&optional dir)
-   "Return the current project file.
-@@ -987,11 +1107,7 @@
-     ;; No current project.
-     (when (not ans)
-       (let* ((ldir (or dir default-directory)))
--	(setq ans (ede-directory-get-open-project ldir))
--	(or ans
--	    ;; No open project, if this dir pass project-p, then load.
--	    (when (ede-directory-project-p ldir)
--	      (setq ans (ede-load-project-file ldir))))))
-+	(setq ans (ede-directory-get-open-project ldir))))
-     ;; Return what we found.
-     ans))
- 
-@@ -1047,12 +1163,13 @@
-   "Return the project which is the parent of TARGET.
- It is recommended you track the project a different way as this function
- could become slow in time."
--  ;; @todo - use ede-object-project as a starting point.
--  (let ((ans nil) (projs ede-projects))
--    (while (and (not ans) projs)
--      (setq ans (ede-target-in-project-p (car projs) target)
--	    projs (cdr projs)))
--    ans))
-+  (or ede-object-project
-+      ;; If not cached, derive it from the current directory of the target.
-+      (let ((ans nil) (projs ede-projects))
-+	(while (and (not ans) projs)
-+	  (setq ans (ede-target-in-project-p (car projs) target)
-+		projs (cdr projs)))
-+	ans)))
- 
- (defmethod ede-find-target ((proj ede-project) buffer)
-   "Fetch the target in PROJ belonging to BUFFER or nil."