gentoo resync : 25.11.2020

6 files changed, 178 insertions, 133 deletions

diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 7c393aa2272f..ade2b53d09d9 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,5 +1,6 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
+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.ebuild 2565 BLAKE2B f5a2594fe00d590ce4f3dc927398d85ea74825c8c8ab061a7cf79b726a1cac3e562f3fc66329c4492cc451cdf43fed47a4b17a193b045b7cc393222b54285a5c SHA512 8fede0c02c8c71e6d3b59af9f288ed01452fde2d091d24d827c950a666e706b4b7461d16b05b2b7c9d078c1d2029320a8de77da4d77ce9e4305ac608dba9cb14
-EBUILD spacefm-9999.ebuild 2567 BLAKE2B 8583998e7a0dfbca946e0abdfaf909d8f4da5af6cc008a8ca5c769eb86988a9b899e248445ddb9bb6b8d38262232e6e8b3b52411c2bca2f438504aa6e8a96660 SHA512 bc3346341a2ba0f330f31caba18bf2434207d84d490b3f9ac2034452dba96540b6c8dd1fac147ac43e8a303e341b37c80077612d7fb4119c1487eefc21e69256
-MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
+EBUILD spacefm-1.0.6-r1.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
+EBUILD spacefm-9999.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
+MISC metadata.xml 1073 BLAKE2B 3b14ed88b877532bc7d856e9ad7590207502695685a0ae303ff81dbefa177ad566a81762395a905302a7cdefa753f4428becfd2a6cd0a09fb8797e73fc047f08 SHA512 699c306adee51a68456e787fcc313a2232e95545cbee5d9b2b46a45da7823e166ffbc725356636692c47f78311c2fbf5fdabd4d2e5df3712451975b1bfc889a1
diff --git a/x11-misc/spacefm/files/spacefm-fno-common.patch b/x11-misc/spacefm/files/spacefm-fno-common.patch
new file mode 100644
index 000000000000..4cdc834a8277
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-fno-common.patch
@@ -0,0 +1,86 @@
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -52,6 +52,24 @@
+ /* Dirty hack: check whether we are under LXDE or not */
+ #define is_under_LXDE()     (g_getenv( "_LXSESSION_PID" ) != NULL)
+ 
++char* settings_terminal_su = NULL;
++char* settings_graphical_su = NULL;
++GList* xset_cmd_history = NULL;
++XSet* evt_win_focus = NULL;
++XSet* evt_win_move = NULL;
++XSet* evt_win_click = NULL;
++XSet* evt_win_key = NULL;
++XSet* evt_win_close = NULL;
++XSet* evt_pnl_show = NULL;
++XSet* evt_pnl_focus = NULL;
++XSet* evt_pnl_sel = NULL;
++XSet* evt_tab_new = NULL;
++XSet* evt_tab_chdir = NULL;
++XSet* evt_tab_focus = NULL;
++XSet* evt_tab_close = NULL;
++XSet* evt_device = NULL;
++
++
+ AppSettings app_settings = {0};
+ /* const gboolean singleInstance_default = TRUE; */
+ const gboolean show_hidden_files_default = FALSE;
+--- a/src/settings.h
++++ b/src/settings.h
+@@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir();
+ ///////////////////////////////////////////////////////////////////////////////
+ //MOD extra settings below
+ 
+-GList* xsets;
++extern GList* xsets;
+ 
+ enum {
+     XSET_B_UNSET,
+@@ -311,22 +311,22 @@ typedef struct
+ } XMenuItem;
+ 
+ // cache these for speed in event handlers
+-XSet* evt_win_focus;
+-XSet* evt_win_move;
+-XSet* evt_win_click;
+-XSet* evt_win_key;
+-XSet* evt_win_close;
+-XSet* evt_pnl_show;
+-XSet* evt_pnl_focus;
+-XSet* evt_pnl_sel;
+-XSet* evt_tab_new;
+-XSet* evt_tab_chdir;
+-XSet* evt_tab_focus;
+-XSet* evt_tab_close;
+-XSet* evt_device;
++extern XSet* evt_win_focus;
++extern XSet* evt_win_move;
++extern XSet* evt_win_click;
++extern XSet* evt_win_key;
++extern XSet* evt_win_close;
++extern XSet* evt_pnl_show;
++extern XSet* evt_pnl_focus;
++extern XSet* evt_pnl_sel;
++extern XSet* evt_tab_new;
++extern XSet* evt_tab_chdir;
++extern XSet* evt_tab_focus;
++extern XSet* evt_tab_close;
++extern XSet* evt_device;
+ 
+ // instance-wide command history
+-GList* xset_cmd_history;
++extern GList* xset_cmd_history;
+ 
+ static const char* terminal_programs[] =  //for pref-dialog.c
+ {
+@@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui
+ };
+ 
+ // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
+-char* settings_terminal_su;
+-char* settings_graphical_su;
++extern char* settings_terminal_su;
++extern char* settings_graphical_su;
+ 
+ typedef struct
+ {
diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index 35fc0bff16f7..f5c9eb81f009 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -14,8 +14,6 @@
 		<remote-id type="github">ignorantguru/spacefm</remote-id>
 	</upstream>
 	<use>
-		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
-		<flag name="gtk3">Support GTK+ 3.x instead of GTK+ 2.x</flag>
 		<flag name="video-thumbnails">Support video thumbnails with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
 	</use>
 	<longdescription lang="en">
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..b206e28490ad
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info optfeature xdg
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+startup-notification +video-thumbnails"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	virtual/udev
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
+	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+	fi
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
deleted file mode 100644
index f1c2cea9d53c..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	>=virtual/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
-	startup-notification? ( x11-libs/startup-notification )
-	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
-
-src_configure() {
-	econf \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 31647a6d0f80..b206e28490ad 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils linux-info xdg-utils
+inherit linux-info optfeature xdg
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.com/spacefm/"
@@ -12,33 +12,35 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+IUSE="+startup-notification +video-thumbnails"
 
 RDEPEND="dev-libs/glib:2
 	dev-util/desktop-file-utils
-	>=virtual/udev-143
+	virtual/udev
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	startup-notification? ( x11-libs/startup-notification )
 	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
 
 src_configure() {
 	econf \
@@ -47,42 +49,20 @@ src_configure() {
 		--disable-hal \
 		--enable-inotify \
 		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
+		--with-gtk3
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+
+	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
+	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
 
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
 	if ! has_version 'sys-fs/udisks' ; then
 		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
 		elog "you may need to enable kernel polling for device media changes to be detected."
 		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
 	fi
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}