Remove redundant NEED_EMACS assignment. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 22 insertions, 169 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/Manifest b/app-emacs/proofgeneral/Manifest
index eba766753bef..daf76dfc32ae 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -2,26 +2,22 @@
 Hash: SHA256
 
 AUX 50proofgeneral-gentoo.el 68 SHA256 85504cdc0876b745d6989be00b87cc88ffc1dd6dfabff96a3cc3c3d48dfbe898 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca WHIRLPOOL f86e9df144b08f403c71efbd74ba2076e3a25ba05c09253bd8c60046297db04a1e33b67b7d1769109fcb1ce984b25d43f80470defd2573d0c3333193db3ddf54
-AUX proofgeneral-4.1-emacs-24.patch 3180 SHA256 0c12b506ade463617fe2cbfa003b2661ae6e0d1c276c8960c2dac18faa388fda SHA512 5fbb0e32ed10eef4ebdb56eab6aa5795d5393ce9b37524840eebf10952153e2a67f4f9f201464720a7fc55427cf62fe5f4348ad1e08ef8ac395806e41211f5ae WHIRLPOOL 0b573b95ff38814d7d7988d3a93e64453a7c98c0aacd5449385932dba0a03818c8f0e23cf600cfa687c5d0b8cd534cf7388cd8b2b971c3eff5334974f7a8495a
-AUX proofgeneral-4.1-image-load-path.patch 597 SHA256 06026f751b75faad32b49b2b12698ec9b38e746230f6b0ddc11b6993bbbc5a90 SHA512 74f2aec14479655fdebd0eeb0c5d4d3d7545abe4b815c9db20b6b25fd74f1fdced0bd25b20441ef59326bf9ed6f66374ccf63fd1cea3f1758927f4f8a6e59b41 WHIRLPOOL 9ab1c6a39b234af448ae497ad0ae833317bbcd47656df8866ed0b6e5d0f9e1828e692e8f05f6fe1b35df68b6efe9b0184cbee6b3c2772cbc552dedd11c33de7a
 AUX proofgeneral-4.2-bytecomp-warn.patch 1150 SHA256 77eb44c8933b9cf7415a11038635acd5bc11206f56bc73f4dc2a573addaf236e SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f WHIRLPOOL d90eafb04173260e94bc7fcecbfdd28fcf1f791c33942967f0377b3822a9b86b27cd8c98a9b204fdcacb1a40c4614da1f51a7c220f3ce68a914507e5d3422f5b
-DIST ProofGeneral-4.1.tgz 1428499 SHA256 2a264d46b48185cf1a6ebcca958e59171ea670fb0fc82ba46b8e1d6918ea7dc7 SHA512 f9bb7ef270b5c793f58441db9287b5018176d8d9d91cc9a2a975c1f0d7a450f1c150d21df16f982738f3562c74d5ae05d61fed5b1c1d6a3eb26cab0131d64696 WHIRLPOOL 02a4f2adc4dc39a19b6a4a46e0e2fb8a80e4340f38470c842425b63ee4c946e8f9b91d51eaafbcce01dc39e81009ebf6e327c1faf294249bf7b32a387444d4e8
 DIST ProofGeneral-4.2.tgz 1613190 SHA256 3567b68077798396ccd55c501b7ea7bd2c4d6300e4c74ff609dc19837d050b27 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab WHIRLPOOL 9c4e54cf3b1528ee6cbdfac19b0c589f0c2640defbac15d5aaf0a1bfd64680bff45d2faa17f669210f47f30debb768d593590d350acac9c2669d24dc109bb4d8
-EBUILD proofgeneral-4.1.ebuild 1555 SHA256 879cb007ef8fd95b3187748dfd7d9e7e16fa9442d9dbf5d7ca0ce683cd3858cc SHA512 481e8bc8dbed97f7d6e04317c49cdecdf4993715d4a882f47db4c9ee3834ad3ee7f632eef2255b9658d08a3d10f4f0fcbf29984ad3096ea5e0614f7734a7c67e WHIRLPOOL 20758ae9516a25bfaed551486e6e3301e4bb2e8bd2fb369a7640c8e45cde78c0c160dbb4a0ba9714e03f1712d086f186b1ec3df54541d20ce014c84c82bec2c3
-EBUILD proofgeneral-4.2.ebuild 1532 SHA256 72d162a37c0286a3e22787f840aeff674c6c70313cd8476bfa22c219dd2e88b8 SHA512 731df0bccbf49d38d9b524be5ce04a8c7e64637a92a8bc76ba885744ac0f93462aae13f798be3c2579dbb1421017131f4518ce201d8cf125a7ae654f121f2acf WHIRLPOOL 53364355273a2576eb658073bc234e6045f0ff13ea1e720e781ee66ce7e2ab2031181286ab8d5d7b763c63c60248287483505e14143cc6a80c4c5259c9aef9e1
-MISC ChangeLog 6065 SHA256 f1896fa65b9dda44d62ebf8a5c266382bed4b3ece67d00c7e11a2653aa87d63e SHA512 0f75a4ce6f83a81658854654a22e4e3c0265c14fd938838211441032908ac2b15049487cfe556865e350ce100182375c73100749c6fb272e3291632aaa976750 WHIRLPOOL 68b0ff5c74cdc4b10e454edf4a86bdcd20409cf7c65163f3c5e18552a5e44b241ed929575c73be9e16f2b6ade57ceaaa207170f126d5edec9cadba41a02e78cf
+EBUILD proofgeneral-4.2.ebuild 1503 SHA256 e3b7b6610704b05163a00d3661b9e06ae9b9cc971abf3ac95db65b79719c07b5 SHA512 ae2202b741ec1dde78713797dde7a6d9687ece86143c806f7e7ace52dad0b148110a103a1e4fcc343423762f1d48e0a7038fe92f97661cb8952fc7033704fa38 WHIRLPOOL 535becc2e3033a13d416ea7c217a474059795e287baedf8dbdb6a5d04aa40c792d173bdf9a67e47b58f730ec2f9f93531fce2053057b2d23643b61b5587a2844
+MISC ChangeLog 6309 SHA256 422ddfa3430025eb510c1a6a874dfb4e491bfca7936378d3a35eb77f7e73b21c SHA512 ccc5024dee23476bf4f3da22b74909aac0ff0079cefd912ab47ad83583071231412cd79893a0198a4dd5c4b768b836200999b556aac306bfa0a264b0750da9c9 WHIRLPOOL fd058ad6b280b572ed317c2f291246666e0be99b2c7efb2b15f7be843d245c2d5b2bafbdf6765d86ef4d5b287941acb7d9ee47c135bf6fbca5b1a5d56750a6f2
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJS/rl3AAoJEJQzkH1pP7W4RwEL/2RpkNAswZ3ahCg8UVoc04c2
-evkXwB4knH9f5hxgF6xXad/EcE5aJqlYDvgWkkyjTvmYkCG/+Zd2kDVJDIGhFK7Y
-6CM2IzV9MiWOwFH2tU/o5YUUsHOsRaMIjf1Wk4DO6DsvJnqe6pQUlidKJJdHW8b2
-vlh9Y9XvPw78qRriQWeOXtPwqWYVrDsHBQabTpu5pU0ECoKmqfaB4g2XV+2hWVZd
-l5C4VOsEJTsHImnTiM+OVpgs+Ru1030OYjYoTXv3OrkHuR5iwVVh1P3ZfqDhOCKL
-LAhYriW261BWIBGs4fI0ImqEpKolrd1GRMR8hIEH1f6eoxMQBzWc3hHvIawpz5Qg
-LajHz0IopOxG/upsFN2TWfEOmfgHJLBPlTiRyn4KZMF1fZgYZ2eTKmgw/1dQc/4o
-fu8znxNUEKXBOF3bBtTYhaSVNDywRMAq5xBi1dJi4KReF8jd23C+ktCdpEtMnMAG
-ImmouYtwR9KNk7TjMVcDva8QRjJWDS5Wv0ifrhv0Qg==
-=Hx5d
+iQGcBAEBCAAGBQJTkvpkAAoJEJQzkH1pP7W4rDoL/1Aw0MVvdLAhPqHxTXGYMnez
+ez7/+DIz/LtgQyV03xc5FB+plvbIycBzEh7oqrXT0rz7moJSbaS/90g/g7XuqWrJ
+1VBjSMqZmedF6YMCSvzfuyqW9LakDNWI3omco89rFcqnT+LYsgan9/4CcZQzY9OK
+0JYT29lM0X9OwdT8HBj60enwax3a0WjdHA0iVxXdag+w+QDImLXY6lz2zFmObTaT
+jPKLHeWEDlWezAMSnA3qqlZLuJn7i67Nsnd1f0lNb4huIxs1PQG2A+4T1JxP0QX0
+wEY1M/sKqGHnhDOgW59VvUHRjv40UUd9cBz/YJMk9O82XLi+84D7dsjm6u79Xui7
+TZ9TKd9TnPpCbuSlKdqQikSiwjjjGke+rpWry6NyqKuphW/Muf/Gt1cNANK+B7iL
+a87wJ0NtUoHc51wAOfnLfLXJ/S/qNJfD2xqhk+tjHLTXKpJjsEoFjnuChjTrgbqu
+VwPn79EYh2StroENT+Jd3SWcIVw5pp9kWyNypLe+/Q==
+=KOI0
 -----END PGP SIGNATURE-----
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