gentoo resync : 08.07.2021

6 files changed, 60 insertions, 10 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index cf0dbdd72d3f..c8bb0b0454eb 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index 2e13064523ec..5d1ed41fcc27 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -1,6 +1,8 @@
 AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553e27c445ebcf97d2a6b227d09c77a01dadce49e755d97cc572af4fc5358ca35866a4c12dd8caa61b6 SHA512 30d2ce1f8073f15439cc6d68620e9ca776ed74fdedfca4944d7d749891f33aa2ad1dccffdfb85f1e1049460015daf2104f0b9cd0f5b872c5d5c5ee1eccd25b21
-DIST helm-3.2.tar.gz 2285972 BLAKE2B b5385b805825d89ed87ba438ce830ce1e694cf842db590576b0ceaa2c110f5d0853b24211fdeebb77394c5ecca8460bcd52fe58240233ea10993504030328e9e SHA512 006e53f1984d38fa6305830179bc4ef04fa3007effa07685ddf479c1fbca547b6f8e99dd370f5653d57b2f8e519a54948a4730a0fdf9af8574cbfa27c09662d5
+AUX helm-3.6.0-no-autoload-check.patch 633 BLAKE2B 75033de5f3fbe817bffe3a0cd7310590f97f089914b5b554864f9e2246a35940a7478704e18fc9727e1d5ce3490d9f525f996f1e6d44a8e1b948b5fe890371e3 SHA512 5dab72baaf91e4df6b10043955c15101c0057ab0ae8489310dbfb1dfe86b801680573357983536987dbf03e463cd686f1ad3b90f65718039c1a5d8512d2f7ae1
+AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c897ead11abf6c7ad4280767f69c58edbb9cbe8528968e859d45e4ff76d13ac3ae4016a0818f674cb5b53d69441733343e958b SHA512 cb8192855f474cf43e3f2247f84d00ca6b2b190164c3a50940e09e771650db5860923256cb482cbd4f1d3f0b5bd964c688d6124a129c80850786c39245c034da
 DIST helm-3.6.0.tar.gz 2302677 BLAKE2B e9a83a1a4f46c1256090ff458ffc3cb158aaa320a067fb1474c9f62bd0cceaf98c53191790113c8af228d8a47fc7d2585a528ffed3e6e06030a4308f9c65e095 SHA512 1cfaf5cdef9203bb92b80c684b21ec7ca92df00aa2e82815e8f39c623648232405273fb272244d7d2b2756f4699f82f93e9a669a13a71da9410f0c0f9df30393
-EBUILD helm-3.2.ebuild 626 BLAKE2B d5005a4fb7cce4946a13a240b6cbaa83779f25f4c2aaeaa32eb42524dd2041c55852aa81580b4ec314871a40ac9bacf2722ad9c3de0eb5d781dc33511b536d82 SHA512 330e7950020a7b44f91d7336f8493024133908eba44642666e4a3df5cdfdc00a24cbb48e86674058477a84e4aa52b4ccde3fedb32089ab5484cbc09fa7932315
-EBUILD helm-3.6.0.ebuild 626 BLAKE2B d5005a4fb7cce4946a13a240b6cbaa83779f25f4c2aaeaa32eb42524dd2041c55852aa81580b4ec314871a40ac9bacf2722ad9c3de0eb5d781dc33511b536d82 SHA512 330e7950020a7b44f91d7336f8493024133908eba44642666e4a3df5cdfdc00a24cbb48e86674058477a84e4aa52b4ccde3fedb32089ab5484cbc09fa7932315
+DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
+EBUILD helm-3.6.0-r1.ebuild 654 BLAKE2B 5efa390436eb08d87393dcc3e7a9cc7726dfe49f687cdfac2e965f03557b575a3cd42432a0320c7e341ddf2a99d44aa5b48da7b915f2d92e7d6bdfabb4a803d4 SHA512 62b15b1121131970d81578879474f7053907b45955230a54640140fcfe1cec05f9118c58919f59326e09ea0f84a9ebcdc88e5d707719ae2f0a5180f121594ae1
+EBUILD helm-3.8.0.ebuild 654 BLAKE2B 3fcfd22dcfeb8da8cf66839b9314f7a41759dc52901fba35fb5fa0b8381e6e90667957f458ebea889e720bd78c12ccbb4d11a40448dd64e53fec6191042ab8e3 SHA512 a3911f1b610974313e94ed61275c7bd99195f0feae7f140ca631d6358a88325d0f2087e5f947907612399e2fad0d05055a36917fbbf54d2829c73d1c0fd7ac81
 MISC metadata.xml 821 BLAKE2B 8e6df42f4d0e908d9fbb032483f727d274ced02989c4bfb076c51f11db2c70663de22dc3efd4ce2f547a4be32c5c7e84a0b2e50c1b5e7e07a10409fe7d723315 SHA512 2d8fc21274c2858c8c656f6d93477dc81b6f9a31f4f10e02bcf7925d54e78f20cc792508e63bf61beee7d2bf01d0daee5cccc1cb7542e1f4812344f9baf8524e
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
new file mode 100644
index 000000000000..463cc8ccbacf
--- /dev/null
+++ b/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/800177
+
+--- helm-3.6.0/emacs-helm.sh
++++ helm-3.6.0/emacs-helm.sh
+@@ -137,19 +137,6 @@
+ 
+ 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
+-if [ ! -e "$AUTO_FILE" ]; then
+-    echo No autoloads found, please run make first to generate autoload file
+-    exit 1
+-fi
+-
+ 
+ cat > $CONF_FILE <<EOF
+ (setq initial-scratch-message (concat initial-scratch-message
diff --git a/app-emacs/helm/files/helm-3.8.0-no-autoload-check.patch b/app-emacs/helm/files/helm-3.8.0-no-autoload-check.patch
new file mode 100644
index 000000000000..4b415088dcc6
--- /dev/null
+++ b/app-emacs/helm/files/helm-3.8.0-no-autoload-check.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/800177
+
+--- helm-3.8.0/emacs-helm.sh
++++ helm-3.8.0/emacs-helm.sh
+@@ -137,19 +137,6 @@
+ 
+ cd "${0%/*}" || exit 1
+ 
+-# Check if autoload file exists.
+-# It may be in a different directory if emacs-helm.sh is a symlink.
+-TRUENAME=$(ls -l "$0" | awk '{print $11}')
+-if [ ! -z "$TRUENAME" ]; then
+-    AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
+-else
+-    AUTO_FILE="helm-autoloads.el"
+-fi
+-if [ ! -e "$AUTO_FILE" ]; then
+-    echo No autoloads found, please run make first to generate autoload file
+-    exit 1
+-fi
+-
+ 
+ cat > $CONF_FILE <<EOF
+ (setq initial-scratch-message (concat initial-scratch-message
diff --git a/app-emacs/helm/helm-3.2.ebuild b/app-emacs/helm/helm-3.6.0-r1.ebuild
index f852381e5353..2a631cd56862 100644
--- a/app-emacs/helm/helm-3.2.ebuild
+++ b/app-emacs/helm/helm-3.6.0-r1.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,6 +17,7 @@ RDEPEND="app-emacs/async
 	app-emacs/popup"
 BDEPEND="${RDEPEND}"
 
+PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
@@ -26,6 +27,5 @@ src_compile() {
 
 src_install() {
 	elisp_src_install
-	exeinto "${SITEETC}/${PN}"
-	doexe emacs-helm.sh
+	dobin emacs-helm.sh
 }
diff --git a/app-emacs/helm/helm-3.6.0.ebuild b/app-emacs/helm/helm-3.8.0.ebuild
index f852381e5353..6103dff04df4 100644
--- a/app-emacs/helm/helm-3.6.0.ebuild
+++ b/app-emacs/helm/helm-3.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp
 
@@ -17,6 +17,7 @@ RDEPEND="app-emacs/async
 	app-emacs/popup"
 BDEPEND="${RDEPEND}"
 
+PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
@@ -26,6 +27,5 @@ src_compile() {
 
 src_install() {
 	elisp_src_install
-	exeinto "${SITEETC}/${PN}"
-	doexe emacs-helm.sh
+	dobin emacs-helm.sh
 }