From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A3E0139337 for ; Sat, 31 Jul 2021 12:36:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A912E0828; Sat, 31 Jul 2021 12:36:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D0EEE0828 for ; Sat, 31 Jul 2021 12:36:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C337B34386F for ; Sat, 31 Jul 2021 12:36:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07158823 for ; Sat, 31 Jul 2021 12:36:29 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1627734982.ba7b046343e74e8f444f7d8bdc9b255d690bc94d.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/vterm/files/, app-emacs/vterm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/vterm/Manifest app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild X-VCS-Directories: app-emacs/vterm/ app-emacs/vterm/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ba7b046343e74e8f444f7d8bdc9b255d690bc94d X-VCS-Branch: master Date: Sat, 31 Jul 2021 12:36:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a83624b9-9462-4ca5-b038-8fefc5054bb3 X-Archives-Hash: 1629c87fd694caaebdd25259f2226134 commit: ba7b046343e74e8f444f7d8bdc9b255d690bc94d Author: Ulrich Müller gentoo org> AuthorDate: Sat Jul 31 12:34:00 2021 +0000 Commit: Ulrich Müller gentoo 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 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 +}