Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qtfm/, x11-misc/qtfm/files/
Date: Mon, 26 Sep 2022 17:18:12
Message-Id: 1664212527.da4a7fe895dbd1b2a44e59b0b8a8196b74283433.asturm@gentoo
1 commit: da4a7fe895dbd1b2a44e59b0b8a8196b74283433
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 10:55:00 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 17:15:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4a7fe8
7
8 x11-misc/qtfm: update EAPI 7 -> 8, drop broken patch, use xdg.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 x11-misc/qtfm/files/qtfm-99999-cmake.patch | 10 ----------
13 x11-misc/qtfm/qtfm-99999.ebuild | 26 +++++++-------------------
14 2 files changed, 7 insertions(+), 29 deletions(-)
15
16 diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
17 deleted file mode 100644
18 index 815453760fe2..000000000000
19 --- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
20 +++ /dev/null
21 @@ -1,10 +0,0 @@
22 ---- a/CMakeLists.txt
23 -+++ b/CMakeLists.txt
24 -@@ -121,7 +121,6 @@ set_target_properties(
25 - ${PROJECT_VERSION_MAJOR}
26 - )
27 - if(ENABLE_MAGICK)
28 -- target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
29 - target_link_libraries(QtFM ${MAGICK_LIBRARIES})
30 - if(ENABLE_FFMPEG)
31 - target_include_directories(QtFM
32
33 diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
34 index d61d41015c7a..7f4ff083dd93 100644
35 --- a/x11-misc/qtfm/qtfm-99999.ebuild
36 +++ b/x11-misc/qtfm/qtfm-99999.ebuild
37 @@ -1,9 +1,9 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 +# Copyright 1999-2022 Gentoo Authors
40 # Distributed under the terms of the GNU General Public License v2
41
42 -EAPI=7
43 +EAPI=8
44
45 -inherit cmake git-r3 xdg-utils
46 +inherit cmake git-r3 xdg
47
48 DESCRIPTION="Small, lightweight file manager based on pure Qt"
49 HOMEPAGE="https://qtfm.eu/"
50 @@ -14,10 +14,6 @@ SLOT="0"
51 KEYWORDS=""
52 IUSE="+dbus ffmpeg imagemagick"
53
54 -BDEPEND="
55 - app-arch/unzip
56 - dev-qt/linguist-tools:5
57 -"
58 RDEPEND="
59 dev-qt/qtconcurrent:5
60 dev-qt/qtcore:5
61 @@ -30,8 +26,10 @@ RDEPEND="
62 imagemagick? ( >=media-gfx/imagemagick-7:= )
63 "
64 DEPEND="${RDEPEND}"
65 -
66 -PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch )
67 +BDEPEND="
68 + app-arch/unzip
69 + dev-qt/linguist-tools:5
70 +"
71
72 src_configure() {
73 local mycmakeargs=(
74 @@ -41,13 +39,3 @@ src_configure() {
75 )
76 cmake_src_configure
77 }
78 -
79 -pkg_postinst() {
80 - xdg_desktop_database_update
81 - xdg_icon_cache_update
82 -}
83 -
84 -pkg_postrm() {
85 - xdg_desktop_database_update
86 - xdg_icon_cache_update
87 -}