commit: 2a7fcadaa44b6964fae959bfe9daf663e71af5be Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Jan 14 17:01:33 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Jan 14 17:07:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7fcada
app-emacs/cask: bump to 0.9.0 Bug: https://bugs.gentoo.org/947927 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> app-emacs/cask/Manifest | 1 + app-emacs/cask/cask-0.9.0.ebuild | 62 ++++++++++++++++++++++ .../cask/files/cask-0.9.0-bin-launcher-fix.patch | 26 +++++++++ app-emacs/cask/files/cask-0.9.0-home-dir.patch | 13 +++++ 4 files changed, 102 insertions(+) diff --git a/app-emacs/cask/Manifest b/app-emacs/cask/Manifest index 03f7ea962c9d..29e3624db2e5 100644 --- a/app-emacs/cask/Manifest +++ b/app-emacs/cask/Manifest @@ -1 +1,2 @@ DIST cask-0.8.8.tar.gz 348574 BLAKE2B 9eb2b18b6082a3500642660eebb471bff3bcbb00656a8a3c66bede3cf756e738b1cb8affbdeed97373bbdc0031d093a6ad5c7e4659e14732fbc531a416c78b99 SHA512 2708fa431dc17cb5d4fe56f0c73c3089a213d8ff0bca19091ab4ebf26c4e416c0a500a980daa424bf16b54d0e72b004762f5260329189eb4f8e803de38bc0ace +DIST cask-0.9.0.gh.tar.gz 280606 BLAKE2B 17d216ac354c4b34d1663a23a0f7961c68acf544d64e911e54fac29a454a1b4737718903db637097c17dd28d083f91519ea7543a8ee57f2188d20d67cd604e3c SHA512 9e1e9eb0146504fc3ff2dc5358edc59b8157948df4698c7fbec14c28720458cd28b0b9ef9dc34b23a615e5b0a8ef843f9a9bdd9f7030aef797fa3df7864ae46a diff --git a/app-emacs/cask/cask-0.9.0.ebuild b/app-emacs/cask/cask-0.9.0.ebuild new file mode 100644 index 000000000000..383d3aad0fdc --- /dev/null +++ b/app-emacs/cask/cask-0.9.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="Project management for Emacs package development" +HOMEPAGE="https://github.com/cask/cask/"; + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/cask/${PN}"; +else + SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +RESTRICT="test" # Most tests fail. + +RDEPEND=" + app-emacs/ansi + app-emacs/commander + app-emacs/epl + app-emacs/f + app-emacs/package-build + app-emacs/s + app-emacs/shut-up +" +BDEPEND=" + ${RDEPEND} +" + +PATCHES=( + "${FILESDIR}/cask-0.9.0-bin-launcher-fix.patch" + "${FILESDIR}/cask-0.9.0-home-dir.patch" + "${FILESDIR}/cask-no-bootstrap.patch" +) +ELISP_REMOVE=" + ${PN}-bootstrap.el +" + +DOCS=( README.org cask_small.png ) +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + elisp_src_prepare + + sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i "./bin/${PN}" || die +} + +src_install() { + elisp_src_install + + exeinto /usr/bin + doexe "./bin/${PN}" +} diff --git a/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch b/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch new file mode 100644 index 000000000000..c4d949ab1141 --- /dev/null +++ b/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch @@ -0,0 +1,26 @@ +--- a/bin/cask ++++ b/bin/cask +@@ -41,11 +41,13 @@ if [ -z "$SRCDIR__" ]; then + SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") + fi + SRCDIR_=$(dirname "$SRCDIR__") +-SRCDIR=$(dirname "$SRCDIR_") ++# SRCDIR=$(dirname "$SRCDIR_") ++SRCDIR="@SITELISP@" ++ + case $subcommand in + emacs) + EMACS="$EMACS" \ +- "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ ++ "$EMACS" -q -L "$SRCDIR" -l "$SRCDIR/cask" \ + --eval "(cask--initialize (expand-file-name default-directory))" \ + "$@" + ;; +@@ -53,6 +55,6 @@ case $subcommand in + EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" + ;; + *) +- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" ++ "$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" + ;; + esac diff --git a/app-emacs/cask/files/cask-0.9.0-home-dir.patch b/app-emacs/cask/files/cask-0.9.0-home-dir.patch new file mode 100644 index 000000000000..c6c102ecb57c --- /dev/null +++ b/app-emacs/cask/files/cask-0.9.0-home-dir.patch @@ -0,0 +1,13 @@ +--- a/cask.el ++++ b/cask.el +@@ -345,9 +345,7 @@ Evaluate BODY in the package context of BUNDLE. Then restore package context." + (package-load-list + (eval (car (get 'package-load-list 'standard-value)))) + (package-user-dir (cask-elpa-path ,bundle)) +- (,@(if (special-variable-p 'package-gnupghome-dir) +- (cons 'package-gnupghome-dir (list (expand-file-name "gnupg" package-user-dir))) +- (list '_package-gnupghome-dir)))) ++ (package-gnupghome-dir (expand-file-name "gnupg" package-user-dir))) + (cask--use-environment ,bundle ,refresh ,no-activate) + ;; following will evaluate keys e.g., `:activate t` as separate s-exprs + ;; which ought to be no-ops
