4 files changed, 63 insertions, 83 deletions
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index d3976b313ef8..53b2a898b884 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,4 +1,5 @@
 DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
-EBUILD pcmanfm-1.3.1.ebuild 1564 BLAKE2B 37cdd89d9897c4823bd19ae43685ec96713b0a9b88020f3e0e9a78e42be1214df52bf6e8d64d9ea6f817219ac426dcee7a62140d633446770fab01f7f5d8f16a SHA512 1223075020295703c85b6f129bdd66e4432f036fad2ab2f6a4f6b4f2432c0453a0260cbb228b0a5005e8ff680e25992f738261e4cc8632ba2a8779bf141f5c00
-EBUILD pcmanfm-9999.ebuild 1748 BLAKE2B 17066821d0bb4851251f899edf72c69af1aee1882957b8b5c7a163dd9e0fd589df568ae88f694ec6f47042ad0f4768a89e6d4b4dbeb1371722eb56847eb0178c SHA512 8e60059b397d80d94ed62a38e8562bd714b328314c0ad9153d955f08b2cc7a49a99a31df3074ddb441f588f0a0495d94f8cbecc303c02d42487433d29cb177e4
+DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
+EBUILD pcmanfm-1.3.1-r1.ebuild 1553 BLAKE2B 1b599888961b16cd1c6b4657d2fee4f331635c7884e5c87a0d8cd004df51ece0efac488037cabf3a146ea828a32ab3b86666d6278120dc0808aa7ca4407f0f2e SHA512 579f75f205256765e2d26ff2ecd34136422e047fa2245bfe0634f06c8dfa451469367cb94df6a6839175421b4995c71b6bf8b5be2930f94628bad22914ffb027
+EBUILD pcmanfm-1.3.2.ebuild 1173 BLAKE2B 729cc032de3e83d6ef71759d8a06c50a82e3893502d5b09f9349f97ccd9a21d5a84146a22bbe07b870040faf9a8dc6d69261c2dc6986d27173542f03e504cbc6 SHA512 cd0954f34168f71d3f22134c9f9ac5932838aeef6a89e6b68a1a311a630007c15802ada0aead82b23c808d60f95d2fcd7bdfb08387a3bd7b842997b67c19a24b
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1-r1.ebuild
index ff5411af3887..8e05fa230b16 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.1-r1.ebuild
@@ -8,7 +8,7 @@ is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
 te th tr tt_RU ug uk vi zh_CN zh_TW"
 PLOCALE_BACKUP="en_GB"
 
-inherit eutils xdg-utils l10n readme.gentoo-r1
+inherit l10n readme.gentoo-r1 xdg-utils
 
 MY_PV="${PV/_/}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
 	>=lxde-base/menu-cache-0.3.2
 	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
+	~x11-libs/libfm-${PV}:=[gtk]
 	virtual/eject
 	virtual/freedesktop-icon-theme"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
new file mode 100644
index 000000000000..a57bad0e46c0
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV/_/}"
+inherit xdg readme.gentoo-r1
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.18:2
+	>=lxde-base/menu-cache-1.1.0-r1
+	virtual/eject
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	>=x11-libs/libfm-${PV}:=[gtk]
+	x11-libs/libX11
+	x11-libs/pango
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		--with-gtk=3 \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
deleted file mode 100644
index 73fd47c92e65..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
-is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
-te th tr tt_RU ug uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit autotools eutils xdg-utils l10n readme.gentoo-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	>=lxde-base/menu-cache-0.3.2
-	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}