5 files changed, 55 insertions, 31 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e1df060ec13e..9b9adc172326 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index e8730e2aa644..12bbe9a35537 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,6 +1,7 @@
 AUX qtfm-6.2.0-qt-5.15.patch 1037 BLAKE2B cb48575cb9097b84ed1bb739c0f6254d1bf88196d08e5ceee7b43ebae71f45dd0bf68dadfd0dce7b7f94958453d9d40f1750f291049a6c2936d24c79d2943ebe SHA512 19ffb3a4d322b1fce676819c75e13ef2952dd50182e3162c55dde26badf90f29cb4db1f388b894699cf55f7c123b6bb810864f2f603ab6c01116ceac78bfabba
-AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42ebe0d3a4bbf534d59acb869ada9465ab216b0e2a7978dd60d7ab9a15198f3e272707400d5d6f14b823ef1ac6b SHA512 74ee9c0e39bd826bc73aedfb79208e18bfc1348a49e7c0290d7a96375f3c56ec5d074d463bcf8256cb6ee5155b2d88f7c4c20544193c574db30356260c74bc52
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
+DIST qtfm-6.2.1.tar.gz 410958 BLAKE2B fe542b935dfa0d16198f9a0dc3fb5e0b43718056ebc0987ef73ff8c56258e8ba660ef7f294cc424aab397cd26a2aba37048806d9175fe86004298129443c707b SHA512 911c90a6f9bcfe539aaacf3476d660116f2dc18821b23cc420615be649bbffd530abf640ebf77d80ee85b61779e4844e0bc10f8fd3f3b0686366e6b5372f9f2c
 EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
-EBUILD qtfm-99999.ebuild 1016 BLAKE2B 4c85b061cd9b00363ae50c83a2da79b81bf52e394a2d7e8e9f5d2cd47058992d1b8966805d35c458ad78bb14b53d9e52ac24a35f6604c1eb83c7cf98e82f53de SHA512 c68b2e850ccea6ef67be140bf10f87f4178ee4e73d022e33df680814e63ea2d4bf994a1a1a5a6e78f8dad553618de9c383b0898c88b02acc086e6a30cfd3fb40
+EBUILD qtfm-6.2.1.ebuild 912 BLAKE2B 9a9d81b5d613ce01c1239b10b7eac9e2a0820b7e577c0af0e6bd11daf0e858511e3c87ffabfa9ef793edf802665b9551d621c7b1968b360ee33032547e055835 SHA512 789e96684831b6f0d70ee247c45a9964384bcd1416dc1b5e2fbdeacffd1341e19f98206b0b40ec62bbdad491f623ae8fe85c5f15162c63d4e2cf0fd867f6756c
+EBUILD qtfm-99999.ebuild 817 BLAKE2B e3f980a4939b1a2328666868f68d4e62543b22fdfcc0e86c21c67bfd0306891685a0d620cc07bb6ab88002ebcedce9e7474a4b8e502dc97987ce27cb5e6ff037 SHA512 631beccfbe339420ccc7224e94c184a65dfc09fef5aef813f58d18148834d3e819c3f01902077e1d04ca639e4b6f7ecb5e544685594c6ad2427647d8181f954e
 MISC metadata.xml 403 BLAKE2B 7befbfef66548288987666d889d847f730d3aca25b443f688483eca608848b612891d56c6b17f0520040622e63b3c0f74998b174758fc91811b98f23cad476a8 SHA512 230bdca0e66f1a18421719bec8a47ef93c311e3a64011246b1fc3731e6f1507a35613b873ce26cb7fb30600858a36e209a6397bcf92bd3d9a3d0aa88bb3c1887
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
deleted file mode 100644
index 815453760fe2..000000000000
--- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,7 +121,6 @@ set_target_properties(
-     ${PROJECT_VERSION_MAJOR}
- )
- if(ENABLE_MAGICK)
--    target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
-     target_link_libraries(QtFM ${MAGICK_LIBRARIES})
-     if(ENABLE_FFMPEG)
-         target_include_directories(QtFM
diff --git a/x11-misc/qtfm/qtfm-6.2.1.ebuild b/x11-misc/qtfm/qtfm-6.2.1.ebuild
new file mode 100644
index 000000000000..82c4fe88eab6
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-6.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Small, lightweight file manager based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus shared"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+	dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 \
+		$(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
+		$(usex shared 'CONFIG+=sharedlib' '') \
+		$(usex shared 'CONFIG+=with_includes' '') \
+		LIBDIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		XDGDIR="/etc/xdg"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index d61d41015c7a..7f4ff083dd93 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake git-r3 xdg-utils
+inherit cmake git-r3 xdg
 
 DESCRIPTION="Small, lightweight file manager based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -14,10 +14,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+dbus ffmpeg imagemagick"
 
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -30,8 +26,10 @@ RDEPEND="
 	imagemagick? ( >=media-gfx/imagemagick-7:= )
 "
 DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch )
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -41,13 +39,3 @@ src_configure() {
 	)
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}