[gentoo-commits] repo/gentoo:master commit in: app-emacs/elscreen/, app-emacs/elscreen/files/

2019-10-12 Thread Ulrich Müller
commit: 93a3a2851b9c0ecedd81be02b16ed9b8f132eb61
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Oct 12 10:25:02 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Oct 12 10:38:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a3a285

app-emacs/elscreen: Remove old.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Ulrich Müller  gentoo.org>

 app-emacs/elscreen/Manifest|   1 -
 app-emacs/elscreen/elscreen-1.4.6-r1.ebuild|  33 -
 app-emacs/elscreen/files/50elscreen-gentoo.el  |   1 -
 .../elscreen/files/elscreen-1.4.6-emacs-24.patch   | 154 -
 .../files/elscreen-1.4.6-void-variable-argi.patch  |  71 --
 5 files changed, 260 deletions(-)

diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 94a87bb3c63..0825911ef72 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,2 +1 @@
-DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B 
a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7
 SHA512 
2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
 DIST elscreen-20180321.tar.gz 36840 BLAKE2B 
7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3
 SHA512 
777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201

diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild 
b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
deleted file mode 100644
index c2673da73b4..000
--- a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/50elscreen-gentoo.el 
b/app-emacs/elscreen/files/50elscreen-gentoo.el
deleted file mode 100644
index 431f7e90ae7..000
--- a/app-emacs/elscreen/files/50elscreen-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")

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
deleted file mode 100644
index dbcb77557f1..000
--- a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
+++ /dev/null
@@ -1,154 +0,0 @@
 elscreen-1.4.6-orig/elscreen.el2013-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" 

[gentoo-commits] repo/gentoo:master commit in: app-emacs/elscreen/, app-emacs/elscreen/files/

2019-08-29 Thread Ulrich Müller
commit: 6684984ae299e9061bef7ddd2a652a7cdc50f34b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Aug 29 11:06:21 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Aug 29 11:24:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6684984a

app-emacs/elscreen: Bump to version 20180209.

Keywords ~alpha ~ia64 ~ppc64 dropped because of new dependency
on app-emacs/wanderlust.

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Ulrich Müller  gentoo.org>

 app-emacs/elscreen/Manifest|  1 +
 app-emacs/elscreen/elscreen-20180321.ebuild| 28 ++
 .../elscreen/files/50elscreen-gentoo-20180321.el   |  2 ++
 app-emacs/elscreen/metadata.xml|  4 
 4 files changed, 35 insertions(+)

diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 93e1d90d4e3..94a87bb3c63 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1 +1,2 @@
 DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B 
a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7
 SHA512 
2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
+DIST elscreen-20180321.tar.gz 36840 BLAKE2B 
7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3
 SHA512 
777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201

diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild 
b/app-emacs/elscreen/elscreen-20180321.ebuild
new file mode 100644
index 000..06b418bd1c0
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU 
Screen"
+HOMEPAGE="https://www.emacswiki.org/emacs/EmacsLispScreen
+   https://github.com/knu/elscreen;
+SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="wanderlust"
+
+RDEPEND="wanderlust? ( app-emacs/wanderlust )"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+ELISP_REMOVE="elscreen-dnd.el" # does not compile
+DOCS="Readme.md GF-README GF-QuickStart"
+
+src_prepare() {
+   elisp_src_prepare
+   use wanderlust || rm elscreen-wl.el || die
+}

diff --git a/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el 
b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
new file mode 100644
index 000..4e9093e829f
--- /dev/null
+++ b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elscreen-start "elscreen" nil t)

diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 5c495a5a787..1d58acb5c62 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -20,4 +20,8 @@
   window-configurations.
 
 
+
+  Include support for app-emacs/walderlust
+  
+