Patch elscreen to build with emacs 24, fixes bug 425258

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

5 files changed, 277 insertions, 19 deletions

diff --git a/app-emacs/elscreen/ChangeLog b/app-emacs/elscreen/ChangeLog
index 8460fd5ee781..aee76e79aa88 100644
--- a/app-emacs/elscreen/ChangeLog
+++ b/app-emacs/elscreen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/elscreen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/elscreen/ChangeLog,v 1.24 2009/07/02 17:07:35 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elscreen/ChangeLog,v 1.25 2013/10/03 11:36:26 gienah Exp $
+
+*elscreen-1.4.6-r1 (03 Oct 2013)
+
+  03 Oct 2013; Mark Wright <gienah@gentoo.org> +elscreen-1.4.6-r1.ebuild,
+  +files/elscreen-1.4.6-emacs-24.patch,
+  +files/elscreen-1.4.6-void-variable-argi.patch:
+  Patch elscreen to build with emacs 24, fixes bug 425258
 
   02 Jul 2009; Jeroen Roovers <jer@gentoo.org> elscreen-1.4.6.ebuild:
   Stable for HPPA too.
@@ -91,4 +98,3 @@
   05 May 2003; Matthew Kennedy <mkennedy@gentoo.org> elscreen-1.2.4.ebuild,
   files/60elscreen-gentoo.el:
   Initial import.
-
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 6629e2d13408..3cea2ef3bc39 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50elscreen-gentoo.el 78 SHA256 a393882bc5c8fc5d23d22a0227104d2d317cccb6313e8f6cfa792539bdd992a9 SHA512 28e08f33ecbfdc4e11bc7bb0e4eba42479a8e5a7adbad36582e1e21e1ec8971a7e8c7ac527908a038debc4bd00b928d55969b63ace56f865959722e8df92c772 WHIRLPOOL 626dda94ffba0467b9f71f9ca094188fbe1f9ceb3dad3cbb07dc99512661b1b5398007e026563ddd5560f7748fba650b57148314b6801f2f127237870de1f112
+AUX elscreen-1.4.6-emacs-24.patch 5925 SHA256 0acf3439eb067d84be40ca2ef1bf9eef97c6f821ae2dddc8f5c2aab005ef176c SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e WHIRLPOOL edc86d4c96d5859d8f3394f1de44e9313ca5ad0ef0bb287165f449f511e380f3f4efbc147222f72fda2067b629f792e0b0fa9d084fa79e55227bef8cecc2b686
+AUX elscreen-1.4.6-void-variable-argi.patch 2789 SHA256 512da2ec30dbbae241ef5a9256f8641adc4eb77450140f4b52d1e7a2cce8c0d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333 WHIRLPOOL 75e81a993ed3504ed64042c14a8785fcd34da81ca91ecf4b422b318be966b266da654aa9cdf5864069b070c15b49ec68db924801413b6a4826cf2cc06242b032
 DIST elscreen-1.4.6.tar.gz 21680 SHA256 134cef5b4ffe75898ca30776b4a4191a9425cbafc650a43e87aae4188adbd650 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2 WHIRLPOOL 8eb4c82941bdee8af3e0e396623efcfae406e254cd8228579e53281311b299f4a0e90e5346292728a099344e0a6206ae0f5163bca428f09d4d2c110b55f70cc8
+EBUILD elscreen-1.4.6-r1.ebuild 1027 SHA256 055f089d2d41df5d561a47c2e40f3a36ac476ec9d7ee9865d8b053826384343b SHA512 b58e9e346d13a0d4acdaae421656e02b2619e881a2801d01ef4ff4f21d265f0587b18ff326bb42c82d2f5383c144bda69ff84fc11a13fdea7c1c71eb888e8c0a WHIRLPOOL 192ad3acc02d6ac0d253d21be9b2b502cd361cc571a7f869a3d80cb956dc8f4957bc25854c24c254599f6148ab192a1e94163d766eaa6d67eb10b227f5994148
 EBUILD elscreen-1.4.6.ebuild 916 SHA256 705e11cae49bcfc633e13f22a141729c6718ff10d918dd03cef6633c2db4c60d SHA512 2eeeb52472133695085512df03a7241054730d11c12da5305791ff41b108ccbd68ffc9a42d9267777b18ae2abd4b9c22a0085d74508c648274af50c7c7f95152 WHIRLPOOL bf4f3aaa1e143f99bbba15e19c3eed3d8af458259d10e66ae3f23c837d6332bcf476658e48eef64634a15d41c1d85b46c6b070f167ee2a32c39213c14024d719
-MISC ChangeLog 2790 SHA256 fc2c643760324b570c0d15674535d398cd184665f3f574f13239b6ea7f3c1b83 SHA512 242a45e456b5d59a69389c331e24bb139ed445a5edc65c92e14cf3cc04e27839abc1c6d04512f1e706229f10ee3cc506650763ca7f7e1ac66a550bf020dfc594 WHIRLPOOL 0c5c4288f741bed12e8d28dc47bd4ed134e4f2bc78a5d8fc22a01c30a40f23632a240ec65eabbd6ad3f745783ec446ca503e2493244213bd7e8966e24bcd7b2b
+MISC ChangeLog 3049 SHA256 81324ef41969b1c1b3eba06722bf4a01ce16f706a34dd71845d2af3eddfdf4dc SHA512 d3c37d8796c8e8991e222af5cf017b749f6f4b0b6805798880a1e5237aa841472759af8031c9ffa77e918450f0c24b6b443b56823d2605bb4f55e40ca825204d WHIRLPOOL 03fe058e513916e2545b0c1d5641b88042b7309abeb91d28865fce5f3e4443d0f2d1c224711d0d89375723f40cc42613c4253b396ecdde44bbce9f0a9ca3dcc1
 MISC metadata.xml 962 SHA256 00a09df86840bfaebb119b0bae2457d4dd7808299252e69182d167ec9eb8ae08 SHA512 26a9df9bbd02d56907173e28b66e3c53878d76c36acc0c9d68666c3661740f03e59eb5baa6743cfc3f51e8b17c8874a1e2435e51db66e0dc64d11299acf14fb8 WHIRLPOOL 3d6870b2e4cd08cf4d622d923fa1aa159046dca7d8af16e018ce8543b81bc8a8df89d5534e41feeef1a855cbfc79a8ce9c484e2124e6ac7be0dfbb9ca26e185a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e00AAoJEDxpGckxwJCBjosP/15s3hJ79VJ3ZaFK99e4VqBq
-zan+NGUY/7tZulGRfOcU9hRAfryhK4kSztinvQ9WZMBTHIoaMB+MzS77JO58MF30
-xH/WrQ/QrgYFI7Th8CcpzLOxZTTDMEhlxxPp1fyRJZEtzOCA7g7vl0OyftQyNR8I
-EvRtaw2ync7y+IM2FL/8y8nblEEmsgRNSaQBoZArMh3FIIxMb2xcmrls+WHWGH4H
-NL2Rbw6a2r18+gVECylF1CwGbWagHu8fD4et+hnU5JDPsPuk0lzEDuJN03vu0MQI
-Oj5m6qgMutPylLsaAb8N25v1f3xObSU7I68e3ZZXv6D/fqySYoQFMqcoScyLylWF
-mnyv8Uyw4x7hT+gBRkFi2Ag3IgBCECLZkN4WFoiK6edSRkC6UJJME39uSJ+fyRO7
-KJRACFdjREi3XD/GP3UcgFdl5HZXB/3PETlUqY9ciBmGjzvOxESpep01MgTuYzbs
-UeoscTqZXZeBglSnIkKz2OiiYZokpbNxC7QKS6r82xs9TxgXZY9HgyaFAAJnQNtA
-Gbw1oDKNO9zNBxjbjOzf9+EGqWqv7c7O0cNjuGIsdgL1HI0Lf4dkluCguIFU1WV9
-yMric4bq21eMSub0LHdrZh3JFsDOsf6Z+abdID2U8FiUr37C9yQbCqpExK+y4pab
-6un0g8T9fMZHyt4ArkOy
-=RK3r
+iF4EAREIAAYFAlJNVgQACgkQoBEVQmGOlx9BawEA3JGdjtUdj1qFBU9jHk/aineV
+dAR161BLmN3MC9UFAzIBAMRITq2ZK0lONTZdafPw8mRH6OeelthzfGxtG9KmCtB6
+=xQFs
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..da91bbdaea9c
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild,v 1.1 2013/10/03 11:36:26 gienah Exp $
+
+EAPI="4"
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
+HOMEPAGE="http://www.morishima.net/~naoto/j/software/elscreen/"
+SRC_URI="ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=app-emacs/apel-10.8-r1"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${PN}-1.4.6-void-variable-argi.patch ${PN}-1.4.6-emacs-24.patch"
+
+SITEFILE=50${PN}-gentoo.el
+DOCS="ChangeLog README"
+
+pkg_postinst() {
+	elisp-site-regen
+
+	echo
+	elog "ElScreen modifies standard Emacs keybindings and is therefore"
+	elog "no longer loaded from site-gentoo.el. Add the line"
+	elog "  (require 'elscreen)"
+	elog "to your ~/.emacs file to enable it on Emacs startup."
+}
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
new file mode 100644
index 000000000000..dbcb77557f17
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
@@ -0,0 +1,154 @@
+--- elscreen-1.4.6-orig/elscreen.el	2013-05-23 21:31:14.011823000 +1000
++++ elscreen-1.4.6/elscreen.el	2013-10-03 20:55:35.497650931 +1000
+@@ -29,9 +29,9 @@
+ (eval-when-compile
+   (require 'static))
+ 
+-(static-defconst elscreen-on-xemacs (featurep 'xemacs))
+-(static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
+-                                        (>= emacs-major-version 21)))
++(static-defconst elscreen-on-xemacs (featurep 'xemacs)
++  (static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
++                                          (>= emacs-major-version 21))))
+ 
+ 
+ ;;; User Customizable Variables:
+@@ -148,7 +148,8 @@
+ 
+ (static-when elscreen-on-emacs ;; GNU Emacs 21
+   (make-obsolete-variable 'elscreen-tab-display-create-screen
+-                          'elscreen-tab-display-control)
++                          'elscreen-tab-display-control
++			  "1.4.6")
+   (defcustom elscreen-tab-display-control t
+     "*Non-nil to display control tab at the most left side."
+     :tag "Show/Hide the Control Tab"
+@@ -201,13 +202,13 @@
+       (((class color))
+        (:background "blue" :foreground "black" :underline t)))
+     "Face for tabs other than current screen one."
+-    :group 'elscreen))
++    :group 'elscreen)
+ 
+ 
+ ;;; Key & Menu bindings:
+ 
+-(defvar elscreen-map (make-sparse-keymap)
+-  "Keymap for ElScreen.")
++  (defvar elscreen-map (make-sparse-keymap)
++    "Keymap for ElScreen."))
+ (define-key elscreen-map "\C-c" 'elscreen-create)
+ (define-key elscreen-map "c"    'elscreen-create)
+ (define-key elscreen-map "C"    'elscreen-clone)
+@@ -899,13 +900,13 @@
+          screen-list-string)
+     (cond
+      ((not (elscreen-screen-live-p screen)) ;; XXX
+-      (when (interactive-p)
++      (when (called-interactively-p 'any)
+         (elscreen-message "There is no such screen")))
+      ((null screen-list)
+-      (when (interactive-p)
++      (when (called-interactively-p 'any)
+         (elscreen-message "There is only one screen, cannot kill")))
+      ((or
+-       (not (interactive-p))
++       (not (called-interactively-p 'any))
+        (yes-or-no-p (format "Really kill screens other than %d? " screen)))
+       (setq screen-list-string (mapconcat
+                                 (lambda (screen)
+@@ -914,7 +915,7 @@
+                                 screen-list ","))
+       (elscreen-goto-internal screen)
+       (elscreen-notify-screen-modification 'force-immediately)
+-      (when (interactive-p)
++      (when (called-interactively-p 'any)
+         (elscreen-message (format "screen %s killed" screen-list-string)))))
+     screen-list))
+ 
+@@ -984,7 +985,7 @@
+ (defun elscreen-jump ()
+   "Switch to specified screen."
+   (interactive)
+-  (let ((next-screen (string-to-number (string last-command-char))))
++  (let ((next-screen (string-to-number (string last-command-event))))
+     (if (and (<= 0 next-screen) (<= next-screen 9))
+         (elscreen-goto next-screen))))
+ (defalias 'elscreen-jump-0 'elscreen-jump)
+@@ -1046,7 +1047,7 @@
+     (princ (substitute-command-keys
+             (mapconcat 'symbol-value
+                        elscreen-help-symbol-list "\n\n")))
+-    (print-help-return-message)))
++    (help-print-return-message)))
+ 
+ 
+ ;;; Utility Functions
+@@ -1180,7 +1181,7 @@
+ creating one if none already exists."
+   (interactive)
+   (let* ((prompt "Go to the screen with specified buffer: ")
+-         (create (or create (interactive-p)))
++         (create (or create (called-interactively-p 'any)))
+          (buffer-name (or (and (bufferp buffer) (buffer-name buffer))
+                           (and (stringp buffer) buffer)
+                           (and (featurep 'iswitchb)
+@@ -1207,7 +1208,7 @@
+ Use \\[toggle-read-only] to permit editing."
+   (interactive "FFind file read-only in new screen: ")
+   (elscreen-find-file filename)
+-  (toggle-read-only 1))
++  (read-only-mode 1))
+ 
+ (defun elscreen-dired (dirname &optional switches)
+   (interactive (progn
+@@ -1373,27 +1374,28 @@
+   (defvar elscreen-e21-tab-format nil)
+   (make-variable-buffer-local 'elscreen-e21-tab-format)
+ 
+-  (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
+-    (let ((keymap (make-sparse-keymap))
+-          (key-function-pairs
+-           (eval-when-compile
+-             (mapcar
+-              (lambda (key)
+-                (cons key 'ignore))
+-              (list 'mouse-1 'mouse-2 'mouse-3
+-                    'down-mouse-1 'down-mouse-2 'down-mouse-3
+-                    'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
+-      (while definitions
+-        (set-alist 'key-function-pairs (car definitions) (cadr definitions))
+-        (setq definitions (cddr definitions)))
+-      (mapc
+-       (lambda (key-function-pair)
+-         (let ((key (car key-function-pair))
+-               (function (cdr key-function-pair)))
+-           (define-key keymap (vector 'header-line key) function)))
+-       key-function-pairs)
+-      keymap))
+-
++  (eval-when-compile
++    (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
++      (let ((keymap (make-sparse-keymap))
++            (key-function-pairs
++             (eval-when-compile
++               (mapcar
++                (lambda (key)
++                  (cons key 'ignore))
++                (list 'mouse-1 'mouse-2 'mouse-3
++                      'down-mouse-1 'down-mouse-2 'down-mouse-3
++                      'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
++        (while definitions
++          (set-alist 'key-function-pairs (car definitions) (cadr definitions))
++          (setq definitions (cddr definitions)))
++        (mapc
++         (lambda (key-function-pair)
++           (let ((key (car key-function-pair))
++                 (function (cdr key-function-pair)))
++             (define-key keymap (vector 'header-line key) function)))
++         key-function-pairs)
++        keymap)))
++        
+   (defsubst elscreen-e21-tab-width ()
+     (if (numberp elscreen-display-tab)
+         elscreen-display-tab
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
new file mode 100644
index 000000000000..b8225070a675
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
@@ -0,0 +1,71 @@
+--- elscreen.el.orig	2007-12-29 15:12:05.000000000 +0000
++++ elscreen.el
+@@ -1691,6 +1691,10 @@ Use \\[toggle-read-only] to permit editi
+                   ("-e"                . elscreen-command-line-funcall))))
+ 
+   (static-when elscreen-on-emacs
++    (cond
++     ;  -----------------------
++     ((< emacs-major-version 23)	; emacs22 or prior to
++	(progn
+     (defun elscreen-e21-command-line ()
+       (when (string-match "\\`-" argi)
+         (error "Unknown option `%s'" argi))
+@@ -1703,11 +1707,55 @@ Use \\[toggle-read-only] to permit editi
+         (elscreen-command-line-find-file file file-count line column))
+       (setq line 0)
+       (setq column 0)
+-      t)
++      t) ; defun
+ 
+     (add-hook 'after-init-hook (lambda ()
+                                  (add-to-list 'command-line-functions
+-                                              'elscreen-e21-command-line t))))
++                                              'elscreen-e21-command-line t)))) ; progn
++    )  ; else
++     ;  -----------------------
++    ((= emacs-major-version 23)	; emacs23
++      (progn
++    (defun elscreen-e23-command-line ()
++      (when (string-match "\\`-" argi)
++        (error "Unknown option `%s'" argi))
++      (setq file-count (1+ file-count))
++      (setq inhibit-startup-buffer-menu t)
++      (let* ((file
++              (expand-file-name
++               (command-line-normalize-file-name orig-argi)
++               cl1-dir)))
++        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++      (setq cl1-line 0)
++      (setq cl1-column 0)
++      t) ; defun
++    
++    (add-hook 'after-init-hook (lambda ()
++                                 (add-to-list 'command-line-functions
++                                              'elscreen-e23-command-line t)))) ; progn
++      ) ; else
++     ;  -----------------------
++    ((> emacs-major-version 23)	; emacs24 or later
++      (progn
++    (defun elscreen-e24-command-line ()
++      (when (string-match "\\`-" cl1-argi)
++        (error "Unknown option `%s'" cl1-argi))
++      (setq file-count (1+ file-count))
++      (setq inhibit-startup-buffer-menu t)
++      (let* ((file
++              (expand-file-name
++               (command-line-normalize-file-name orig-argi)
++               cl1-dir)))
++        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++      (setq cl1-line 0)
++      (setq cl1-column 0)
++      t) ; defun
++    
++    (add-hook 'after-init-hook (lambda ()
++                                 (add-to-list 'command-line-functions
++                                              'elscreen-e24-command-line t)))) ; progn
++      )
++      )) ; endif (emacs22 or prior to)
+ 
+   (static-when elscreen-on-xemacs
+     (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)