commit: 1d06ab7a252c6af28616bed11002effa6cfc1f1c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 14 18:20:45 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 14 21:51:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d06ab7a
x11-misc/qtfm: Fix EAPI-7, local mycmakeargs, improve DESCRIPTION Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/qtfm/qtfm-6.2.0.ebuild | 17 +++++++++-------- x11-misc/qtfm/qtfm-99999.ebuild | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild index 8ec496a5bd7..44a47469469 100644 --- a/x11-misc/qtfm/qtfm-6.2.0.ebuild +++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit xdg-utils qmake-utils -DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt" +inherit qmake-utils xdg-utils + +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" @@ -13,6 +14,10 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="+dbus shared" +BDEPEND=" + app-arch/unzip + dev-qt/linguist-tools:5 +" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -22,11 +27,7 @@ RDEPEND=" sys-apps/file dbus? ( dev-qt/qtdbus:5 ) " -DEPEND=" - ${RDEPEND} - app-arch/unzip - dev-qt/linguist-tools:5 -" +DEPEND="${RDEPEND}" src_configure() { eqmake5 \ diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild index 4bdc1441aaa..d61d41015c7 100644 --- a/x11-misc/qtfm/qtfm-99999.ebuild +++ b/x11-misc/qtfm/qtfm-99999.ebuild @@ -2,9 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 xdg-utils cmake -DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt" +inherit cmake git-r3 xdg-utils + +DESCRIPTION="Small, lightweight file manager based on pure Qt" HOMEPAGE="https://qtfm.eu/"; EGIT_REPO_URI="https://github.com/rodlie/qtfm/"; @@ -13,6 +14,10 @@ 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 @@ -24,20 +29,15 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg ) imagemagick? ( >=media-gfx/imagemagick-7:= ) " -DEPEND=" - ${RDEPEND} - app-arch/unzip - dev-qt/linguist-tools:5 -" -PATCHES=( - "${FILESDIR}"/${PN}-99999-cmake.patch -) +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch ) src_configure() { - mycmakeargs=( - -DENABLE_DBUS="$(usex dbus)" - -DENABLE_FFMPEG="$(usex ffmpeg)" - -DENABLE_MAGICK="$(usex imagemagick)" + local mycmakeargs=( + -DENABLE_DBUS=$(usex dbus) + -DENABLE_FFMPEG=$(usex ffmpeg) + -DENABLE_MAGICK=$(usex imagemagick) ) cmake_src_configure }
