gentoo auto-resync : 15:01:2025 - 06:41:45HEADmaster

7 files changed, 105 insertions, 75 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3f5a82329d6f..f4ea45012880 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/cask/Manifest b/app-emacs/cask/Manifest
index ece4430ca38d..3d7e93a861bd 100644
--- a/app-emacs/cask/Manifest
+++ b/app-emacs/cask/Manifest
@@ -1,5 +1,6 @@
-AUX cask-bin-launcher-fix.patch 729 BLAKE2B ae3ad72b09509db432cc55f787f6945ae99ce86800541411a9060654005da3195a2e11b175015bc0a0ac078c520b4a06caad0e8e0ca5fb4a677f844a0956be91 SHA512 bee4d324b6714b0ed7aa790417d92ede19a75bd7ae7138fde92759d4d1f40beb816ecc6e067aa43bc50ab5ecebc81907695721681dd09203178315189192de0a
+AUX cask-0.9.0-bin-launcher-fix.patch 847 BLAKE2B 55b15c2b861b147aa2582b6d3a74b8cf95fe105bfc605f37d37c2f4cd93e5a97a19221a2850a3c3b72988e6a03133dab1e17ce81775c3827d32338759974b1dd SHA512 cd9923f9d6a2cec34a6b83d525a5a11658f731960430aacaa39d704b4507d70e905d2ae08f292a68a4152129aea921a3cb2523bb65401a07b031ba7abbef7a9b
+AUX cask-0.9.0-home-dir.patch 721 BLAKE2B fcc2cd3c40084e69ca330503f978e30d78ca8eb16f35aeeb43fdce7f0ff026bb8e8b471d97df7e7b0be3663d75b5ad38ca23a27e7c6a4c5219cbb639cdd9180b SHA512 91e17491e373cd6def4bd1a2a75b673526ab2c92fadeaab7322d202eb68168f47539f17867de5d7dcb773f2085aa448d6c2e6d22b14f794ce05522486403ac8d
 AUX cask-no-bootstrap.patch 1379 BLAKE2B 1d664cbd60145931964622c380d682e46ac2c1ee7762422cba0129b67b1c36c8c8f8a5b84bd11ec2cdca4efdb4a9bddd7efb8006ed6de60059ba9d2288f61f49 SHA512 73216e7f7b0e9ca2f6722c0065d725e2071c0cb831f05381e64082f2de9957633d1ab3bdaed990786f1f9142c7f599fa03b2b8602fa7936a715d4460d6133109
-DIST cask-0.8.8.tar.gz 348574 BLAKE2B 9eb2b18b6082a3500642660eebb471bff3bcbb00656a8a3c66bede3cf756e738b1cb8affbdeed97373bbdc0031d093a6ad5c7e4659e14732fbc531a416c78b99 SHA512 2708fa431dc17cb5d4fe56f0c73c3089a213d8ff0bca19091ab4ebf26c4e416c0a500a980daa424bf16b54d0e72b004762f5260329189eb4f8e803de38bc0ace
-EBUILD cask-0.8.8.ebuild 955 BLAKE2B c959338134527e46b43b141efbc62bab1e2993d8f05f38be70fd6e02b71ea5de3cebc128dc054cc7f268bb5ff66330ffb0be42a3f54daba816f2ffac7827ae0a SHA512 43306a4fae0dcb248db13f41e4254950c96bbe7242107e422f588788e06650276d96b5c81b486f3e9b3486ce83bf90ed15e3c4f1bf81c25e02b02b33de942a0f
+DIST cask-0.9.0.gh.tar.gz 280606 BLAKE2B 17d216ac354c4b34d1663a23a0f7961c68acf544d64e911e54fac29a454a1b4737718903db637097c17dd28d083f91519ea7543a8ee57f2188d20d67cd604e3c SHA512 9e1e9eb0146504fc3ff2dc5358edc59b8157948df4698c7fbec14c28720458cd28b0b9ef9dc34b23a615e5b0a8ef843f9a9bdd9f7030aef797fa3df7864ae46a
+EBUILD cask-0.9.0.ebuild 1103 BLAKE2B 8096218e0873aef59ee5e51f03b9829a7d090696fa77dfe6372c3842c4795b6b792f99522c86ff8cf32dcc5199cea84c02aba07254bfe3de1403e7c64cc538ed SHA512 7ed75444ea526f615ed5d92b92917e2553780774bb8ceaef90f3a844468c8f6af8a655b8b2f6f69fc67c84b72dba8c731074342d1dbc40101cb6b58df6d8f655
 MISC metadata.xml 407 BLAKE2B 32b050dc6363c12a4acab60daf2bc6d197531c6f4d6e34fa2505e9044d38b3bbf4072e3a49509471770571a593a1b977fc47a77068185a5d6db5e15cbdd778a8 SHA512 795657b75bcec2758afcd4215b9281c0cc14c78fd834ac871e4cc18fe3ca91c92f721a084802db5e443ec1800f0def755d5ed5314318123fb948a9de8ba5c855
diff --git a/app-emacs/cask/cask-0.8.8.ebuild b/app-emacs/cask/cask-0.8.8.ebuild
deleted file mode 100644
index abf6cb9e8c5b..000000000000
--- a/app-emacs/cask/cask-0.8.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 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/"
-SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-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}"
-
-DOCS=( README.org cask_small.png )
-PATCHES=(
-	"${FILESDIR}"/${PN}-bin-launcher-fix.patch
-	"${FILESDIR}"/${PN}-no-bootstrap.patch
-)
-
-ELISP_REMOVE="${PN}-bootstrap.el
-	package-build-legacy.el package-recipe-legacy.el"
-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
-
-	dobin bin/${PN}
-}
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
diff --git a/app-emacs/cask/files/cask-bin-launcher-fix.patch b/app-emacs/cask/files/cask-bin-launcher-fix.patch
deleted file mode 100644
index 704d284a13dc..000000000000
--- a/app-emacs/cask/files/cask-bin-launcher-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/bin/cask b/bin/cask
-index 55d4d86..37a5c9c 100755
---- a/bin/cask
-+++ b/bin/cask
-@@ -39,17 +39,7 @@ case $subcommand in
- 	*)
- 		WHICH=${WHICH:-which}
- 		READLINK=$($WHICH readlink || true)
--		if [ "$(uname || true)" == "Darwin" ] ; then
--			READLINK=
--		fi
--		READLINK=${READLINK:-$($WHICH greadlink || true)}
--		if [ ! -z "$READLINK" ] ; then
--			SRCDIR__=$($READLINK -f "$CASK")
--		else
--			SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
--		fi
--		SRCDIR_=$(dirname "$SRCDIR__")
--		SRCDIR=$(dirname "$SRCDIR_")
--		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
-+		SRCDIR="@SITELISP@"
-+		"$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
- 		;;
- esac