From 152ae3ac1d61eeb6585ffcf07a23b554457e2987 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 22 Jan 2017 08:56:43 +0100 Subject: [PATCH] dev-qt/qtdemo: remove all references to qtopenvg Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-qt/qtdemo/metadata.xml | 1 - dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild | 8 +++----- dev-qt/qtdemo/qtdemo-4.8.7.ebuild | 8 +++----- profiles/base/package.use.mask | 4 ---- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml index aa57309b3d4e..0bf7e7acff08 100644 --- a/dev-qt/qtdemo/metadata.xml +++ b/dev-qt/qtdemo/metadata.xml @@ -12,7 +12,6 @@ inside the event loop (recommended by upstream) Build QtMultimedia examples and demos Build QtOpenGL examples and demos - Build QtOpenVG examples and demos Build Phonon examples and demos Build QtWebKit examples and demos Build QtXmlPatterns examples and demos diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild index cd259175dbf1..73e3fe8ad927 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm ppc ppc64 x86" fi -IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns" +IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns" DEPEND=" ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] @@ -29,7 +29,6 @@ DEPEND=" declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) phonon? ( kde? ( media-libs/phonon[aqua=,qt4] ) !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) ) @@ -56,7 +55,6 @@ src_prepare() { 'declarative:declarative' 'multimedia:spectrum' 'opengl:boxes|glhypnotizer' - 'openvg' 'phonon:mediaplayer' 'webkit:browser' 'xmlpatterns' @@ -88,7 +86,7 @@ multilib_src_configure() { $(qt_use declarative) $(qt_use multimedia) -no-audio-backend $(qt_use opengl) - $(qt_use openvg) + -no-openvg $(qt_native_use phonon) -no-phonon-backend $(qt_use webkit) $(qt_use xmlpatterns) diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild index 631b3bbb81fa..af965398ccaf 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" fi -IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns" +IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns" DEPEND=" ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] @@ -26,7 +26,6 @@ DEPEND=" declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) phonon? ( kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] ) !kde? ( || ( @@ -56,7 +55,6 @@ src_prepare() { 'declarative:declarative' 'multimedia:spectrum' 'opengl:boxes|glhypnotizer' - 'openvg' 'phonon:mediaplayer' 'webkit:browser' 'xmlpatterns' @@ -88,7 +86,7 @@ multilib_src_configure() { $(qt_use declarative) $(qt_use multimedia) -no-audio-backend $(qt_use opengl) - $(qt_use openvg) + -no-openvg $(qt_use phonon) -no-phonon-backend $(qt_use webkit) $(qt_use xmlpatterns) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index a5e9b4ada5ee..1f94f93ce1e3 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -54,10 +54,6 @@ gnome-extra/zeitgeist-datasources mono tomboy app-emulation/crossover-bin capi net-libs/opal capi -# Michał Górny (15 Nov 2016) -# OpenVG support in Mesa is long gone, and qtopenvg is going to p.mask. -dev-qt/qtdemo openvg - # Ettore Di Giacinto (10 Nov 2016) # Dependency has no stable keyword # and as for now we have only stable mate versions -- 2.26.2