gentoo auto-resync : 09:05:2023 - 23:42:14

4 files changed, 58 insertions, 4 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 30aeec0e6d0d..4c312d8c5686 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 8dacffe2b6c5..2c3f2e05ac36 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,6 +1,7 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
+AUX spacefm-dash.patch 1737 BLAKE2B 8101c05d2c4f268433d92244f7a78bb7ebef17714ee29139adb6a02ba6c7a60cb8a14a8bc2e1ef8e43b374fdbc20216cad68e1fe36d8ac2671da595f34761587 SHA512 4e4c89c546e48a1972877c02a9b635bb56fe91a1a2f561cff85c836d7f8f4cb8638b5852c13a29c707061959d501a6033c93eff57ac488a833a82f55ef9746f4
 AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
 EBUILD spacefm-1.0.6-r1.ebuild 1983 BLAKE2B d21ef66e6f1cb27179f2d783a4153c6b4fd65491f0fdc4379c0e99ab64d69b47264218779efad5fc25c37052d11a61d34643b71d7ad3a9eb3a1230d3ff61f816 SHA512 8eae7ba5c9665173c17529d9286cc5effa44294eec6622af51af7ce8421f36fe5cf0b997de57afd0e11a648d901309386cb92c29bbe8aa0ec01eb1bcdf2fdd6d
-EBUILD spacefm-9999.ebuild 1983 BLAKE2B d21ef66e6f1cb27179f2d783a4153c6b4fd65491f0fdc4379c0e99ab64d69b47264218779efad5fc25c37052d11a61d34643b71d7ad3a9eb3a1230d3ff61f816 SHA512 8eae7ba5c9665173c17529d9286cc5effa44294eec6622af51af7ce8421f36fe5cf0b997de57afd0e11a648d901309386cb92c29bbe8aa0ec01eb1bcdf2fdd6d
+EBUILD spacefm-1.0.6-r2.ebuild 2076 BLAKE2B a907694d20c6a2c726f87cdc036308a7e1f47763b653bfb1ea07cf38930ac6706debfc8f73f1ce7ff5f3ddaf42db3ed8af5f07c61c195376a73d39bc8e98e894 SHA512 2bf5321c8d27cfc2d71045db945842f7c647f992a8c0acbfbb3d1879e07a33e325bc682a3838d93413e559c6ec4524a93403c2c5c7734660fe2cd9b8029dfa4b
 MISC metadata.xml 1074 BLAKE2B bb1ae823905cb180e7a65c7c157b97fef75c6839f38f31451876e0697de50ba77a72aed90692fc6df87ede02cd0b2c5e9b7970c01bb2bcf2c598999ea49f2671 SHA512 486c0afcc309a15ed8dff31faa40f8b2f6bfc6d6a6a414661fba7acebbd5e58548e10e5e71185e9ed2ab34f151b7237685428f42b0a48ae8b103fab174b34e88
diff --git a/x11-misc/spacefm/files/spacefm-dash.patch b/x11-misc/spacefm/files/spacefm-dash.patch
new file mode 100644
index 000000000000..7b99fee4c320
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-dash.patch
@@ -0,0 +1,47 @@
+https://github.com/IgnorantGuru/spacefm/pull/813
+
+From 30fc0024a8f023277537db1e168294c21ca3b9b0 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 7 May 2023 07:31:56 -0700
+Subject: [PATCH] configure.ac: fix bad substitutions with dash
+
+Uses POSIX compatible substitutions that is not specific to bash.
+
+Gentoo-Issue: https://bugs.gentoo.org/891181
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 035da60e2..ec080e03f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,11 +40,11 @@ bash_path="$withval"
+ # bash v4.  SpaceFM runs bash as root and you WILL open root exploits if you
+ # disable this check, or run bash based on $PATH.
+ if test ! -z "$bash_path"; then
+-    if test ! "${bash_path:0:1}" = "/"; then
++    if test "${bash_path%"${bash_path#?}"}" != "/"; then
+         AC_MSG_ERROR([Fatal Error: Option --with-bash-path requires absolute path.])
+     fi
+     echo "Modifying spacefm-auth to use bash path..."
+-    bash_esc="${bash_path//\//\\/}"
++    bash_esc="$(printf %s "$bash_path" | sed "s|/|\\\/|g")"
+     sed "s/\(\/bin\/bash\)/$bash_esc/" src/spacefm-auth.bash > src/spacefm-auth
+ else
+     cp -pf src/spacefm-auth.bash src/spacefm-auth
+@@ -308,12 +308,12 @@ data/Makefile
+ ])
+ 
+ resolve_datadir="$(eval echo "$datadir")"
+-while [[ "${resolve_datadir:0:1}" == "$" ]]; do
++while test "${resolve_datadir%"${resolve_datadir#?}"}" = "\$"; do
+     resolve_datadir="$(eval echo "$resolve_datadir")"
+ done
+ 
+ resolve_htmldir="$(eval echo "$htmldir")"
+-while [[ "${resolve_htmldir:0:1}" == "$" ]]; do
++while test "${resolve_htmldir%"${resolve_htmldir#?}"}" = "\$"; do
+     resolve_htmldir="$(eval echo "$resolve_htmldir")"
+ done
+ 
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
index 0e63a546df0d..75f2ba9b252c 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-info optfeature xdg
+inherit autotools linux-info optfeature xdg
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.io/spacefm/"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -41,8 +41,14 @@ BDEPEND="dev-util/intltool
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
 	"${FILESDIR}"/${PN}-fno-common.patch
+	"${FILESDIR}"/${PN}-dash.patch #891181
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable startup-notification) \