6 files changed, 74 insertions, 4 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b06c2ec871ea..8b1950b72a35 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index b2ef62afecf3..84e39c133802 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1,5 +1,8 @@
 AUX 50vterm-gentoo.el 213 BLAKE2B adb1452d0bf816beceec4367a33176034f90c46b1649178cce093160117d14c01d1ccebefa57bebbf276d01e812223876a766567fbbb95589851b51db2456db2 SHA512 2847b924a1e3218d433391396681642a88192396a60f25f5da6824a9546a0f155d068b1bfc2115f0698b87e07ca50845ebbdc0a71de2ff8203fdf14b7e43ef0d
-AUX vterm-dont-compile.patch 907 BLAKE2B fdfa5bfc294558ebbe428375c817387ffd2e8c560c66c597815469460997d2f58e4734ee81d0780421cf0d1b512a74ecaf7ffc0fb5ca4034083eaa0a5f38e309 SHA512 359bebd557cca3fd31479bf3596d2d06e6b451faf57a074c4bbbf17e956d62f87a6695055f72697200f00df7c664aca970de89af69cd5470fe4faa0ad0172a95
+AUX vterm-0.0.1_pre20200713-dont-compile.patch 907 BLAKE2B fdfa5bfc294558ebbe428375c817387ffd2e8c560c66c597815469460997d2f58e4734ee81d0780421cf0d1b512a74ecaf7ffc0fb5ca4034083eaa0a5f38e309 SHA512 359bebd557cca3fd31479bf3596d2d06e6b451faf57a074c4bbbf17e956d62f87a6695055f72697200f00df7c664aca970de89af69cd5470fe4faa0ad0172a95
+AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28794f8b04b8f7e02e824373a75ba214c3ad213dc598f5390c22d3ad068fa2c8b041232664ff5170b08d21c8e9d60b8ea1eb3dae44a48 SHA512 8787887ec2d7c2ee09710ca8683bf90e3ab81d930288e66d74a926f3619f4bea2e37f1bdec0021192b85dc3dbcf778b4e4f5ad82805b35033b212cb43fcbe5e6
 DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
-EBUILD vterm-0.0.1_pre20200713.ebuild 973 BLAKE2B 515cb48c9fc683846192f923b69cef4d7bf185ac24a35e8e0a99c84ca584cb4b41539e193165c48fcc1a426acb519741fdceb639c7816d18da70f06abe76ccb7 SHA512 acbef586ed01692b65e338a26f27c29309ac01350a649238e288cbaf315db82be0c8e388585b76bab43dc5cb1a4061b5260739e9d62bcde8958f294c0854089c
+DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2
+EBUILD vterm-0.0.1_pre20200713.ebuild 972 BLAKE2B 13876ff1c427de41c5c0e529f7793fabc5850cec6a07551777815ca3d985d442c72cd8b429546397d073ab1987493e8bdffc0308290e99df285883b90af19db9 SHA512 01598b7b2515e3a082bc56676b5f448ce20f978e63c5896475b683715fd8a53a6b63b238c870ae0e3c92218c3049e93b2ec7da3074e04f88cd5739252bfa5773
+EBUILD vterm-0.0.1_pre20210618.ebuild 987 BLAKE2B c91417b70e7290b2b2d4b7de1b878ac0ad496012931a5296ae7196053cbebd1d095dce0cf7bee2a7b215bc3284d0c0922fcc67fa6dd9c51d4212270fafe59e3b SHA512 152f372fd98ab2ead4c4084b3312421483c3e97ac3a88aeb70e5b46c8e99ab5b96a786488997426c708619eced9a257fd8e90abdce88de18c7202f9f8293f536
 MISC metadata.xml 633 BLAKE2B 60cd4ca523fa42307493cccbbf5fc240dd658f2c7368e761c94e384e9d363ae8359d0b6e0520be3767b6df38a4d94d9f1ebc3e8983c40d07ffc990428cb863fc SHA512 1ae5bd4bff830550c81d14e8312faf9aa0270ea7bf3e73ad347c20de0fb0d8fbbfe0d1fc807d41c0629e4c3170d9a512abdd5213f200671e63c80afc814fe85b
diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
index 6b08ae812360..6b08ae812360 100644
--- a/app-emacs/vterm/files/vterm-dont-compile.patch
+++ b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
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 000000000000..512b9d941423
--- /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_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
index 3f049c76abd3..b3df66ead641 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"
 
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 000000000000..77ce01cdc80f
--- /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
+}