commit: e78428586689a9d863a60353b2990f9967e595e5 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Jul 3 23:26:47 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Jul 6 07:56:07 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7842858
media-gfx/synnefo: Drop USE=qt5, make it unconditional Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> media-gfx/synnefo/metadata.xml | 3 --- media-gfx/synnefo/synnefo-9999.ebuild | 35 +++++++++-------------------------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/media-gfx/synnefo/metadata.xml b/media-gfx/synnefo/metadata.xml index 27f7827..d85e5ec 100644 --- a/media-gfx/synnefo/metadata.xml +++ b/media-gfx/synnefo/metadata.xml @@ -8,7 +8,4 @@ <upstream> <remote-id type="github">oyranos-cms/Synnefo</remote-id> </upstream> - <use> - <flag name="qt5">Build default Qt5 frontend (Qt4 fallback)</flag> - </use> </pkgmetadata> diff --git a/media-gfx/synnefo/synnefo-9999.ebuild b/media-gfx/synnefo/synnefo-9999.ebuild index 6e5ac63..baa0056 100644 --- a/media-gfx/synnefo/synnefo-9999.ebuild +++ b/media-gfx/synnefo/synnefo-9999.ebuild @@ -4,45 +4,28 @@ EAPI=6 +EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git" inherit cmake-utils +[[ ${PV} == "9999" ]] && inherit git-r3 DESCRIPTION="Qt front end for the Oyranos Color Management System" HOMEPAGE="https://github.com/oyranos-cms/Synnefo" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/oyranos-cms/Synnefo/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +[[ ${PV} == 9999 ]] || \ +SRC_URI="https://github.com/oyranos-cms/Synnefo/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -IUSE="qt5" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86" +IUSE="" DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 >=media-libs/oyranos-0.9.6 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - !qt5? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) " RDEPEND="${DEPEND} x11-misc/xcalib " DOCS=( AUTHORS.md README.md ) - -src_configure() { - local mycmakeargs=( - -DUSE_Qt4=$(usex !qt5) - ) - - cmake-utils_src_configure -}