Attachment #721267 for bug #800177




https://bugs.gentoo.org/800177

--- helm-3.6.0/emacs-helm.sh
+++ helm-3.6.0/emacs-helm.sh
@@ -138,13 +138,7 @@
 cd "${0%/*}" || exit 1
 
 # Check if autoload file exists.
-# It may be in a different directory if emacs-helm.sh is a symlink.
-TRUENAME=$(find . -samefile "$0" -printf "%l")
-if [ ! -z "$TRUENAME" ]; then
-    AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
-else
-    AUTO_FILE="helm-autoloads.el"
-fi
+AUTO_FILE="@SITELISP@/helm-autoloads.el"
 if [ ! -e "$AUTO_FILE" ]; then
     echo No autoloads found, please run make first to generate autoload file
     exit 1

Lines 1-4 Link Here

(-)a/app-emacs/helm/helm-3.6.0.ebuild (-2 / +7 lines)
1	# Copyright 2019 Gentoo Authors	1	# Copyright 2019-2021 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
Lines 17-24 RDEPEND="app-emacs/async Link Here
17	app-emacs/popup"	17	app-emacs/popup"
18	BDEPEND="${RDEPEND}"	18	BDEPEND="${RDEPEND}"
19		19
		20	PATCHES="${FILESDIR}/${P}-autoloads-path.patch"
20	SITEFILE="50${PN}-gentoo.el"	21	SITEFILE="50${PN}-gentoo.el"
21		22
		23	src_prepare() {
		24	elisp_src_prepare
		25	sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${PN}:g" emacs-helm.sh \|\| die
		26	}
		27
22	src_compile() {	28	src_compile() {
23	elisp-compile *.el	29	elisp-compile *.el
24	elisp-make-autoload-file	30	elisp-make-autoload-file
25	-

Return to bug 800177

Line 0 Link Here

(-)a/app-emacs/helm/files/helm-3.6.0-autoloads-path.patch (+19 lines)
	1	https://bugs.gentoo.org/800177
	2
	3	--- helm-3.6.0/emacs-helm.sh
	4	+++ helm-3.6.0/emacs-helm.sh
	5	@@ -138,13 +138,7 @@
	6	cd "${0%/*}" \|\| exit 1
	7
	8	# Check if autoload file exists.
	9	-# It may be in a different directory if emacs-helm.sh is a symlink.
	10	-TRUENAME=$(find . -samefile "$0" -printf "%l")
	11	-if [ ! -z "$TRUENAME" ]; then
	12	- AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
	13	-else
	14	- AUTO_FILE="helm-autoloads.el"
	15	-fi
	16	+AUTO_FILE="@SITELISP@/helm-autoloads.el"
	17	if [ ! -e "$AUTO_FILE" ]; then
	18	echo No autoloads found, please run make first to generate autoload file
	19	exit 1