diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-08-31 00:09:44 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-09-02 23:18:03 +1000 |
| commit | 59cb7116a24c524ba9331475b2bb03b9f8bb8abb (patch) | |
| tree | 56091d3150bd2848417d7cee18319e796eeb07fe /dev-qt | |
| parent | dev-lang/perl: 5.28.9999: Update to 5.27.3 (diff) | |
| download | gentoo-59cb7116a24c524ba9331475b2bb03b9f8bb8abb.tar.gz gentoo-59cb7116a24c524ba9331475b2bb03b9f8bb8abb.tar.bz2 gentoo-59cb7116a24c524ba9331475b2bb03b9f8bb8abb.zip | |
dev-qt/designer: remove kde USE flag
Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/designer/designer-4.8.6-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-qt/designer/designer-4.8.7.ebuild | 9 |
2 files changed, 10 insertions, 12 deletions
diff --git a/dev-qt/designer/designer-4.8.6-r1.ebuild b/dev-qt/designer/designer-4.8.6-r1.ebuild index 9a9615690520..9ae4d7cec21f 100644 --- a/dev-qt/designer/designer-4.8.6-r1.ebuild +++ b/dev-qt/designer/designer-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 EAPI=5 @@ -8,25 +8,24 @@ inherit eutils qt4-build-multilib DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc" + KEYWORDS="alpha arm ia64 ppc ppc64 sparc" else - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" fi DESIGNER_PLUGINS="declarative phonon qt3support webkit" -IUSE="${DESIGNER_PLUGINS} kde" +IUSE="${DESIGNER_PLUGINS}" DEPEND=" ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) ) qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" -PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" +PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" QT4_TARGET_DIRECTORIES="tools/designer" @@ -35,7 +34,7 @@ src_prepare() { local plugin for plugin in ${DESIGNER_PLUGINS}; do - if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then + if ! use ${plugin} || [[ ${plugin} == phonon ]]; then sed -i -e "/\<${plugin}\>/d" \ tools/designer/src/plugins/plugins.pro || die fi diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild index f4c310ff463a..7fbb1e9854ca 100644 --- a/dev-qt/designer/designer-4.8.7.ebuild +++ b/dev-qt/designer/designer-4.8.7.ebuild @@ -7,23 +7,22 @@ inherit eutils qt4-build-multilib DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" fi DESIGNER_PLUGINS="declarative phonon qt3support webkit" -IUSE="${DESIGNER_PLUGINS} kde" +IUSE="${DESIGNER_PLUGINS}" DEPEND=" ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) ) qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" -PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" +PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" QT4_TARGET_DIRECTORIES="tools/designer" @@ -32,7 +31,7 @@ src_prepare() { local plugin for plugin in ${DESIGNER_PLUGINS}; do - if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then + if ! use ${plugin} || [[ ${plugin} == phonon ]]; then sed -i -e "/\<${plugin}\>/d" \ tools/designer/src/plugins/plugins.pro || die fi |