commit: a3a1b8ce0dee320f50a0a33d1e1635ea98a9a5d9 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Aug 31 14:09:25 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sat Aug 31 14:09:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3a1b8ce
media-gfx/qview: add X USE flag - add X USE flag - fix license - fix prefix Closes: https://bugs.gentoo.org/932724 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> media-gfx/qview/qview-5.0.ebuild | 9 +++++---- media-gfx/qview/{qview-6.1.ebuild => qview-6.1-r1.ebuild} | 15 ++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/media-gfx/qview/qview-5.0.ebuild b/media-gfx/qview/qview-5.0.ebuild index d23dbb5f6..efaa87c58 100644 --- a/media-gfx/qview/qview-5.0.ebuild +++ b/media-gfx/qview/qview-5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic qmake-utils toolchain-funcs virtualx xdg @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview/"; SRC_URI="https://github.com/jurplel/qView/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/qView-${PV}" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" @@ -35,7 +35,8 @@ BDEPEND=" src_configure() { # https://github.com/jurplel/qView/issues/395 - if tc-is-clang && has_version "sys-devel/clang:$(clang-major-version)[default-libcxx]" || is-flagq -stdlib=libc++; then + if tc-is-clang && has_version "sys-devel/clang:$(clang-major-version)[default-libcxx]" || is-flagq -stdlib=libc++ + then append-cxxflags -stdlib=libstdc++ append-ldflags -stdlib=libstdc++ fi diff --git a/media-gfx/qview/qview-6.1.ebuild b/media-gfx/qview/qview-6.1-r1.ebuild similarity index 70% rename from media-gfx/qview/qview-6.1.ebuild rename to media-gfx/qview/qview-6.1-r1.ebuild index 64445115d..d656e5c38 100644 --- a/media-gfx/qview/qview-6.1.ebuild +++ b/media-gfx/qview/qview-6.1-r1.ebuild @@ -10,23 +10,28 @@ HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview/"; SRC_URI="https://github.com/jurplel/qView/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/qView-${PV}" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" +IUSE="X" RDEPEND=" - dev-qt/qtbase[concurrent,gui,network,widgets] + dev-qt/qtbase:6[concurrent,gui,network,widgets] + X? ( x11-libs/libX11 ) " -DEPEND="${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND=" dev-qt/qttools[linguist] " src_configure() { - eqmake6 PREFIX=/usr qView.pro + local myqmakeargs=( + PREFIX="${EPREFIX}"/usr + $(usex X '' CONFIG+=NO_X11) + ) + eqmake6 "${myqmakeargs[@]}" } src_install() {
