[gentoo-commits] repo/gentoo:master commit in: app-emacs/metamath-mode/, app-emacs/company-coq/, app-emacs/elpy/, ...

[Maciej Barć]

commit:     ff7d89fb05372a559134e51f6dee5de3ab45b488
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 20:29:45 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 20:31:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7d89fb

app-emacs: H -> COMMIT

Bug: https://github.com/pkgcore/pkgcheck/issues/536
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild     |  6 +++---
 app-emacs/ansi/ansi-0.4.1_p20211104.ebuild                    |  6 +++---
 app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild               |  8 ++++----
 app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild          |  8 ++++----
 app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild  |  8 ++++----
 app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild  |  8 ++++----
 app-emacs/bui/bui-1.2.1_p20210108.ebuild                      |  8 ++++----
 app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild   |  8 ++++----
 app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild      |  8 ++++----
 app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild   |  9 +++++----
 app-emacs/compat/compat-28.1.1.3.ebuild                       |  7 ++++---
 app-emacs/ctable/ctable-0.1.3.ebuild                          |  8 ++++----
 app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild        |  8 ++++----
 app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild        |  6 +++---
 app-emacs/deft/deft-08_p20210707.ebuild                       |  8 ++++----
 app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild              |  6 +++---
 app-emacs/diff-hl/diff-hl-1.9.0.ebuild                        |  6 +++---
 app-emacs/diff-hl/diff-hl-1.9.1.ebuild                        |  6 +++---
 app-emacs/diminish/diminish-0.46_pre20220128.ebuild           |  8 ++++----
 app-emacs/docker/docker-2.2.0_p20221012.ebuild                |  8 ++++----
 app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild      |  8 ++++----
 app-emacs/ebib/ebib-2.38.1.ebuild                             |  8 ++++----
 app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild                |  8 ++++----
 app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild      |  8 ++++----
 app-emacs/elpher/elpher-3.3.3.ebuild                          |  8 ++++----
 app-emacs/elpher/elpher-3.4.1.ebuild                          |  8 ++++----
 app-emacs/elpher/elpher-3.4.2.ebuild                          |  8 ++++----
 app-emacs/elpy/elpy-1.35.0_p20220321.ebuild                   |  6 +++---
 app-emacs/elpy/elpy-1.35.0_p20220627.ebuild                   |  6 +++---
 app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild            |  8 ++++----
 .../emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild      | 11 ++++++-----
 .../emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild         |  6 +++---
 app-emacs/emojify/emojify-1.2_p20210309.ebuild                |  6 +++---
 app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild          |  8 ++++----
 app-emacs/espuds/espuds-0.3.3_p20171111.ebuild                |  6 +++---
 app-emacs/esup/esup-0.7.1_p20220203.ebuild                    |  8 ++++----
 app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild                |  8 ++++----
 .../flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild             |  8 ++++----
 app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild       |  6 +++---
 app-emacs/graphql/graphql-0.1.2.ebuild                        |  6 +++---
 .../highlight-indentation-0.7.0_p20210221.ebuild              |  8 ++++----
 app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild            |  6 +++---
 app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild              |  6 +++---
 app-emacs/julia-mode/julia-mode-0.4_p20211023.ebuild          |  8 ++++----
 app-emacs/julia-repl/julia-repl-1.3.0_p20220225.ebuild        |  8 ++++----
 app-emacs/key-chord/key-chord-0.6_p20201222.ebuild            |  8 ++++----
 app-emacs/lean-mode/lean-mode-20211220-r1.ebuild              |  9 +++++----
 app-emacs/lean-mode/lean-mode-20220124-r1.ebuild              |  9 +++++----
 app-emacs/lean-mode/lean-mode-20220501.ebuild                 |  9 +++++----
 app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild            |  8 ++++----
 .../macrostep-geiser/macrostep-geiser-0.2.0_p20210717.ebuild  |  8 ++++----
 app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild      |  8 ++++----
 app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild            |  8 ++++----
 app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild            |  8 ++++----
 app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild        |  8 ++++----
 app-emacs/polymode/polymode-0.2.2_p20220322.ebuild            |  8 ++++----
 app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild              |  8 ++++----
 app-emacs/powerline/powerline-2.5_p20221110.ebuild            |  6 +++---
 app-emacs/powershell/powershell-0.3_pre20220402.ebuild        |  8 ++++----
 app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild    |  8 ++++----
 app-emacs/racket-mode/racket-mode-0_p20220804.ebuild          |  9 +++++----
 app-emacs/racket-mode/racket-mode-0_p20220830.ebuild          |  9 +++++----
 app-emacs/racket-mode/racket-mode-1_p20221122.ebuild          |  6 +++---
 app-emacs/racket-mode/racket-mode-1_p20221216.ebuild          |  6 +++---
 app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild          |  8 ++++----
 app-emacs/request/request-0.3.3_p20220318.ebuild              |  8 ++++----
 app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild  |  8 ++++----
 app-emacs/restclient/restclient-0_p20220426.ebuild            |  6 +++---
 app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild             |  6 +++---
 .../sunrise-commander/sunrise-commander-6_p20210927.ebuild    |  8 ++++----
 app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild  |  8 ++++----
 app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild       |  6 +++---
 app-emacs/web-server/web-server-0.1.2_p20210708.ebuild        |  8 ++++----
 73 files changed, 279 insertions(+), 271 deletions(-)

diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
index 14dc94b6fbe9..d58d556b2fff 100644
--- a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-[[ ${PV} == *_p20220325 ]] && H=65c496d3d1d1298345beb9845840067bffb2ffd8
+[[ ${PV} == *_p20220325 ]] && COMMIT=65c496d3d1d1298345beb9845840067bffb2ffd8
 NEED_EMACS=24.3
 
 inherit elisp font readme.gentoo-r1
 
 DESCRIPTION="Various icon fonts propertized for Emacs"
 HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
-SRC_URI="https://github.com/domtronn/${PN}.el/archive/${H}.tar.gz
+SRC_URI="https://github.com/domtronn/${PN}.el/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
index 6faffbab1883..23079d0bd5d5 100644
--- a/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
+++ b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=2367fba7b3b2340364a30cd6de7f3eb6bb9898a3
+COMMIT=2367fba7b3b2340364a30cd6de7f3eb6bb9898a3
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="Emacs library to convert strings into ansi"
 HOMEPAGE="https://github.com/rejeep/ansi.el/"
-SRC_URI="https://github.com/rejeep/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild b/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
index af3f87de6b95..ac9bcf417e26 100644
--- a/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
+++ b/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTICE: This package contains libraries: biblio-core and biblio
 
 EAPI=8
 
-H=517ec18f00f91b61481214b178f7ae0b8fbc499b
+COMMIT=517ec18f00f91b61481214b178f7ae0b8fbc499b
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="Browse and import bibliographic references with Emacs"
 HOMEPAGE="https://github.com/cpitclaudel/biblio.el/"
-SRC_URI="https://github.com/cpitclaudel/${PN}.el/archive/${H}.tar.gz
+SRC_URI="https://github.com/cpitclaudel/${PN}.el/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
index 8c438602742d..43b5ae68c519 100644
--- a/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
+++ b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=d9329dd90e5d4f629295e85898362d9682047898
+COMMIT=d9329dd90e5d4f629295e85898362d9682047898
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="GNU Emacs major mode for editing BNF grammars"
 HOMEPAGE="https://github.com/sergeyklay/bnf-mode/"
-SRC_URI="https://github.com/sergeyklay/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/sergeyklay/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild b/app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
index 76b9981351b5..00b3e7f9f68a 100644
--- a/app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
+++ b/app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=1e3b6a8aee9fa7c113468838c5b647080caf3703
+COMMIT=1e3b6a8aee9fa7c113468838c5b647080caf3703
 
 inherit elisp
 
 DESCRIPTION="Emacs tools for interacting with Boogie, Dafny and Z3 (SMT2)"
 HOMEPAGE="https://github.com/boogie-org/boogie-friends/"
-SRC_URI="https://github.com/boogie-org/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}/emacs"
+SRC_URI="https://github.com/boogie-org/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}/emacs"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild b/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
index df8519fe6a52..b83f54b471cc 100644
--- a/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
+++ b/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=8d1bafab5dffc3c63324b5306503943e67497ddc
+COMMIT=8d1bafab5dffc3c63324b5306503943e67497ddc
 
 inherit elisp
 
 DESCRIPTION="Emacs tools for interacting with Boogie, Dafny and Z3 (SMT2)"
 HOMEPAGE="https://github.com/boogie-org/boogie-friends/"
-SRC_URI="https://github.com/boogie-org/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}/emacs"
+SRC_URI="https://github.com/boogie-org/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}/emacs"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/bui/bui-1.2.1_p20210108.ebuild b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
index 8b85fbff9f3b..654144aae52e 100644
--- a/app-emacs/bui/bui-1.2.1_p20210108.ebuild
+++ b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=f3a137628e112a91910fd33c0cff0948fa58d470
+COMMIT=f3a137628e112a91910fd33c0cff0948fa58d470
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Buffer interface library for Emacs"
 HOMEPAGE="https://github.com/alezost/bui.el/"
-SRC_URI="https://github.com/alezost/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+SRC_URI="https://github.com/alezost/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild b/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
index 15a3bcbd6aad..e03ba27d4576 100644
--- a/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
+++ b/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=382db93374380e5db56f02934ee32bbe39159019
+COMMIT=382db93374380e5db56f02934ee32bbe39159019
 
 inherit elisp
 
 DESCRIPTION="Collection of extensions for Proof General's Coq mode"
 HOMEPAGE="https://github.com/cpitclaudel/company-coq/"
-SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild b/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
index 62082bd1ee13..f6cf92448147 100644
--- a/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
+++ b/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=a6e349e0131f676a885bd14c908fd26054b2df42
+COMMIT=a6e349e0131f676a885bd14c908fd26054b2df42
 
 inherit elisp
 
 DESCRIPTION="Collection of extensions for Proof General's Coq mode"
 HOMEPAGE="https://github.com/cpitclaudel/company-coq/"
-SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
index d3eaa3b2efde..1c07bce7854d 100644
--- a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=16ffeba5ef96c4c8e0cd39860b5402e25e304601
+COMMIT=16ffeba5ef96c4c8e0cd39860b5402e25e304601
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="In-buffer completion front-end"
 HOMEPAGE="https://company-mode.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/compat/compat-28.1.1.3.ebuild b/app-emacs/compat/compat-28.1.1.3.ebuild
index db3cbb13f321..32c0bd9c7966 100644
--- a/app-emacs/compat/compat-28.1.1.3.ebuild
+++ b/app-emacs/compat/compat-28.1.1.3.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=8
 
-H=2c3233c0e09ef34176787b6e3da4319751ad91e7
+COMMIT=2c3233c0e09ef34176787b6e3da4319751ad91e7
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="Compatibility libraries for Emacs"
 HOMEPAGE="https://git.sr.ht/~pkal/compat/"
-SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/ctable/ctable-0.1.3.ebuild b/app-emacs/ctable/ctable-0.1.3.ebuild
index 34cd9d8318f1..82ce64c750e6 100644
--- a/app-emacs/ctable/ctable-0.1.3.ebuild
+++ b/app-emacs/ctable/ctable-0.1.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=04dbcddeba1da1f39e885bc0d36240ff37d829e9  # ctable.el == 0.1.3 without tag
+COMMIT=04dbcddeba1da1f39e885bc0d36240ff37d829e9  # ctable.el == 0.1.3 without tag
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Table Component for Emacs Lisp"
 HOMEPAGE="https://github.com/kiwanami/emacs-ctable/"
-SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
index af7cee0f4b64..3de15793e662 100644
--- a/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
+++ b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=69f98f5a89451c0881d0abb34ad57dd71616006a
+COMMIT=69f98f5a89451c0881d0abb34ad57dd71616006a
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Extensible Emacs dashboard, with sections like bookmarks, agenda and more"
 HOMEPAGE="https://github.com/emacs-dashboard/emacs-dashboard/"
-SRC_URI="https://github.com/emacs-dashboard/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+SRC_URI="https://github.com/emacs-dashboard/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild b/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
index fd35159836a0..0083bf70a885 100644
--- a/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
+++ b/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=49e5603cac7d028bfc4c679161a20ca40327956c
+COMMIT=49e5603cac7d028bfc4c679161a20ca40327956c
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Extensible Emacs dashboard, with sections like bookmarks, agenda and more"
 HOMEPAGE="https://github.com/emacs-dashboard/emacs-dashboard/"
-SRC_URI="https://github.com/emacs-dashboard/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+SRC_URI="https://github.com/emacs-dashboard/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/app-emacs/deft/deft-08_p20210707.ebuild b/app-emacs/deft/deft-08_p20210707.ebuild
index 5dd07b4a89c5..06a1741dfa39 100644
--- a/app-emacs/deft/deft-08_p20210707.ebuild
+++ b/app-emacs/deft/deft-08_p20210707.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=28be94d89bff2e1c7edef7244d7c5ba0636b1296
+COMMIT=28be94d89bff2e1c7edef7244d7c5ba0636b1296
 
 inherit elisp
 
 DESCRIPTION="Quickly browse, filter and edit directories of plain text notes"
 HOMEPAGE="https://github.com/jrblevin/deft/"
-SRC_URI="https://github.com/jrblevin/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/jrblevin/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild b/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild
index 7dcd28497ed3..21d9ad811e10 100644
--- a/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild
+++ b/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-[[ ${PV} == *_p20220405 ]] && H=9d5dc2ffa1e4c7b43734b03dccb5ae6a80800569
+[[ ${PV} == *_p20220405 ]] && COMMIT=9d5dc2ffa1e4c7b43734b03dccb5ae6a80800569
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Highlight uncommitted changes, jump between and revert them selectively"
 HOMEPAGE="https://github.com/dgutov/diff-hl/"
-SRC_URI="https://github.com/dgutov/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/dgutov/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/diff-hl/diff-hl-1.9.0.ebuild b/app-emacs/diff-hl/diff-hl-1.9.0.ebuild
index e4beffabbc8c..07664295c01f 100644
--- a/app-emacs/diff-hl/diff-hl-1.9.0.ebuild
+++ b/app-emacs/diff-hl/diff-hl-1.9.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-[[ ${PV} == 1.9.0 ]] && H=37b00f3bad841e131d69442a89cbebc3041d996b
+[[ ${PV} == 1.9.0 ]] && COMMIT=37b00f3bad841e131d69442a89cbebc3041d996b
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Highlight uncommitted changes, jump between and revert them selectively"
 HOMEPAGE="https://github.com/dgutov/diff-hl/"
-SRC_URI="https://github.com/dgutov/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/dgutov/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/diff-hl/diff-hl-1.9.1.ebuild b/app-emacs/diff-hl/diff-hl-1.9.1.ebuild
index 81e8d69966ae..eb8f4aacd9e6 100644
--- a/app-emacs/diff-hl/diff-hl-1.9.1.ebuild
+++ b/app-emacs/diff-hl/diff-hl-1.9.1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-[[ ${PV} == 1.9.1 ]] && H=8f2e4eb345f0639c8fc41e3f7576f77ba6987655
+[[ ${PV} == 1.9.1 ]] && COMMIT=8f2e4eb345f0639c8fc41e3f7576f77ba6987655
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Highlight uncommitted changes, jump between and revert them selectively"
 HOMEPAGE="https://github.com/dgutov/diff-hl/"
-SRC_URI="https://github.com/dgutov/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/dgutov/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/diminish/diminish-0.46_pre20220128.ebuild b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
index ffd1f83da350..f90a4c11cf3c 100644
--- a/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
+++ b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=6b7e837b0cf0129e9d7d6abae48093cf599bb9e8
+COMMIT=6b7e837b0cf0129e9d7d6abae48093cf599bb9e8
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Hiding or abbreviation of the mode line displays (lighters)"
 HOMEPAGE="https://github.com/myrjola/diminish.el/"
-SRC_URI="https://github.com/myrjola/${PN}.el/archive/${H}.tar.gz
+SRC_URI="https://github.com/myrjola/${PN}.el/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/docker/docker-2.2.0_p20221012.ebuild b/app-emacs/docker/docker-2.2.0_p20221012.ebuild
index 7daf4f5cf869..77410ec5fc59 100644
--- a/app-emacs/docker/docker-2.2.0_p20221012.ebuild
+++ b/app-emacs/docker/docker-2.2.0_p20221012.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=3173403a2d51a2af36f7fdb0b7d2bec9e202e772
+COMMIT=3173403a2d51a2af36f7fdb0b7d2bec9e202e772
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Emacs integration for Docker"
 HOMEPAGE="https://github.com/Silex/docker.el/"
-SRC_URI="https://github.com/Silex/${PN}.el/archive/${H}.tar.gz
+SRC_URI="https://github.com/Silex/${PN}.el/archive/${COMMIT}.tar.gz
 	-> ${PN}.el-${PV}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild b/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild
index 8c3676406d92..13bd2bbc6001 100644
--- a/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild
+++ b/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=e9bdd137116fa2037ed60037b8421cf68c64888d
+COMMIT=e9bdd137116fa2037ed60037b8421cf68c64888d
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Opinionated megapack of modern color-themes for GNU Emacs"
 HOMEPAGE="https://github.com/doomemacs/themes/"
-SRC_URI="https://github.com/doomemacs/themes/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/themes-${H}
+SRC_URI="https://github.com/doomemacs/themes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/themes-${COMMIT}
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/ebib/ebib-2.38.1.ebuild b/app-emacs/ebib/ebib-2.38.1.ebuild
index 7406f52e2731..45bab472d9e4 100644
--- a/app-emacs/ebib/ebib-2.38.1.ebuild
+++ b/app-emacs/ebib/ebib-2.38.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=0e243a78f435038dda31953c5b48cbddf2a89e27
+COMMIT=0e243a78f435038dda31953c5b48cbddf2a89e27
 NEED_EMACS=26.1
 
 inherit elisp
@@ -11,9 +11,9 @@ inherit elisp
 DESCRIPTION="BibTeX database manager for Emacs"
 HOMEPAGE="https://joostkremers.github.io/ebib/
 	https://github.com/joostkremers/ebib/"
-SRC_URI="https://github.com/joostkremers/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild b/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
index 5d34ccddc3b0..f9c4f7bcbff9 100644
--- a/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
+++ b/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,9 +11,9 @@ DESCRIPTION="Emacs web feeds client"
 HOMEPAGE="https://github.com/skeeto/elfeed/"
 
 if [[ ${PV} == *_p* ]] ; then
-	H=162d7d545ed41c27967d108c04aa31f5a61c8e16
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
+	COMMIT=162d7d545ed41c27967d108c04aa31f5a61c8e16
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT}
 else
 	SRC_URI="https://github.com/skeeto/${PN}/releases/download/${PV}/${P}.tar"
 fi

diff --git a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
index 82a834e2aec9..9686e70fe3e4 100644
--- a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
+++ b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=e0d0466d83ec80ddb412bb1473908a21baad1ec3
+COMMIT=e0d0466d83ec80ddb412bb1473908a21baad1ec3
 NEED_EMACS=25
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Elixir files"
 HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
-SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/${H}.tar.gz
+SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-elixir-${H}
+S="${WORKDIR}"/emacs-elixir-${COMMIT}
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/elpher/elpher-3.3.3.ebuild b/app-emacs/elpher/elpher-3.3.3.ebuild
index 0213ce72cc37..944e4efca3e3 100644
--- a/app-emacs/elpher/elpher-3.3.3.ebuild
+++ b/app-emacs/elpher/elpher-3.3.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=ab75cff
+COMMIT=ab75cff
 NEED_EMACS=27.1
 
 inherit elisp
 
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
-SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/elpher/elpher-3.4.1.ebuild b/app-emacs/elpher/elpher-3.4.1.ebuild
index 121ce7504d4b..b483395d707d 100644
--- a/app-emacs/elpher/elpher-3.4.1.ebuild
+++ b/app-emacs/elpher/elpher-3.4.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=bf0dd36
+COMMIT=bf0dd36
 NEED_EMACS=27.1
 
 inherit elisp
 
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
-SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/elpher/elpher-3.4.2.ebuild b/app-emacs/elpher/elpher-3.4.2.ebuild
index 85a0c6189c32..e063d45937f0 100644
--- a/app-emacs/elpher/elpher-3.4.2.ebuild
+++ b/app-emacs/elpher/elpher-3.4.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=f117f2f
+COMMIT=f117f2f
 NEED_EMACS=27.1
 
 inherit elisp
 
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
-SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="amd64 x86"

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
index 603d63b8109f..dc6a90317b97 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=1746e7009000b7635c0ea6f1559018143aa61642
+COMMIT=1746e7009000b7635c0ea6f1559018143aa61642
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
@@ -15,9 +15,9 @@ inherit distutils-r1 elisp
 
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
index c894b87cc4af..be51e73e3a83 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=de31d30003c515c25ff7bfd3a361c70c298f78bb
+COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
@@ -15,9 +15,9 @@ inherit distutils-r1 elisp
 
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild b/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild
index 50a5d7e23baf..83e785be886c 100644
--- a/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild
+++ b/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=da93523e235529fa97d6f251319d9e1d6fc24a41
+COMMIT=da93523e235529fa97d6f251319d9e1d6fc24a41
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Async and await functions for Emacs Lisp"
 HOMEPAGE="https://github.com/skeeto/emacs-aio/"
-SRC_URI="https://github.com/skeeto/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/skeeto/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="Unlicense"
 SLOT="0"

diff --git a/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild b/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
index d282d5b5bf8e..bc5cca85f718 100644
--- a/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
+++ b/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=8f7875998f233d248097006df224a33873bbc4f2
+[[ ${PV} == *_p20220707 ]] && COMMIT=8f7875998f233d248097006df224a33873bbc4f2
 NEED_EMACS=27.1
 
 inherit elisp
@@ -11,16 +11,17 @@ inherit elisp
 DESCRIPTION="Emacs major modes for the Bazel build system support"
 HOMEPAGE="https://bazel.build/
 	https://github.com/bazelbuild/emacs-bazel-mode/"
-SRC_URI="https://github.com/bazelbuild/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/bazelbuild/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="Apache-2.0"
 KEYWORDS="amd64 ~x86"
 SLOT="0"
 
-DOCS=( CONTRIBUTING.md README.md )
 PATCHES=( "${FILESDIR}"/${PN}-bazel-test--directory.patch )
+
+DOCS=( CONTRIBUTING.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {

diff --git a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
index ea72f9d3da2c..a66a15d33fe2 100644
--- a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
+++ b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-H=388c8f753cfb99b4f82acbdff26bbe27189d2299
+COMMIT=388c8f753cfb99b4f82acbdff26bbe27189d2299
 NEED_EMACS=25
 PYTHON_COMPAT=( python3_{9..10} )
 
@@ -14,8 +14,8 @@ inherit elisp readme.gentoo-r1 python-single-r1
 
 DESCRIPTION="Jupyter notebook client in Emacs"
 HOMEPAGE="https://github.com/millejoh/emacs-ipython-notebook/"
-SRC_URI="https://github.com/millejoh/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/millejoh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/emojify/emojify-1.2_p20210309.ebuild b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
index 72e3d721f890..4474d180376c 100644
--- a/app-emacs/emojify/emojify-1.2_p20210309.ebuild
+++ b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-H=1b726412f19896abf5e4857d4c32220e33400b55
+COMMIT=1b726412f19896abf5e4857d4c32220e33400b55
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Display emojis in Emacs, like :smile: or plain ASCII ones like :)"
 HOMEPAGE="https://github.com/iqbalansari/emacs-emojify/"
-SRC_URI="https://github.com/iqbalansari/emacs-${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/iqbalansari/emacs-${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild b/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
index 42b73c5d0ccb..cc19bf69f970 100644
--- a/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
+++ b/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=948cf2faa10e085bda3739034ca5ea1912893433
+COMMIT=948cf2faa10e085bda3739034ca5ea1912893433
 NEED_EMACS=24.1
 
 inherit elisp
 
 DESCRIPTION="Async support for ERT"
 HOMEPAGE="https://github.com/rejeep/ert-async.el/"
-SRC_URI="https://github.com/rejeep/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild b/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
index 78445e7d3393..2e6287dddd44 100644
--- a/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
+++ b/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-H=78fc53feaf77a98d63894cd410faee2a18107b00
+COMMIT=78fc53feaf77a98d63894cd410faee2a18107b00
 
 inherit elisp
 
 DESCRIPTION="Common step definitions for Emacs Ecukes"
 HOMEPAGE="https://github.com/ecukes/espuds/"
-SRC_URI="https://github.com/ecukes/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/ecukes/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/esup/esup-0.7.1_p20220203.ebuild b/app-emacs/esup/esup-0.7.1_p20220203.ebuild
index e3d78933734e..f2594705df4c 100644
--- a/app-emacs/esup/esup-0.7.1_p20220203.ebuild
+++ b/app-emacs/esup/esup-0.7.1_p20220203.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f
+COMMIT=4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Benchmark Emacs Startup time without ever leaving it"
 HOMEPAGE="https://github.com/jschaf/esup/"
-SRC_URI="https://github.com/jschaf/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/jschaf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild b/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild
index c315217f2fc4..5cebaaa89aab 100644
--- a/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild
+++ b/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=b3c52964eda7c0267f6e3f0ad6c690c3a1e89da1
+COMMIT=b3c52964eda7c0267f6e3f0ad6c690c3a1e89da1
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Emacs support for the Fennel programming language"
 HOMEPAGE="https://git.sr.ht/~technomancy/fennel-mode/"
-SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${H}.tar.gz
+SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild b/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild
index 531b18f31247..18621b2070e5 100644
--- a/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild
+++ b/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=dc9a5de1cb3ee05db5794d824610959a1f603bc9
+COMMIT=dc9a5de1cb3ee05db5794d824610959a1f603bc9
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Emacs Flycheck backend for Nim language using nimsuggest"
 HOMEPAGE="https://github.com/yuutayamada/flycheck-nimsuggest/"
-SRC_URI="https://github.com/yuutayamada/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/yuutayamada/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64"

diff --git a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild b/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
index 38c255fda39b..a025cb964cbb 100644
--- a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
+++ b/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=b3aa4c53fc9e98648b25ad036e657632ae2fe192
+COMMIT=b3aa4c53fc9e98648b25ad036e657632ae2fe192
 NEED_EMACS=25
 
 inherit elisp
 
 DESCRIPTION="Support for the F# programming language"
 HOMEPAGE="https://github.com/fsharp/emacs-fsharp-mode/"
-SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/app-emacs/graphql/graphql-0.1.2.ebuild b/app-emacs/graphql/graphql-0.1.2.ebuild
index 1ea6269125e9..92e657553313 100644
--- a/app-emacs/graphql/graphql-0.1.2.ebuild
+++ b/app-emacs/graphql/graphql-0.1.2.ebuild
@@ -4,15 +4,15 @@
 EAPI=8
 
 NEED_EMACS=25
-[[ "${PV}" == 0.1.2 ]] && H=67237f284f2dfb94f3cfba672ff64a37e1cb860f
+[[ "${PV}" == 0.1.2 ]] && COMMIT=67237f284f2dfb94f3cfba672ff64a37e1cb860f
 
 inherit elisp
 
 DESCRIPTION="GraphQL utilities"
 HOMEPAGE="https://github.com/vermiculus/graphql.el/"
-SRC_URI="https://github.com/vermiculus/graphql.el/archive/${H}.tar.gz
+SRC_URI="https://github.com/vermiculus/graphql.el/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild b/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild
index 0efeec0e91c5..551344ee934e 100644
--- a/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild
+++ b/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=d88db4248882da2d4316e76ed673b4ac1fa99ce3
+COMMIT=d88db4248882da2d4316e76ed673b4ac1fa99ce3
 MY_PN=Highlight-Indentation-for-Emacs
 
 inherit elisp
 
 DESCRIPTION="Minor modes to highlight indentation guides in Emacs"
 HOMEPAGE="https://github.com/antonj/Highlight-Indentation-for-Emacs/"
-SRC_URI="https://github.com/antonj/${MY_PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${H}
+SRC_URI="https://github.com/antonj/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
index f5ebafdd3261..1bfb98229348 100644
--- a/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
+++ b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=600b8183ed0be8668dcc548cc2c8cb94b001363b
+COMMIT=600b8183ed0be8668dcc548cc2c8cb94b001363b
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="More friendly interface for ivy"
 HOMEPAGE="https://github.com/Yevgnen/ivy-rich/"
-SRC_URI="https://github.com/Yevgnen/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/Yevgnen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild b/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild
index 08994277ae3b..fcbd8dfe93fa 100644
--- a/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild
+++ b/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=071c1c29bac30351ad338136f2b625e5601365cd
+COMMIT=071c1c29bac30351ad338136f2b625e5601365cd
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for editing jq queries"
 HOMEPAGE="https://github.com/ljos/jq-mode/"
-SRC_URI="https://github.com/ljos/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/ljos/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/julia-mode/julia-mode-0.4_p20211023.ebuild b/app-emacs/julia-mode/julia-mode-0.4_p20211023.ebuild
index 6a1a089fe054..3c56c7fb55b2 100644
--- a/app-emacs/julia-mode/julia-mode-0.4_p20211023.ebuild
+++ b/app-emacs/julia-mode/julia-mode-0.4_p20211023.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=47f43f7d839019cac3ba6559d93b29487ca118cb
+COMMIT=47f43f7d839019cac3ba6559d93b29487ca118cb
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for the Julia programming language"
 HOMEPAGE="https://github.com/JuliaEditorSupport/julia-emacs/"
-SRC_URI="https://github.com/JuliaEditorSupport/julia-emacs/archive/${H}.tar.gz
+SRC_URI="https://github.com/JuliaEditorSupport/julia-emacs/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-S="${WORKDIR}"/julia-emacs-${H}
+S="${WORKDIR}"/julia-emacs-${COMMIT}
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/julia-repl/julia-repl-1.3.0_p20220225.ebuild b/app-emacs/julia-repl/julia-repl-1.3.0_p20220225.ebuild
index b52af57974bd..c4ae8349fa38 100644
--- a/app-emacs/julia-repl/julia-repl-1.3.0_p20220225.ebuild
+++ b/app-emacs/julia-repl/julia-repl-1.3.0_p20220225.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=6c1d63511fb2b3b3f2e342eff6a375d78be6c12c
+COMMIT=6c1d63511fb2b3b3f2e342eff6a375d78be6c12c
 NEED_EMACS=25.1
 
 inherit optfeature elisp
 
 DESCRIPTION="Run an inferior Julia REPL in a terminal inside Emacs"
 HOMEPAGE="https://github.com/tpapp/julia-repl/"
-SRC_URI="https://github.com/tpapp/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/tpapp/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
index 23538d1182f4..be158482b121 100644
--- a/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
+++ b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=7f7fd7c5bd2b996fa054779357e1566f7989e07d
+COMMIT=7f7fd7c5bd2b996fa054779357e1566f7989e07d
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="Map pairs of simultaneously pressed keys to commands"
 HOMEPAGE="https://github.com/emacsorphanage/key-chord/"
-SRC_URI="https://github.com/emacsorphanage/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/emacsorphanage/${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild b/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
index d91061721bf4..0f6432320d6c 100644
--- a/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
+++ b/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=a4205749d20a09871f0951c34f919d4ee5fbdb55
+[[ ${PV} == 20211220 ]] && COMMIT=a4205749d20a09871f0951c34f919d4ee5fbdb55
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Emacs mode for the Lean 3 theorem prover"
 HOMEPAGE="https://github.com/leanprover/lean-mode/"
-SRC_URI="https://github.com/leanprover/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+SRC_URI="https://github.com/leanprover/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild b/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
index b24391f06ca8..96741d7f7878 100644
--- a/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
+++ b/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=c1c68cc946eb31b6ba8faefdceffce1f77ca52df
+[[ ${PV} == 20220124 ]] && COMMIT=c1c68cc946eb31b6ba8faefdceffce1f77ca52df
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Emacs mode for the Lean 3 theorem prover"
 HOMEPAGE="https://github.com/leanprover/lean-mode/"
-SRC_URI="https://github.com/leanprover/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+SRC_URI="https://github.com/leanprover/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/lean-mode/lean-mode-20220501.ebuild b/app-emacs/lean-mode/lean-mode-20220501.ebuild
index 34d78fe6a7fc..4e7256d4f3e9 100644
--- a/app-emacs/lean-mode/lean-mode-20220501.ebuild
+++ b/app-emacs/lean-mode/lean-mode-20220501.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=362bc6fa3efb1874c525ed6b4b6f24f76af22596
+[[ ${PV} == 20220501 ]] && COMMIT=362bc6fa3efb1874c525ed6b4b6f24f76af22596
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Emacs mode for the Lean 3 theorem prover"
 HOMEPAGE="https://github.com/leanprover/lean-mode/"
-SRC_URI="https://github.com/leanprover/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/leanprover/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
index b87fe3e08a74..14231ad78894 100644
--- a/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=9957623d93b13fabaca8ba35b85da8fcceaeef69
+COMMIT=9957623d93b13fabaca8ba35b85da8fcceaeef69
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Emacs client/library for the Language Server Protocol"
 HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
-SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64"

diff --git a/app-emacs/macrostep-geiser/macrostep-geiser-0.2.0_p20210717.ebuild b/app-emacs/macrostep-geiser/macrostep-geiser-0.2.0_p20210717.ebuild
index 9970251ddf86..d20ba3f6d041 100644
--- a/app-emacs/macrostep-geiser/macrostep-geiser-0.2.0_p20210717.ebuild
+++ b/app-emacs/macrostep-geiser/macrostep-geiser-0.2.0_p20210717.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=f6a2d5bb96ade4f23df557649af87ebd0cc45125
+COMMIT=f6a2d5bb96ade4f23df557649af87ebd0cc45125
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="Emacs macrostep back-end powered by geiser"
 HOMEPAGE="https://github.com/nbfalcon/macrostep-geiser/"
-SRC_URI="https://github.com/nbfalcon/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/nbfalcon/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild b/app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild
index 4bb809ed1bad..0a6501916251 100644
--- a/app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild
+++ b/app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=85bd63b88378e9f2dee2f7d5585ec6610bf098a6
+COMMIT=85bd63b88378e9f2dee2f7d5585ec6610bf098a6
 
 inherit elisp
 
 DESCRIPTION="Major GNU Emacs mode for metamath files"
 HOMEPAGE="https://github.com/samrushing/metamath-mode/"
-SRC_URI="https://github.com/samrushing/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/samrushing/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild b/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild
index afa42d5ff7b6..77e93b430f47 100644
--- a/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild
+++ b/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=744e076f0bea1c5ddc49f92397d9aa98ffa7eff8
+COMMIT=744e076f0bea1c5ddc49f92397d9aa98ffa7eff8
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for the Nim programming language support"
 HOMEPAGE="https://github.com/nim-lang/nim-mode/"
-SRC_URI="https://github.com/nim-lang/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/nim-lang/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64"

diff --git a/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild b/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild
index 461c04cef26d..f4256182de35 100644
--- a/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild
+++ b/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=7ae84dc3257637af7334101456dafe1759c6b68a
+COMMIT=7ae84dc3257637af7334101456dafe1759c6b68a
 
 inherit elisp
 
 DESCRIPTION="Dynamic, local advice for Emacs-Lisp code"
 HOMEPAGE="https://github.com/nicferrier/emacs-noflet/"
-SRC_URI="https://github.com/nicferrier/emacs-${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/nicferrier/emacs-${PN}/archive/${COMMIT}.tar.gz
 			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild b/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
index b4dfd41e3c9f..62eee58cd274 100644
--- a/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
+++ b/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=fe42da60ad68e806af1677210249caccd7b99451
+COMMIT=fe42da60ad68e806af1677210249caccd7b99451
 NEED_EMACS=25.1  # Needs Emacs >=25.1 because of the "let-alist" function.
 
 inherit autotools elisp
 
 DESCRIPTION="Emacs Lisp support library for PDF documents"
 HOMEPAGE="https://github.com/vedang/pdf-tools/"
-SRC_URI="https://github.com/vedang/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/vedang/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild b/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
index c41d8cbfa476..b9c030d247ee 100644
--- a/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
+++ b/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=2094c92403fe395dfb2b8b2521da1012a966e9ab
+COMMIT=2094c92403fe395dfb2b8b2521da1012a966e9ab
 NEED_EMACS=25
 
 inherit elisp
 
 DESCRIPTION="Framework for Multiple Major Modes in Emacs"
 HOMEPAGE="https://github.com/polymode/polymode/"
-SRC_URI="https://github.com/polymode/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/polymode/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild b/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild
index e92c55a9782f..38abd67d34b1 100644
--- a/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild
+++ b/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=179cc126b363f72ca12fab1e0dc462ce0ee79742
+COMMIT=179cc126b363f72ca12fab1e0dc462ce0ee79742
 
 inherit elisp
 
 DESCRIPTION="Show tooltip at point"
 HOMEPAGE="https://github.com/pitkali/pos-tip/"
-SRC_URI="https://github.com/pitkali/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/pitkali/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/powerline/powerline-2.5_p20221110.ebuild b/app-emacs/powerline/powerline-2.5_p20221110.ebuild
index f1e953e1fbb1..ad42fcd4eb8b 100644
--- a/app-emacs/powerline/powerline-2.5_p20221110.ebuild
+++ b/app-emacs/powerline/powerline-2.5_p20221110.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-[[ ${PV} = *_p20221110 ]] && H=c35c35bdf5ce2d992882c1f06f0f078058870d4a
+[[ ${PV} = *_p20221110 ]] && COMMIT=c35c35bdf5ce2d992882c1f06f0f078058870d4a
 
 inherit elisp
 
 DESCRIPTION="GNU Emacs version of the Vim powerline"
 HOMEPAGE="https://github.com/milkypostman/powerline/"
-SRC_URI="https://github.com/milkypostman/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/milkypostman/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/powershell/powershell-0.3_pre20220402.ebuild b/app-emacs/powershell/powershell-0.3_pre20220402.ebuild
index 6d53582ddb59..c02c4e4c8902 100644
--- a/app-emacs/powershell/powershell-0.3_pre20220402.ebuild
+++ b/app-emacs/powershell/powershell-0.3_pre20220402.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=77b27faf8a292f1dc9f54c872241dc53b6791bf1
+COMMIT=77b27faf8a292f1dc9f54c872241dc53b6791bf1
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="GNU Emacs mode for editing and running PowerShell code"
 HOMEPAGE="https://github.com/jschaf/powershell.el/"
-SRC_URI="https://github.com/jschaf/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+SRC_URI="https://github.com/jschaf/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
index d5a97d174292..62df3fe03de3 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=fe8b9fccb3690178be7fc455202c941c4c674ac3
+COMMIT=fe8b9fccb3690178be7fc455202c941c4c674ac3
 
 inherit wrapper elisp
 
 DESCRIPTION="A generic interface for proof assistants"
 HOMEPAGE="https://proofgeneral.github.io/"
-SRC_URI="https://github.com/ProofGeneral/PG/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/PG-${H}"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/PG-${COMMIT}"
 
 LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
 SLOT="0"

diff --git a/app-emacs/racket-mode/racket-mode-0_p20220804.ebuild b/app-emacs/racket-mode/racket-mode-0_p20220804.ebuild
index 74d7868ca768..2f496b92f20d 100644
--- a/app-emacs/racket-mode/racket-mode-0_p20220804.ebuild
+++ b/app-emacs/racket-mode/racket-mode-0_p20220804.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=89238bde54b3e9b6c85c6ce8437aa44a73fb71e1
+[[ ${PV} == *_p20220804 ]] && COMMIT=89238bde54b3e9b6c85c6ce8437aa44a73fb71e1
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
-SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/racket-mode/racket-mode-0_p20220830.ebuild b/app-emacs/racket-mode/racket-mode-0_p20220830.ebuild
index ad1b245c3ecd..d12b422e6d1a 100644
--- a/app-emacs/racket-mode/racket-mode-0_p20220830.ebuild
+++ b/app-emacs/racket-mode/racket-mode-0_p20220830.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=db7baebe64d5c1620c06e9bfca267a81ddc64aca
+[[ ${PV} == *_p20220830 ]] && COMMIT=db7baebe64d5c1620c06e9bfca267a81ddc64aca
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
-SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild b/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
index b2da6ed1f053..7e076da878ad 100644
--- a/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
+++ b/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-H=b07ffc1541c848a85d8c1afa807ed06cb8e81228
+[[ ${PV} == *_p20221122 ]] && COMMIT=b07ffc1541c848a85d8c1afa807ed06cb8e81228
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
-SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild b/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild
index 0ed04fab585d..ec05da2fd183 100644
--- a/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild
+++ b/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-H=b2fdf248682364d2a9b8f7e97dd98ed02454d7bb
+[[ ${PV} == *_p20221216 ]] && COMMIT=b2fdf248682364d2a9b8f7e97dd98ed02454d7bb
 NEED_EMACS=25.1
 
 inherit elisp
 
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
-SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
index 0f07259a9572..5d2554ddc341 100644
--- a/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
+++ b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f
+COMMIT=977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="Major mode for editing Raku code"
 HOMEPAGE="https://github.com/Raku/raku-mode/"
-SRC_URI="https://github.com/Raku/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/Raku/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/request/request-0.3.3_p20220318.ebuild b/app-emacs/request/request-0.3.3_p20220318.ebuild
index c9e73cc43e62..c581543dc259 100644
--- a/app-emacs/request/request-0.3.3_p20220318.ebuild
+++ b/app-emacs/request/request-0.3.3_p20220318.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=c769cf33f2ac0a1a9798b508935c4b260e856ab5
+COMMIT=c769cf33f2ac0a1a9798b508935c4b260e856ab5
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="Compatible layer for URL request"
 HOMEPAGE="https://github.com/tkf/emacs-request/"
-SRC_URI="https://github.com/tkf/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+SRC_URI="https://github.com/tkf/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild b/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
index bf64acbbe06f..4dd5a9ee9e0c 100644
--- a/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
+++ b/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=2aae2fbd4971dff965c758ec19688780ed7bff21
+COMMIT=2aae2fbd4971dff965c758ec19688780ed7bff21
 NEED_EMACS=26.1
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for ReScript"
 HOMEPAGE="https://github.com/jjlee/rescript-mode/"
-SRC_URI="https://github.com/jjlee/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/jjlee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/restclient/restclient-0_p20220426.ebuild b/app-emacs/restclient/restclient-0_p20220426.ebuild
index 9ed501a31d41..0541423f4451 100644
--- a/app-emacs/restclient/restclient-0_p20220426.ebuild
+++ b/app-emacs/restclient/restclient-0_p20220426.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-H=ae79e7dd283890072da69b8f48aeec1afd0d9442
+COMMIT=ae79e7dd283890072da69b8f48aeec1afd0d9442
 NEED_EMACS=24.4
 
 inherit elisp
 
 DESCRIPTION="HTTP REST client tool for GNU Emacs"
 HOMEPAGE="https://github.com/pashky/restclient.el/"
-SRC_URI="https://github.com/pashky/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${H}
+SRC_URI="https://github.com/pashky/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="public-domain"
 SLOT="0"

diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
index c0d780397b3e..bccd84822897 100644
--- a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-[[ ${PV} == 0.16 ]] && H=7d06d19a31e888b932da6c8202ff2c73f42703a1
+[[ ${PV} == 0.16 ]] && COMMIT=7d06d19a31e888b932da6c8202ff2c73f42703a1
 
 inherit elisp
 
 DESCRIPTION="Emacs mode to ease editing of RPM spec files"
 HOMEPAGE="https://www.emacswiki.org/emacs/RpmSpecMode
 	https://github.com/stigbjorlykke/rpm-spec-mode/"
-SRC_URI="https://github.com/stigbjorlykke/${PN}/archive/${H}.tar.gz
+SRC_URI="https://github.com/stigbjorlykke/${PN}/archive/${COMMIT}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild b/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild
index 2bc5be9f966a..81dcb4c3ae5a 100644
--- a/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild
+++ b/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTICE: Check version of sunrise-commander in it's "Cask" & "sunrise.el".
 
 EAPI=8
 
-H=16e6df7e86c7a383fb4400fae94af32baf9cb24e
+COMMIT=16e6df7e86c7a383fb4400fae94af32baf9cb24e
 NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="Twin-pane file manager for Emacs inspired by Midnight Commander"
 HOMEPAGE="https://www.emacswiki.org/emacs/Sunrise_Commander/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~x86"

diff --git a/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild b/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild
index cf6f3082dbae..653c3595db39 100644
--- a/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild
+++ b/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=8d9fe251d8d38b223d643df975876356ddfc1b98
+COMMIT=8d9fe251d8d38b223d643df975876356ddfc1b98
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="Offer a customizable visual way to choose a window to switch to"
 HOMEPAGE="https://github.com/dimitri/switch-window/"
-SRC_URI="https://github.com/dimitri/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/dimitri/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="WTFPL-2"
 SLOT="0"

diff --git a/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild b/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
index 1ea699ec7610..f7f39120a96d 100644
--- a/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
+++ b/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=097f5be6e0c228790a6e78ffee5f0c599cb58b20
+COMMIT=097f5be6e0c228790a6e78ffee5f0c599cb58b20
 NEED_EMACS=25.1
 
 inherit elisp
@@ -11,8 +11,8 @@ inherit elisp
 DESCRIPTION="Transient commands abstraction for GNU Emacs"
 HOMEPAGE="https://magit.vc/manual/transient
 	https://github.com/magit/transient"
-SRC_URI="https://github.com/magit/transient/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/magit/transient/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"

diff --git a/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild b/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild
index cbb8ecd21cec..6627cf005407 100644
--- a/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild
+++ b/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=6357a1c2d1718778503f7ee0909585094117525b
+COMMIT=6357a1c2d1718778503f7ee0909585094117525b
 NEED_EMACS=24.1
 
 inherit elisp
 
 DESCRIPTION="Web server running Emacs Lisp handlers"
 HOMEPAGE="https://github.com/eschulte/emacs-web-server/"
-SRC_URI="https://github.com/eschulte/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${H}
+SRC_URI="https://github.com/eschulte/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"