Remove redundant NEED_EMACS assignment. Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

5 files changed, 9 insertions, 152 deletions

diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog
index 68718f0d66e4..16f89031b429 100644
--- a/app-emacs/proofgeneral/ChangeLog
+++ b/app-emacs/proofgeneral/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/proofgeneral
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.42 2014/02/15 00:48:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.43 2014/06/07 11:40:21 ulm Exp $
+
+  07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -proofgeneral-4.1.ebuild,
+  proofgeneral-4.2.ebuild, -files/proofgeneral-4.1-emacs-24.patch,
+  -files/proofgeneral-4.1-image-load-path.patch:
+  Remove redundant NEED_EMACS assignment. Remove old.
 
   15 Feb 2014; Ulrich Müller <ulm@gentoo.org> -proofgeneral-3.7.1.ebuild:
   Remove old.
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.1-emacs-24.patch b/app-emacs/proofgeneral/files/proofgeneral-4.1-emacs-24.patch
deleted file mode 100644
index 2a9571afa469..000000000000
--- a/app-emacs/proofgeneral/files/proofgeneral-4.1-emacs-24.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://bugs.gentoo.org/386465
-
---- a/generic/proof-menu.el
-+++ b/generic/proof-menu.el
-@@ -49,7 +49,7 @@ without adjusting window layout.&quot;
-   ;; trace buffer, etc.  (Makes less sense from the menu, though,
-   ;; where it seems more natural just to rotate from last position)
-   (cond
--   ((and (interactive-p)
-+   ((and (called-interactively-p 'any)
- 	 (eq last-command 'proof-display-some-buffers))
-     (incf proof-display-some-buffers-count))
-    (t
---- a/generic/proof-script.el
-+++ b/generic/proof-script.el
-@@ -431,13 +431,13 @@ Point must be after the locked region or this will signal an error.&quot;
- If called interactively or SWITCH is non-nil, switch to script buffer.
- If called interactively, a mark is set at the current location with `push-mark'&quot;
-   (interactive)
--  (if (and proof-script-buffer (interactive-p))
-+  (if (and proof-script-buffer (called-interactively-p 'any))
-       (push-mark))
-   (proof-with-script-buffer
-    (if ;; there is an active scripting buffer and it's not displayed
-        (and proof-script-buffer
- 	    (not (get-buffer-window proof-script-buffer))
--	    (or switch (interactive-p)))
-+	    (or switch (called-interactively-p 'any)))
-        ;; display it
-        (switch-to-buffer proof-script-buffer))
-    (goto-char (proof-unprocessed-begin))))
-@@ -1260,7 +1260,7 @@ activation is considered to have failed and an error is given.&quot;
-       ;; immediately because scripting has been turned on now.
-       (if proof-activate-scripting-hook
- 	  (let
--	      ((activated-interactively	(interactive-p)))
-+	      ((activated-interactively	(called-interactively-p 'any)))
- 	    (setq proof-shell-last-output-kind nil)
- 	    (run-hooks 'proof-activate-scripting-hook)
- 	    ;; If activate scripting functions caused an error,
---- a/generic/proof-splash.el
-+++ b/generic/proof-splash.el
-@@ -287,7 +287,7 @@ binding to remove this buffer.&quot;
- 	(progn
- 	  ;; disable ordinary emacs splash
- 	  (setq inhibit-startup-message t)
--	  (proof-splash-display-screen (not (interactive-p))))
-+	  (proof-splash-display-screen (not (called-interactively-p 'any))))
-       ;; Otherwise, a message
-       (message &quot;Welcome to %s Proof General!&quot; proof-assistant))
-     (setq proof-splash-seen t)))
---- a/isar/isabelle-system.el
-+++ b/isar/isabelle-system.el
-@@ -292,7 +292,7 @@ for you, you should disable this behaviour.&quot;
-   &quot;Refresh isabelle-logics-menu-entries, returning new entries.&quot;
-   (interactive)
-   (if (and isabelle-refresh-logics
--	   (or isabelle-time-to-refresh-logics (interactive-p)))
-+	   (or isabelle-time-to-refresh-logics (called-interactively-p 'any)))
-       (progn
- 	(setq isabelle-logics-available (isa-tool-list-logics))
- 	(isabelle-logics-menu-calculate)
---- a/lib/scomint.el
-+++ b/lib/scomint.el
-@@ -251,7 +251,7 @@ NO-NEWLINE is non-nil.&quot;
-     (save-excursion
-       (condition-case nil
- 	  (goto-char
--	   (if (interactive-p) scomint-last-input-end scomint-last-output-start))
-+	   (if (called-interactively-p 'any) scomint-last-input-end scomint-last-output-start))
- 	(error nil))
-       (while (re-search-forward &quot;\r+$&quot; pmark t)
- 	(replace-match &quot;&quot; t t)))))
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch b/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch
deleted file mode 100644
index 238c022de08c..000000000000
--- a/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/426646
-
---- ProofGeneral-orig/generic/proof-toolbar.el
-+++ ProofGeneral/generic/proof-toolbar.el
-@@ -103,7 +103,8 @@
-   (when (proof-toolbar-available-p)
-     (unless proof-toolbar-map
-       (setq proof-toolbar-map (make-sparse-keymap))
--      (add-to-list 'image-load-path proof-images-directory) ; rude?
-+      (if (boundp 'image-load-path)
-+	  (add-to-list 'image-load-path proof-images-directory)) ; rude?
-       (mapc 'proof-toolbar-make-icon (proof-ass toolbar-entries))
-       (proof-toolbar-make-toolbar-items proof-toolbar-map
- 					(proof-ass toolbar-entries)))
diff --git a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild b/app-emacs/proofgeneral/proofgeneral-4.1.ebuild
deleted file mode 100644
index a49b6752dcd4..000000000000
--- a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild
+++ /dev/null
@@ -1,59 +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/proofgeneral/proofgeneral-4.1.ebuild,v 1.5 2012/07/14 21:14:04 ulm Exp $
-
-EAPI=4
-NEED_EMACS=23
-
-inherit elisp
-
-MY_PN="ProofGeneral"
-DESCRIPTION="A generic interface for proof assistants"
-HOMEPAGE="http://proofgeneral.inf.ed.ac.uk/"
-SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-ELISP_PATCHES="${P}-emacs-24.patch
-	${P}-image-load-path.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
-}
-
-src_compile() {
-	# remove precompiled lisp files
-	emake clean
-	emake -j1 compile EMACS=emacs
-}
-
-src_install() {
-	emake -j1 install EMACS=emacs PREFIX="${D}"/usr
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die
-
-	doinfo doc/*.info*
-	doman doc/proofgeneral.1
-	dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html
-	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER
-
-	# clean up
-	rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d"
-	rm -rf "${D}/usr/share/application-registry"
-	rm -rf "${D}/usr/share/mime-info"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please register your use of Proof General on the web at:"
-	elog "  http://proofgeneral.inf.ed.ac.uk/register "
-	elog "(see the REGISTER file for more information)"
-}
diff --git a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
index a2f63e1360af..8fc0eb41d88c 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.2.ebuild,v 1.4 2013/12/24 12:45:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.2.ebuild,v 1.5 2014/06/07 11:40:21 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -15,7 +14,6 @@ SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
 RDEPEND="${DEPEND}"
@@ -37,7 +35,7 @@ src_compile() {
 
 src_install() {
 	emake -j1 install EMACS=emacs PREFIX="${D}"/usr
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN}
 
 	doinfo doc/*.info*
 	doman doc/proofgeneral.1