x11-libs/libfm-extra : version bump

3 files changed, 7 insertions, 60 deletions

diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index d6a5093d..0aa1137e 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1 +1 @@
-DIST libfm-1.3.0.tar.gz 1288574 BLAKE2B 24a7ee923f5d51fddd934e85930533408dfd0c7c099e12b55e18820aa20b47605b1c0a005b5519c35dd8f8dc6042cf01d140602ef53609d1e86ce78c8540091a SHA512 1bac0779c6dad52ef722998dc3859a5868eaacfd2ec41e8966d92ec4c57c2e060c8811bf8fe172e6305707e3f018b412379cdb336a29de29d081d3f7cceeec0e
+DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
diff --git a/x11-libs/libfm-extra/files/add_file_compare_attributes.patch b/x11-libs/libfm-extra/files/add_file_compare_attributes.patch
deleted file mode 100644
index 65f0323c..00000000
--- a/x11-libs/libfm-extra/files/add_file_compare_attributes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/gtk/fm-progress-dlg.c b/src/gtk/fm-progress-dlg.c
-index 49aebe47..1d124a60 100644
---- a/src/gtk/fm-progress-dlg.c
-+++ b/src/gtk/fm-progress-dlg.c
-@@ -166,6 +166,8 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
-     GtkLabel *src_fi, *dest_fi;
-     GtkEntry *filename;
-     GtkToggleButton *apply_all;
-+    char* comparedate;
-+    char* comparesize;
-     char* tmp;
-     const char* disp_size;
-     FmPath* path;
-@@ -200,18 +202,34 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
-     gtk_window_set_transient_for(GTK_WINDOW(dlg), GTK_WINDOW(data->dlg));
- 
-     gtk_image_set_from_gicon(src_icon, G_ICON(icon), GTK_ICON_SIZE_DIALOG);
-+    if (fm_file_info_get_mtime(src) > fm_file_info_get_mtime(dest))
-+        comparedate = _("newer");
-+    else
-+    if (fm_file_info_get_mtime(src) < fm_file_info_get_mtime(dest))
-+        comparedate = _("older");
-+    else
-+    if (fm_file_info_get_mtime(src) == fm_file_info_get_mtime(dest))
-+        comparedate = _("same date/time");
-     disp_size = fm_file_info_get_disp_size(src);
-     if(disp_size)
-     {
--        tmp = g_strdup_printf(_("Type: %s\nSize: %s\nModified: %s"),
--                              fm_file_info_get_desc(src), disp_size,
--                              fm_file_info_get_disp_mtime(src));
-+        if (fm_file_info_get_size(src) > fm_file_info_get_size(dest))
-+            comparesize = _("larger");
-+        else
-+        if (fm_file_info_get_size(src) < fm_file_info_get_size(dest))
-+            comparesize = _("less");
-+        else
-+        if (fm_file_info_get_size(src) == fm_file_info_get_size(dest))
-+            comparesize = _("same size");
-+        tmp = g_strdup_printf(_("Type: %s\nSize: %s (%s)\nModified: %s (%s)"),
-+                              fm_file_info_get_desc(src), disp_size, comparesize,
-+                              fm_file_info_get_disp_mtime(src), comparedate);
-     }
-     else
-     {
--        tmp = g_strdup_printf(_("Type: %s\nModified: %s"),
-+        tmp = g_strdup_printf(_("Type: %s\nModified: %s (%s)"),
-                               fm_file_info_get_desc(src),
--                              fm_file_info_get_disp_mtime(src));
-+                              fm_file_info_get_disp_mtime(src), comparedate);
-     }
- 
-     gtk_label_set_text(src_fi, tmp);
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.0-r1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
index 324bb02e..c4dff66b 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.0-r1.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools xdg-utils
+EAPI=7
+inherit autotools xdg-utils
 
 MY_PV=${PV/_/}
 MY_PN="libfm"
@@ -11,9 +11,9 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-SLOT="0/5.0.1" #copy ABI_VERSION because it seems upstream change it randomly
+SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/add_file_compare_attributes.patch
 	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
 	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
 	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
@@ -55,6 +54,7 @@ src_prepare() {
 
 	eautoreconf
 	rm -r autom4te.cache || die
+	eapply_user
 }
 
 src_configure() {