Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/helm/files/, app-emacs/helm/
Date: Sun, 04 Jul 2021 12:46:05
Message-Id: 1625402365.1162299d4546ec32ef26bf78816989761b591f4c.ulm@gentoo
1 commit: 1162299d4546ec32ef26bf78816989761b591f4c
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 3 17:16:15 2021 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 4 12:39:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1162299d
7
8 app-emacs/helm: Don't check for autoload file in emacs-helm.sh
9
10 Closes: https://bugs.gentoo.org/800177
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 .../helm/files/helm-3.6.0-no-autoload-check.patch | 24 ++++++++++++++++++++++
15 .../{helm-3.6.0.ebuild => helm-3.6.0-r1.ebuild} | 6 +++---
16 2 files changed, 27 insertions(+), 3 deletions(-)
17
18 diff --git a/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch b/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch
19 new file mode 100644
20 index 00000000000..463cc8ccbac
21 --- /dev/null
22 +++ b/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch
23 @@ -0,0 +1,24 @@
24 +https://bugs.gentoo.org/800177
25 +
26 +--- helm-3.6.0/emacs-helm.sh
27 ++++ helm-3.6.0/emacs-helm.sh
28 +@@ -137,19 +137,6 @@
29 +
30 + cd "${0%/*}" || exit 1
31 +
32 +-# Check if autoload file exists.
33 +-# It may be in a different directory if emacs-helm.sh is a symlink.
34 +-TRUENAME=$(find . -samefile "$0" -printf "%l")
35 +-if [ ! -z "$TRUENAME" ]; then
36 +- AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
37 +-else
38 +- AUTO_FILE="helm-autoloads.el"
39 +-fi
40 +-if [ ! -e "$AUTO_FILE" ]; then
41 +- echo No autoloads found, please run make first to generate autoload file
42 +- exit 1
43 +-fi
44 +-
45 +
46 + cat > $CONF_FILE <<EOF
47 + (setq initial-scratch-message (concat initial-scratch-message
48
49 diff --git a/app-emacs/helm/helm-3.6.0.ebuild b/app-emacs/helm/helm-3.6.0-r1.ebuild
50 similarity index 83%
51 rename from app-emacs/helm/helm-3.6.0.ebuild
52 rename to app-emacs/helm/helm-3.6.0-r1.ebuild
53 index f852381e535..2a631cd5686 100644
54 --- a/app-emacs/helm/helm-3.6.0.ebuild
55 +++ b/app-emacs/helm/helm-3.6.0-r1.ebuild
56 @@ -1,4 +1,4 @@
57 -# Copyright 2019 Gentoo Authors
58 +# Copyright 2019-2021 Gentoo Authors
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI=7
62 @@ -17,6 +17,7 @@ RDEPEND="app-emacs/async
63 app-emacs/popup"
64 BDEPEND="${RDEPEND}"
65
66 +PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
67 SITEFILE="50${PN}-gentoo.el"
68
69 src_compile() {
70 @@ -26,6 +27,5 @@ src_compile() {
71
72 src_install() {
73 elisp_src_install
74 - exeinto "${SITEETC}/${PN}"
75 - doexe emacs-helm.sh
76 + dobin emacs-helm.sh
77 }