x11-misc/spacefm: include sysmacros.h, bug 603000
authorDaniel Campbell <zlg@gentoo.org>
Mon, 2 Jan 2017 10:58:19 +0000 (02:58 -0800)
committerDaniel Campbell <zlg@gentoo.org>
Mon, 2 Jan 2017 12:35:49 +0000 (04:35 -0800)
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

x11-misc/spacefm/files/spacefm-include-sysmacros.patch [new file with mode: 0644]
x11-misc/spacefm/spacefm-1.0.4-r1.ebuild [new file with mode: 0644]
x11-misc/spacefm/spacefm-1.0.5-r2.ebuild [new file with mode: 0644]
x11-misc/spacefm/spacefm-9999.ebuild

diff --git a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
new file mode 100644 (file)
index 0000000..153d7c2
--- /dev/null
@@ -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-1.0.4-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..e147de8
--- /dev/null
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+REQUIRED_USE="gtk2? ( !gtk3 )"
+
+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_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_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-apps/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() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
new file mode 100644 (file)
index 0000000..45a33f6
--- /dev/null
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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="~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_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_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-apps/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() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}
index 0ca069baaec45ff536f484c4887003fb5462ae79..444e767d4109da5f56c2ee91c71e649ad2e1ed2e 100644 (file)
@@ -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