commit:     a5fdca4d6964ccbf714736c2bc86a2fd7bd51ca4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 22:42:21 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 23:03:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fdca4d

x11-misc/spacefm: Drop obsolete gnome2_icon_savelist, sort deps

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-misc/spacefm/spacefm-1.0.5-r2.ebuild |  8 +-------
 x11-misc/spacefm/spacefm-1.0.6.ebuild    | 20 +++++++-------------
 x11-misc/spacefm/spacefm-9999.ebuild     | 20 +++++++-------------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild 
b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 75d9c6230b1..bcf8d506218 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -32,9 +32,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        sys-devel/gettext"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-include-sysmacros.patch )
 
 src_configure() {
        econf \
@@ -47,10 +45,6 @@ src_configure() {
                $(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
        xdg_mimeinfo_database_update

diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild 
b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index fefb9fc512a..d7f32ee9c49 100644
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -26,21 +26,19 @@ RDEPEND="dev-libs/glib:2
        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 )"
+       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
-       virtual/pkgconfig
-       sys-devel/gettext"
+       sys-devel/gettext
+       virtual/pkgconfig"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-9999-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
        econf \
@@ -53,10 +51,6 @@ src_configure() {
                $(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
        xdg_mimeinfo_database_update

diff --git a/x11-misc/spacefm/spacefm-9999.ebuild 
b/x11-misc/spacefm/spacefm-9999.ebuild
index fefb9fc512a..d7f32ee9c49 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -26,21 +26,19 @@ RDEPEND="dev-libs/glib:2
        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 )"
+       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
-       virtual/pkgconfig
-       sys-devel/gettext"
+       sys-devel/gettext
+       virtual/pkgconfig"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-9999-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
        econf \
@@ -53,10 +51,6 @@ src_configure() {
                $(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
        xdg_mimeinfo_database_update

Reply via email to