3 files changed, 2 insertions, 96 deletions
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 7e9ad5b11a5a..3ccf58015160 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,6 +1,4 @@
 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
 DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-extra-1.3.1.ebuild 2539 BLAKE2B b954e207f3f82911839f57a5104b630b970b0945359d0091d3f546f8d21717cfd268803f3155f1a15b37855eaf061b9b55ac6683c23e0cfc10e586c3287a598d SHA512 4a743ba0be2b59c439e96c219b50db2eb7fa701dc88a0577d7de54f275b250e74ab897172b8191ef95e13285b35f94449fc8c422b9dcc6ca7606fc82af9f7907
-EBUILD libfm-extra-1.3.2.ebuild 2241 BLAKE2B e9a2096d9d9229832b9819d492587aca66d01f7f27523ff9f1e5afbeaac5654c802dc928c2ca2d4d2cf3352aa5d9f4778bf3541ab8f26925f42d2e4377d10def SHA512 1c0c4fcb266ed0a0c8bafb68d2c86337430daa919fd087d0f5baaf43a3be5775d1f9076f2fa876d3345cca70092671bae88e6a2b75854d72dfc64a5962bee8ec
+EBUILD libfm-extra-1.3.2.ebuild 2236 BLAKE2B 6b8e0e8de0ae2ca4c692ef4742c1a81b251144f8f3a17a03189948a2d751de7a66c957360db0aced719b5331104587b6560f165b3a0217ff4a1793304a4601e5 SHA512 ea71136d566dfd375668b00d58b888c0cbc1c4d45beeec94304c2031ea3910954c20e6b8655e60485bee9dc03265612aa802c6427bbac57364dcf4b5d4196f7d
 MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
deleted file mode 100644
index a2d9c22061b0..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A 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"
-
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/gtk-doc-am
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-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"
-
-	#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
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	eapply_user
-}
-
-src_configure() {
-	econf --disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# 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}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index dd331530d905..1dd6a3468cda 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"