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

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

[Ulrich Müller]

commit:     5485e811e7014d4238b7cb2b6db14e9e12113846
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 12:20:57 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 12:36:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5485e811

app-emacs/vterm: Use versioned filename for patch

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ...-dont-compile.patch => vterm-0.0.1_pre20200713-dont-compile.patch} | 0
 app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild                        | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
similarity index 100%
rename from app-emacs/vterm/files/vterm-dont-compile.patch
rename to app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch

diff --git a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
index 3f049c76abd..b3df66ead64 100644
--- a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
+++ b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
 	>=app-editors/emacs-26:*[dynamic-loading]"
 
 S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${PN}-dont-compile.patch )
+PATCHES=( "${FILESDIR}"/${P}-dont-compile.patch )
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
 

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

[Ulrich Müller]

commit:     ba7b046343e74e8f444f7d8bdc9b255d690bc94d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 12:34:00 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 12:36:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7b0463

app-emacs/vterm: Version bump to 0.0.1_pre20210618

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/vterm/Manifest                           |  1 +
 .../vterm-0.0.1_pre20210618-dont-compile.patch     | 22 +++++++++++
 app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild     | 45 ++++++++++++++++++++++
 3 files changed, 68 insertions(+)

diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index f04e9cddcdd..5294b04ce52 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1 +1,2 @@
 DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
+DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2

diff --git a/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch
new file mode 100644
index 00000000000..512b9d94142
--- /dev/null
+++ b/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch
@@ -0,0 +1,22 @@
+Simply error out if the module is not found. Don't confuse the user
+with messages about compiling the module, which won't work outside of
+the package's source tree.
+
+--- a/vterm.el
++++ b/vterm.el
+@@ -130,14 +130,7 @@
+           (message "Compilation of `emacs-libvterm' module succeeded")
+         (error "Compilation of `emacs-libvterm' module failed!")))))
+ 
+-;; If the vterm-module is not compiled yet, compile it
+-(unless (require 'vterm-module nil t)
+-  (if (or vterm-always-compile-module
+-          (y-or-n-p "Vterm needs `vterm-module' to work.  Compile it now? "))
+-      (progn
+-        (vterm-module-compile)
+-        (require 'vterm-module))
+-    (error "Vterm will not work until `vterm-module' is compiled!")))
++(require 'vterm-module)
+ 
+ ;;; Dependencies
+ 

diff --git a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
new file mode 100644
index 00000000000..77ce01cdc80
--- /dev/null
+++ b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="d9dfa624679afdd5db6ad25429ef86d3dd91401e"
+
+inherit cmake elisp
+
+MY_PN="emacs-libvterm"
+DESCRIPTION="Fully-featured terminal emulator based on libvterm"
+HOMEPAGE="https://github.com/akermu/emacs-libvterm"
+SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-libs/libvterm"
+RDEPEND="${DEPEND}
+	>=app-editors/emacs-26:*[dynamic-loading]"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+PATCHES=("${FILESDIR}"/${PN}-0.0.1_pre20210618-dont-compile.patch)
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DUSE_SYSTEM_LIBVTERM=ON")
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	elisp-modules-install ${PN} vterm-module.so
+}

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

[Ulrich Müller]

commit:     8d01f01ca8e92057e1eae6b849d66fb23de4f36e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 11:28:33 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 12:11:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d01f01c

app-emacs/vterm: Initial import.

Ebuild contributed by me, based on earlier work by Hans de Graaff
<graaff <AT> gentoo.org> and Arjan Adriaanse <arjan@adriaan.se>.

Closes: https://bugs.gentoo.org/721256
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/vterm/Manifest                       |  1 +
 app-emacs/vterm/files/50vterm-gentoo.el        |  5 +++
 app-emacs/vterm/files/vterm-dont-compile.patch | 22 +++++++++++++
 app-emacs/vterm/metadata.xml                   | 17 ++++++++++
 app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild | 45 ++++++++++++++++++++++++++
 5 files changed, 90 insertions(+)

diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
new file mode 100644
index 00000000000..f04e9cddcdd
--- /dev/null
+++ b/app-emacs/vterm/Manifest
@@ -0,0 +1 @@
+DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0

diff --git a/app-emacs/vterm/files/50vterm-gentoo.el b/app-emacs/vterm/files/50vterm-gentoo.el
new file mode 100644
index 00000000000..b3e234eba1c
--- /dev/null
+++ b/app-emacs/vterm/files/50vterm-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@EMACSMODULES@")
+(autoload 'vterm "vterm" "Create a new vterm." t)
+(autoload 'vterm-other-window "vterm"
+  "Create a new vterm in another window." t)

diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-dont-compile.patch
new file mode 100644
index 00000000000..6b08ae81236
--- /dev/null
+++ b/app-emacs/vterm/files/vterm-dont-compile.patch
@@ -0,0 +1,22 @@
+Simply error out if the module is not found. Don't confuse the user
+with messages about compiling the module, which won't work outside of
+the package's source tree.
+
+--- a/vterm.el
++++ b/vterm.el
+@@ -121,14 +121,7 @@
+           (message "Compilation of `emacs-libvterm' module succeeded")
+         (error "Compilation of `emacs-libvterm' module failed!")))))
+ 
+-;; If the vterm-module is not compiled yet, compile it
+-(unless (require 'vterm-module nil t)
+-  (if (or vterm-always-compile-module
+-            (y-or-n-p "Vterm needs `vterm-module' to work.  Compile it now? "))
+-      (progn
+-        (vterm-module-compile)
+-        (require 'vterm-module))
+-    (error "Vterm will not work until `vterm-module' is compiled!")))
++(require 'vterm-module)
+ 
+ ;; Silence compiler warnings by informing it of what functions are defined
+ (declare-function display-line-numbers-update-width "display-line-numbers")

diff --git a/app-emacs/vterm/metadata.xml b/app-emacs/vterm/metadata.xml
new file mode 100644
index 00000000000..ac2faa79e28
--- /dev/null
+++ b/app-emacs/vterm/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+  Emacs-libvterm (vterm) is fully-fledged terminal emulator inside
+  GNU Emacs based on libvterm, a C library. As a result of using
+  compiled code (instead of elisp), emacs-libvterm is fully capable,
+  fast, and it can seamlessly handle large outputs.
+</longdescription>
+<upstream>
+  <remote-id type="github">akermu/emacs-libvterm</remote-id>
+</upstream>
+</pkgmetadata>

diff --git a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
new file mode 100644
index 00000000000..412a03668c1
--- /dev/null
+++ b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="f41849c2c9c1899f22d1c3d4f871ec47c82627ce"
+
+inherit cmake elisp
+
+MY_PN="emacs-libvterm"
+DESCRIPTION="Fully-featured terminal emulator based on libvterm"
+HOMEPAGE="https://github.com/akermu/emacs-libvterm"
+SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libvterm"
+RDEPEND="${DEPEND}
+	app-editors/emacs[dynamic-loading]"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+PATCHES=( "${FILESDIR}"/${PN}-dont-compile.patch )
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( "-DUSE_SYSTEM_LIBVTERM=ON" )
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	elisp-modules-install ${PN} vterm-module.so
+}