| 1 |
commit: 59cb7116a24c524ba9331475b2bb03b9f8bb8abb |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 30 14:09:44 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 13:18:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59cb7116 |
| 7 |
|
| 8 |
dev-qt/designer: remove kde USE flag |
| 9 |
|
| 10 |
Gentoo-bug: 629144 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 12 |
|
| 13 |
dev-qt/designer/designer-4.8.6-r1.ebuild | 13 ++++++------- |
| 14 |
dev-qt/designer/designer-4.8.7.ebuild | 9 ++++----- |
| 15 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/designer/designer-4.8.6-r1.ebuild b/dev-qt/designer/designer-4.8.6-r1.ebuild |
| 18 |
index 9a961569052..9ae4d7cec21 100644 |
| 19 |
--- a/dev-qt/designer/designer-4.8.6-r1.ebuild |
| 20 |
+++ b/dev-qt/designer/designer-4.8.6-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=5 |
| 27 |
@@ -8,25 +8,24 @@ inherit eutils qt4-build-multilib |
| 28 |
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" |
| 29 |
|
| 30 |
if [[ ${QT4_BUILD_TYPE} == live ]]; then |
| 31 |
- KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc" |
| 32 |
+ KEYWORDS="alpha arm ia64 ppc ppc64 sparc" |
| 33 |
else |
| 34 |
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 35 |
+ KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 36 |
fi |
| 37 |
|
| 38 |
DESIGNER_PLUGINS="declarative phonon qt3support webkit" |
| 39 |
-IUSE="${DESIGNER_PLUGINS} kde" |
| 40 |
+IUSE="${DESIGNER_PLUGINS}" |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 44 |
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 45 |
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 46 |
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 47 |
- phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) ) |
| 48 |
qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 49 |
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 50 |
" |
| 51 |
RDEPEND="${DEPEND}" |
| 52 |
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" |
| 53 |
+PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" |
| 54 |
|
| 55 |
QT4_TARGET_DIRECTORIES="tools/designer" |
| 56 |
|
| 57 |
@@ -35,7 +34,7 @@ src_prepare() { |
| 58 |
|
| 59 |
local plugin |
| 60 |
for plugin in ${DESIGNER_PLUGINS}; do |
| 61 |
- if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then |
| 62 |
+ if ! use ${plugin} || [[ ${plugin} == phonon ]]; then |
| 63 |
sed -i -e "/\<${plugin}\>/d" \ |
| 64 |
tools/designer/src/plugins/plugins.pro || die |
| 65 |
fi |
| 66 |
|
| 67 |
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild |
| 68 |
index f4c310ff463..7fbb1e9854c 100644 |
| 69 |
--- a/dev-qt/designer/designer-4.8.7.ebuild |
| 70 |
+++ b/dev-qt/designer/designer-4.8.7.ebuild |
| 71 |
@@ -7,23 +7,22 @@ inherit eutils qt4-build-multilib |
| 72 |
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" |
| 73 |
|
| 74 |
if [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 75 |
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 76 |
+ KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 77 |
fi |
| 78 |
|
| 79 |
DESIGNER_PLUGINS="declarative phonon qt3support webkit" |
| 80 |
-IUSE="${DESIGNER_PLUGINS} kde" |
| 81 |
+IUSE="${DESIGNER_PLUGINS}" |
| 82 |
|
| 83 |
DEPEND=" |
| 84 |
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 85 |
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 86 |
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 87 |
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 88 |
- phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) ) |
| 89 |
qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 90 |
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 91 |
" |
| 92 |
RDEPEND="${DEPEND}" |
| 93 |
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" |
| 94 |
+PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" |
| 95 |
|
| 96 |
QT4_TARGET_DIRECTORIES="tools/designer" |
| 97 |
|
| 98 |
@@ -32,7 +31,7 @@ src_prepare() { |
| 99 |
|
| 100 |
local plugin |
| 101 |
for plugin in ${DESIGNER_PLUGINS}; do |
| 102 |
- if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then |
| 103 |
+ if ! use ${plugin} || [[ ${plugin} == phonon ]]; then |
| 104 |
sed -i -e "/\<${plugin}\>/d" \ |
| 105 |
tools/designer/src/plugins/plugins.pro || die |
| 106 |
fi |
Archives