@@ -, +, @@ 
---
 .../files/helm-3.6.0-autoloads-path.patch     | 19 +++++++++++++++++++
 ...helm-3.6.0.ebuild => helm-3.6.0-r1.ebuild} |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 app-emacs/helm/files/helm-3.6.0-autoloads-path.patch
 rename app-emacs/helm/{helm-3.6.0.ebuild => helm-3.6.0-r1.ebuild} (74%)
--- a/app-emacs/helm/files/helm-3.6.0-autoloads-path.patch	
+++ a/app-emacs/helm/files/helm-3.6.0-autoloads-path.patch	
@@ -0,0 +1,19 @@ 
+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
--- a/app-emacs/helm/helm-3.6.0.ebuild	
+++ a/app-emacs/helm/helm-3.6.0.ebuild	
@@ -1,4 +1,4 @@ 
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,8 +17,14 @@ RDEPEND="app-emacs/async
 	app-emacs/popup"
 BDEPEND="${RDEPEND}"
 
+PATCHES="${FILESDIR}/${P}-autoloads-path.patch"
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+	sed -i -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${PN}:g" emacs-helm.sh || die
+}
+
 src_compile() {
 	elisp-compile *.el
 	elisp-make-autoload-file
--