gentoo auto-resync : 08:07:2024 - 12:25:03

3 files changed, 95 insertions, 20 deletions

diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index 486357fafd02..84eb729c42fd 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1,6 +1,8 @@
 AUX 50vterm-gentoo.el 213 BLAKE2B adb1452d0bf816beceec4367a33176034f90c46b1649178cce093160117d14c01d1ccebefa57bebbf276d01e812223876a766567fbbb95589851b51db2456db2 SHA512 2847b924a1e3218d433391396681642a88192396a60f25f5da6824a9546a0f155d068b1bfc2115f0698b87e07ca50845ebbdc0a71de2ff8203fdf14b7e43ef0d
 AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28794f8b04b8f7e02e824373a75ba214c3ad213dc598f5390c22d3ad068fa2c8b041232664ff5170b08d21c8e9d60b8ea1eb3dae44a48 SHA512 8787887ec2d7c2ee09710ca8683bf90e3ab81d930288e66d74a926f3619f4bea2e37f1bdec0021192b85dc3dbcf778b4e4f5ad82805b35033b212cb43fcbe5e6
 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
 EBUILD vterm-0.0.2_p20240102.ebuild 1654 BLAKE2B e7da142afdb62f64a0a5898a7f8864216292ce0904e4ccceefe7a43814c619820c48a0a409cab8a21c71bf46eef69154abadca40bc36bfaa3828331d0f3e3e3d SHA512 0360afe49e11ae7217127abb1f7b4cd4ee046d377ae6e8a0ea3a8bc4d6a7dff22c62906faf686d296e027d525dfcc074288948456ceebff35f4cd4ba1b7dfc74
-EBUILD vterm-9999.ebuild 1655 BLAKE2B 82715ebb184790160a6d56be2da83f28a7cf32b0d8532778ef50c1c8486d0fd9d604207ef6987aa62bfbcbcdac419fc08e231ee23ff2efd9774029e6b8f700c3 SHA512 0714aa49b838e03a785303e132fba2d2058a32349345912ee6d64f226bc4b0982ca65354856107562fe2ba925c67e070d7985d990a83ea480a5fd8d90a186d51
+EBUILD vterm-0.0.2_p20240705.ebuild 1535 BLAKE2B c20f52dd0c9afc6c651ac60a378f9847e7b3df3fdf5f2179e3ae91a0630c52ac1b49af8833d94e5957b0217f8cd89d089a78a3bc090846c0fa8ad8c60b5361fa SHA512 c0a78aea25fe898a483c7ea5c3dd2d6bf3d72d56c322f655fa153b7a4decf95c326d3bb6d498cf4ec8c5aa4b1cadab957c5ef40e939ee3e1fb9ef0a21dbba685
+EBUILD vterm-9999.ebuild 1535 BLAKE2B c20f52dd0c9afc6c651ac60a378f9847e7b3df3fdf5f2179e3ae91a0630c52ac1b49af8833d94e5957b0217f8cd89d089a78a3bc090846c0fa8ad8c60b5361fa SHA512 c0a78aea25fe898a483c7ea5c3dd2d6bf3d72d56c322f655fa153b7a4decf95c326d3bb6d498cf4ec8c5aa4b1cadab957c5ef40e939ee3e1fb9ef0a21dbba685
 MISC metadata.xml 634 BLAKE2B 09ec6e8f2b00735c5fc3dbca525205b0b98a580feecfea36a1c2b435bfd6de2e4b5e85c47c07f4830da1b3ddc8793d06e4e6ec3a02e5df19c876e0251226f5c7 SHA512 09d9be89b4275192c5048eb3a7fc3729d6d4923861bc5ab075c8097e7bb1f6776649e82440e53b1d0236dc669a4580aa2da31da5cdc5994b59eabaffdeeedc61
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 000000000000..66772f19f189
--- /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 47fb04defbc9..66772f19f189 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
-			-> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/akermu/${MY_PN}/archive/${PV}.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}-${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