gentoo resync : 20.03.2021

4 files changed, 100 insertions, 43 deletions

diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 946fa81c8398..7e9ad5b11a5a 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,5 +1,6 @@
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
+AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-extra-1.2.5.ebuild 2520 BLAKE2B d97fe8205b11a21c621712132a8e326ae745496bc07f636d5b1078155f648c96a51f914834ce71b0fd27bc37e8b6ae46c5fc40dc17ce37c39618da9405160c01 SHA512 4909f6e472342410f30d1867039f64ffd62963687fc4a01ae110d2ba464fba16e6d64bc0c5e159732804d6f427b3a0493eb64ed91ca17159002d94fc50b5dce9
+DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
 EBUILD libfm-extra-1.3.1.ebuild 2539 BLAKE2B b954e207f3f82911839f57a5104b630b970b0945359d0091d3f546f8d21717cfd268803f3155f1a15b37855eaf061b9b55ac6683c23e0cfc10e586c3287a598d SHA512 4a743ba0be2b59c439e96c219b50db2eb7fa701dc88a0577d7de54f275b250e74ab897172b8191ef95e13285b35f94449fc8c422b9dcc6ca7606fc82af9f7907
-MISC metadata.xml 375 BLAKE2B 20d31a26454ffe8d7cbc1ff2fb90a432ac77759199c4453db00564d89c1516284fa327e67d6eded951a41d54bdbc12fdcffd702b7c98acb0d2dad26a07c39ad8 SHA512 291808293b725eedc1adec419b27b1053295ccf43ebbbf791ee9591633730fb05ff7d2add4bb4de34ba7361717241bb48a477cab0da17fd544da6ebffb1afcc6
+EBUILD libfm-extra-1.3.2.ebuild 2241 BLAKE2B e9a2096d9d9229832b9819d492587aca66d01f7f27523ff9f1e5afbeaac5654c802dc928c2ca2d4d2cf3352aa5d9f4778bf3541ab8f26925f42d2e4377d10def SHA512 1c0c4fcb266ed0a0c8bafb68d2c86337430daa919fd087d0f5baaf43a3be5775d1f9076f2fa876d3345cca70092671bae88e6a2b75854d72dfc64a5962bee8ec
+MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
new file mode 100644
index 000000000000..fd9a0535a4c3
--- /dev/null
+++ b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
@@ -0,0 +1,59 @@
+From a5cabf67a7460ce27c73e66c9ac98481c6cd1db2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Mar 2021 09:44:40 +0100
+Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS, disable docs
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 8 ++------
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 427edae..f5fd4f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ NULL=
+ DIST_SUBDIRS = src po data
+ 
+ # a little trick against gtk-doc is here
+-SUBDIRS_DOCS = docs
++SUBDIRS_DOCS = 
+ 
+ EXTRA_DIST_DOCS = \
+ 	gtk-doc.make \
+diff --git a/configure.ac b/configure.ac
+index bf6b07f..2f331ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug,
+ )
+ if test "$enable_debug" = "yes"; then
+     # turn on debug and disable optimization
+-    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
++    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+     case "$CC" in
+     gcc*)
+         CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
+@@ -323,10 +323,6 @@ AC_CONFIG_FILES([
+     data/lxshortcut.1
+     data/ui/Makefile
+     po/Makefile.in
+-    docs/Makefile
+-    docs/reference/Makefile
+-    docs/reference/libfm/Makefile
+-    docs/reference/libfm/version.xml
+     libfm.pc
+     libfm-gtk.pc
+     libfm-gtk3.pc
+-- 
+2.30.2
+
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index 69258a65c60e..dd331530d905 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -1,45 +1,46 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools xdg-utils
+EAPI=7
 
-MY_PV=${PV/_/}
 MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
+MY_P="${MY_PN}-${PV/_/}"
+inherit autotools xdg
+
+DESCRIPTION="Library for file management"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
+SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
 	sys-devel/gettext
-	dev-util/gtk-doc-am
-	!!<=x11-libs/libfm-1.2.3"
+	virtual/pkgconfig
+"
 
-S="${WORKDIR}"/${MY_P}
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
 src_prepare() {
-	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::" \
-		configure.ac || die "sed failed"
+	xdg_src_prepare
 
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
+	# disable unused translations. Bug #356029
+	cat <<-EOF >> po/POTFILES.in || die
+data/ui/app-chooser.ui
+data/ui/ask-rename.ui
+data/ui/exec-file.ui
+data/ui/file-prop.ui
+data/ui/preferred-apps.ui
+data/ui/progress.ui
+EOF
 
 	# subslot sanity check
 	local sub_slot=${SLOT#*/}
@@ -58,34 +59,30 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static --with-extra-only
+	econf \
+		--disable-static \
+		--with-extra-only
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${ED}" -name '*.la' -delete || die
 	# Sometimes a directory is created instead of a symlink. No idea why...
 	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
 	# symlink to it.
 	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
+		rm -r "${D}"/usr/include/${MY_PN} || die
 	fi
 }
 
 pkg_preinst() {
+	xdg_pkg_preinst
 	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${ROOT}"/usr/include/${MY_PN} ]]; then
+		rm -rf "${ROOT}"/usr/include/${MY_PN} || die
+	fi
 	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+		cd "${D}"/usr/include || die
+		ln -s --force ${MY_PN}-1.0 ${MY_PN} || die
 	fi
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index c46e9eb9b836..4281b89a0888 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">