From 8d5dd152e2fdd431398c191b1cf165f8bb53b78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 7 Jul 2024 19:04:37 +0200 Subject: [PATCH] app-emacs/vterm: New snapshot 0.0.2_p20240705 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sync live ebuild. Signed-off-by: Ulrich Müller --- app-emacs/vterm/Manifest | 1 + app-emacs/vterm/vterm-0.0.2_p20240705.ebuild | 77 ++++++++++++++++++++ app-emacs/vterm/vterm-9999.ebuild | 34 ++++----- 3 files changed, 93 insertions(+), 19 deletions(-) create mode 100644 app-emacs/vterm/vterm-0.0.2_p20240705.ebuild diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest index cd6bad9fe88b2..02e1cf93999a2 100644 --- a/app-emacs/vterm/Manifest +++ b/app-emacs/vterm/Manifest @@ -1 +1,2 @@ DIST vterm-0.0.2_p20240102.tar.gz 61754 BLAKE2B 283730dbd1d826590111495c798bfdf78a1921c73ac6aba7f062590c775c2d99265f70cf915f486316837a28e97f0e6a0e3fca72aed74295fbfc807acd8c1a99 SHA512 74a6a789ffc2863eea7be6775761c65537812cb0a6c571334ae3958129ddd3e7bbe764812e4dfe2782194a3e92af6cc6d04e400ca94a2e73dfa38fa0b476eabc +DIST vterm-0.0.2_p20240705.tar.gz 61759 BLAKE2B a89ca81e905ce184eac3a7374502be9d550c5ac662a8576b8f623bb265fabde5dfb1e32534fdd2f92b8d8b7f3e164faa4137b51c0424a2a0d1cccc2f948e646c SHA512 4b51f67e18a98297b2fb85d9d28b840855bbf52e80d03e9c9889ba525a301a48777837bfb8583bfc60a660235ddd2beb7fec41258f9f062414eed82a385385b2 diff --git a/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild b/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild new file mode 100644 index 0000000000000..66772f19f189a --- /dev/null +++ b/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=emacs-libvterm +NEED_EMACS=26 + +inherit cmake elisp + +DESCRIPTION="Fully-featured terminal emulator based on libvterm" +HOMEPAGE="https://github.com/akermu/emacs-libvterm/" + +case ${PV} in + *9999*) + inherit git-r3 + EGIT_REPO_URI="https://github.com/akermu/${MY_PN}.git" + ;; + *_p20240705) + COMMIT=d9ea29fb10aed20512bd95dc5b8c1a01684044b1 + ;& # fall through + *) + SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT:-${PV}}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-${COMMIT:-${PV}}" + KEYWORDS="~amd64 ~arm64 ~x86" + ;; +esac + +LICENSE="GPL-3+" +SLOT="0" + +DEPEND=" + >=dev-libs/libvterm-0.2:= +" +RDEPEND=" + ${DEPEND} + >=app-editors/emacs-26:*[dynamic-loading] +" + +PATCHES=( "${FILESDIR}/${PN}-0.0.1_pre20210618-dont-compile.patch" ) + +DOCS=( README.md ) +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + if [[ -e ${ESYSROOT}/usr/include/emacs-module.h ]]; then + # Use system header file instead of bundled one. + rm emacs-module.h || die + else + ewarn "${ESYSROOT}/usr/include/emacs-module.h does not exist" + ewarn "Falling back to bundled header file" + fi + + cmake_src_prepare +} + +src_configure() { + local -a 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 + + # Install shell-side vterm support scripts. + insinto "${SITEETC}/${PN}" + doins -r etc +} diff --git a/app-emacs/vterm/vterm-9999.ebuild b/app-emacs/vterm/vterm-9999.ebuild index 47fb04defbc9a..66772f19f189a 100644 --- a/app-emacs/vterm/vterm-9999.ebuild +++ b/app-emacs/vterm/vterm-9999.ebuild @@ -11,25 +11,21 @@ inherit cmake elisp DESCRIPTION="Fully-featured terminal emulator based on libvterm" HOMEPAGE="https://github.com/akermu/emacs-libvterm/" -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/akermu/${MY_PN}.git" -else - if [[ "${PV}" = *_p20240102 ]] ; then - COMMIT=c3a3a23a5eace137947524c93644204bf6b56cff - - SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz +case ${PV} in + *9999*) + inherit git-r3 + EGIT_REPO_URI="https://github.com/akermu/${MY_PN}.git" + ;; + *_p20240705) + COMMIT=d9ea29fb10aed20512bd95dc5b8c1a01684044b1 + ;& # fall through + *) + SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT:-${PV}}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${MY_PN}-${COMMIT}" - else - SRC_URI="https://github.com/akermu/${MY_PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${MY_PN}-${PV}" - fi - - KEYWORDS="~amd64 ~arm64 ~x86" -fi + S="${WORKDIR}/${MY_PN}-${COMMIT:-${PV}}" + KEYWORDS="~amd64 ~arm64 ~x86" + ;; +esac LICENSE="GPL-3+" SLOT="0" @@ -48,7 +44,7 @@ DOCS=( README.md ) SITEFILE="50${PN}-gentoo.el" src_prepare() { - if [[ -e "${ESYSROOT}/usr/include/emacs-module.h" ]] ; then + if [[ -e ${ESYSROOT}/usr/include/emacs-module.h ]]; then # Use system header file instead of bundled one. rm emacs-module.h || die else