summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs/emacs-bazel-mode')
-rw-r--r--app-emacs/emacs-bazel-mode/Manifest2
-rw-r--r--app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild40
-rw-r--r--app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20230511.ebuild47
-rw-r--r--app-emacs/emacs-bazel-mode/files/emacs-bazel-mode-bazel-test--directory.patch11
4 files changed, 48 insertions, 52 deletions
diff --git a/app-emacs/emacs-bazel-mode/Manifest b/app-emacs/emacs-bazel-mode/Manifest
index 65356b4188a0..7cf95f7ed04c 100644
--- a/app-emacs/emacs-bazel-mode/Manifest
+++ b/app-emacs/emacs-bazel-mode/Manifest
@@ -1 +1 @@
-DIST emacs-bazel-mode-0_p20220707.tar.gz 63821 BLAKE2B fadd0a26c02d0fd6ee92d34ca70cbb1ae3ea873317f97195849993ed94c55e404cfa1eae3f0e94eb81b80ec814dbf5e705ef98f1b23bfc7158a8a14ed32e6276 SHA512 cf654de1b46e562a090b933bc08e2651a5c88b9a01502413cc38f86d849cd1fd698e52d7ad737f4d0b43ea49180fb33eb200c5102ac57df1ca9b65bd175f431d
+DIST emacs-bazel-mode-0_p20230511.tar.gz 64614 BLAKE2B 87c53388df15ac73a6587ebdd73d7e1637db0d8ba68d53eadd4e4fabc11166ae2642a0e6607d543e65e61ebdc832ab12a6a2471cf52fe7ae3cefe4ffb9fdb6e7 SHA512 b169264ef62abf4d38da71ca0819575ecfc315291dfba88d887ab129000998fe1ff8b6427e4f275fe5fb108245987f909895829be367285102e4d8786217891f
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
deleted file mode 100644
index d25b697c94b8..000000000000
--- a/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20220707.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-H=8f7875998f233d248097006df224a33873bbc4f2
-NEED_EMACS=27.1
-
-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
- -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DOCS=( CONTRIBUTING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-bazel-test--directory.patch )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp-compile bazel.el
- elisp-make-autoload-file
-}
-
-src_test() {
- ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
- -l ./test.el -f ert-run-tests-batch-and-exit || die "Testing failed"
-}
-
-src_install() {
- rm test.el || die
-
- elisp_src_install
-}
diff --git a/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20230511.ebuild b/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20230511.ebuild
new file mode 100644
index 000000000000..37e03d1cf3db
--- /dev/null
+++ b/app-emacs/emacs-bazel-mode/emacs-bazel-mode-0_p20230511.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs major modes for the Bazel build system support"
+HOMEPAGE="https://bazel.build/
+ https://github.com/bazelbuild/emacs-bazel-mode/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/bazelbuild/${PN}.git"
+else
+ [[ ${PV} == *_p20230511 ]] && COMMIT=55cba9bd31c660d9b313a993979f012f35673ba2
+ SRC_URI="https://github.com/bazelbuild/${PN}/archive/${COMMIT}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${COMMIT}
+ KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test" # Tests fail.
+
+DOCS=( CONTRIBUTING.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}" -l test.el
+
+src_compile() {
+ elisp-compile bazel.el
+ elisp-make-autoload-file
+}
+
+src_test() {
+ TEST_SRCDIR="." TEST_WORKSPACE="." elisp_src_test
+}
+
+src_install() {
+ rm test.el || die
+
+ elisp_src_install
+}
diff --git a/app-emacs/emacs-bazel-mode/files/emacs-bazel-mode-bazel-test--directory.patch b/app-emacs/emacs-bazel-mode/files/emacs-bazel-mode-bazel-test--directory.patch
deleted file mode 100644
index 81cdce53e80f..000000000000
--- a/app-emacs/emacs-bazel-mode/files/emacs-bazel-mode-bazel-test--directory.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test.el
-+++ b/test.el
-@@ -47,7 +47,7 @@
-
- (defconst bazel-test--directory
- ;; https://docs.bazel.build/versions/2.2.0/test-encyclopedia.html#initial-conditions.
-- (substitute-in-file-name "$TEST_SRCDIR/$TEST_WORKSPACE/")
-+ (substitute-in-file-name "$PWD/")
- "Directory with data dependencies for this package.")
-
- ;;;; Helper macros