* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/
@ 2017-01-02 12:36 Daniel Campbell
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Campbell @ 2017-01-02 12:36 UTC (permalink / raw
To: gentoo-commits
commit: e51eaf345132b3494c05db6315e8531a359ca68b
Author: Daniel Campbell <zlg <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 10:58:19 2017 +0000
Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 12:35:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51eaf34
x11-misc/spacefm: include sysmacros.h, bug 603000
Include DEPEND fix to no longer need REQUIRED_USE, build using gtk3 by
default per GNOME team's suggestions.
Gentoo-Bug: 603000
Gentoo-Bug-URL: https://bugs.gentoo.org/603000
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../spacefm/files/spacefm-include-sysmacros.patch | 10 ++++++++++
.../{spacefm-9999.ebuild => spacefm-1.0.4-r1.ebuild} | 18 ++++++++++--------
.../{spacefm-9999.ebuild => spacefm-1.0.5-r2.ebuild} | 19 ++++++++++---------
x11-misc/spacefm/spacefm-9999.ebuild | 9 ++++-----
4 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
new file mode 100644
index 00000000..153d7c2
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
@@ -0,0 +1,10 @@
+--- a/src/vfs/vfs-volume-nohal.c
++++ b/src/vfs/vfs-volume-nohal.c
+@@ -36,6 +36,7 @@
+
+ #include <signal.h> // kill
+ #include <linux/kdev_t.h> // MAJOR MINOR
++#include <sys/sysmacros.h> // needed for dev_t
+
+ #ifdef HAVE_STATVFS
+ #include <sys/statvfs.h>
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
similarity index 87%
copy from x11-misc/spacefm/spacefm-9999.ebuild
copy to x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
index 0ca069b..e147de8 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git"
-EGIT_BRANCH="next"
-
-inherit fdo-mime git-2 gnome2-utils linux-info
+inherit fdo-mime gnome2-utils linux-info
DESCRIPTION="A multi-panel tabbed file manager"
HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
REQUIRED_USE="gtk2? ( !gtk3 )"
@@ -24,7 +22,7 @@ RDEPEND="dev-libs/glib:2
virtual/freedesktop-icon-theme
x11-libs/cairo
x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
+ gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
!gtk2? ( x11-libs/gtk+:3 )
x11-libs/pango
x11-libs/libX11
@@ -36,6 +34,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}"/${PN}-include-sysmacros.patch
+)
+
src_configure() {
econf \
--htmldir=/usr/share/doc/${PF}/html \
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
similarity index 87%
copy from x11-misc/spacefm/spacefm-9999.ebuild
copy to x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 0ca069b..45a33f6 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git"
-EGIT_BRANCH="next"
-
-inherit fdo-mime git-2 gnome2-utils linux-info
+inherit fdo-mime gnome2-utils linux-info
DESCRIPTION="A multi-panel tabbed file manager"
HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
RDEPEND="dev-libs/glib:2
dev-util/desktop-file-utils
@@ -24,7 +21,7 @@ RDEPEND="dev-libs/glib:2
virtual/freedesktop-icon-theme
x11-libs/cairo
x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
+ gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
!gtk2? ( x11-libs/gtk+:3 )
x11-libs/pango
x11-libs/libX11
@@ -36,6 +33,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}"/${PN}-include-sysmacros.patch
+)
+
src_configure() {
econf \
--htmldir=/usr/share/doc/${PF}/html \
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 0ca069b..444e767 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git"
EGIT_BRANCH="next"
-inherit fdo-mime git-2 gnome2-utils linux-info
+inherit fdo-mime git-r3 gnome2-utils linux-info
DESCRIPTION="A multi-panel tabbed file manager"
HOMEPAGE="https://ignorantguru.github.com/spacefm/"
@@ -16,7 +16,6 @@ LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
RDEPEND="dev-libs/glib:2
dev-util/desktop-file-utils
@@ -24,7 +23,7 @@ RDEPEND="dev-libs/glib:2
virtual/freedesktop-icon-theme
x11-libs/cairo
x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
+ gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
!gtk2? ( x11-libs/gtk+:3 )
x11-libs/pango
x11-libs/libX11
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/
@ 2018-04-04 23:04 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-04-04 23:04 UTC (permalink / raw
To: gentoo-commits
commit: e72a525503c4714cb04624df5d320971ff0c45cd
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Wed Apr 4 01:30:37 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 4 23:02:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72a5255
x11-misc/spacefm: fixed compilation
Similar bug as #603000, just needed to adjust the patch.
Package-Manager: Portage-2.3.27, Repoman-2.3.9
x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch | 11 +++++++++++
x11-misc/spacefm/spacefm-9999.ebuild | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
new file mode 100644
index 00000000000..3a586bba439
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -30,6 +30,8 @@
+
+ #include <locale.h>
+
++#include <sys/sysmacros.h> /* for major/minor, dev_t */
++
+ #include "main-window.h"
+
+ #include "vfs-file-info.h"
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 4bc9c19d81a..fefb9fc512a 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-include-sysmacros.patch
+)
+
src_configure() {
econf \
--htmldir=/usr/share/doc/${PF}/html \
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/
@ 2019-02-23 9:43 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2019-02-23 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 1b34813877fa66851248fc0cbd67584c429ec30c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 09:29:56 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 09:29:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b348138
x11-misc/spacefm: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/spacefm/Manifest | 1 -
.../spacefm/files/spacefm-include-sysmacros.patch | 21 ------
x11-misc/spacefm/spacefm-1.0.5-r2.ebuild | 83 ----------------------
3 files changed, 105 deletions(-)
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index bcd3bfd6b17..0dbb5c9d116 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,2 +1 @@
-DIST spacefm-1.0.5.tar.gz 3491483 BLAKE2B c00ff3d92e01095b854ee4948ee8827ab32f454d4fd19e496f3d4a70dad2d8a98b67f6cca53d2026d15eddca23b1b6ac5f0394a66097a4efdd0f42beeabd4ffb SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
diff --git a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
deleted file mode 100644
index 28bbfc7c405..00000000000
--- a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/vfs/vfs-volume-nohal.c
-+++ b/src/vfs/vfs-volume-nohal.c
-@@ -36,6 +36,7 @@
-
- #include <signal.h> // kill
- #include <linux/kdev_t.h> // MAJOR MINOR
-+#include <sys/sysmacros.h> // needed for dev_t
-
- #ifdef HAVE_STATVFS
- #include <sys/statvfs.h>
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,6 +30,8 @@
-
- #include <locale.h>
-
-+#include <sys/sysmacros.h> /* for major/minor, dev_t */
-+
- #include "main-window.h"
-
- #include "vfs-file-info.h"
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
deleted file mode 100644
index bcf8d506218..00000000000
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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
- gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
- !gtk2? ( x11-libs/gtk+:3 )
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- video-thumbnails? ( media-video/ffmpegthumbnailer )
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}"/${PN}-include-sysmacros.patch )
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/
@ 2020-11-25 17:37 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-11-25 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 3e0cc5d786d6d56e8eb145e515b461a6073ce169
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Nov 25 17:37:26 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 17:37:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0cc5d7
x11-misc/spacefm: port to EAPI 7
Closes: https://bugs.gentoo.org/708384
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-misc/spacefm/files/spacefm-fno-common.patch | 86 ++++++++++++++++++++++++
x11-misc/spacefm/metadata.xml | 2 -
x11-misc/spacefm/spacefm-1.0.6-r1.ebuild | 68 +++++++++++++++++++
x11-misc/spacefm/spacefm-1.0.6.ebuild | 88 -------------------------
x11-misc/spacefm/spacefm-9999.ebuild | 60 ++++++-----------
5 files changed, 174 insertions(+), 130 deletions(-)
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 00000000000..4cdc834a827
--- /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 35fc0bff16f..f5c9eb81f00 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 00000000000..b206e28490a
--- /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 f1c2cea9d53..00000000000
--- 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 31647a6d0f8..b206e28490a 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-25 17:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-02 12:36 [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/ Daniel Campbell
-- strict thread matches above, loose matches on Subject: below --
2018-04-04 23:04 Andreas Sturmlechner
2019-02-23 9:43 Pacho Ramos
2020-11-25 17:37 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox