| 1 |
commit: a7c921af482fb5550156331c6a54c319f5aeb42f |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 30 13:56:39 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 30 14:05:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c921af |
| 7 |
|
| 8 |
dev-qt/qtdemo: remove kde USE flag |
| 9 |
|
| 10 |
Gentoo-bug: 629144 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 12 |
|
| 13 |
dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild | 7 ++----- |
| 14 |
dev-qt/qtdemo/qtdemo-4.8.7.ebuild | 10 ++-------- |
| 15 |
2 files changed, 4 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild |
| 18 |
index 6c215b9a265..d37a099bf4a 100644 |
| 19 |
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild |
| 20 |
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild |
| 21 |
@@ -13,7 +13,7 @@ else |
| 22 |
KEYWORDS="amd64 arm ppc ppc64 x86" |
| 23 |
fi |
| 24 |
|
| 25 |
-IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns" |
| 26 |
+IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns" |
| 27 |
|
| 28 |
DEPEND=" |
| 29 |
~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 30 |
@@ -28,10 +28,7 @@ DEPEND=" |
| 31 |
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) |
| 32 |
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 33 |
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 34 |
- phonon? ( |
| 35 |
- kde? ( media-libs/phonon[aqua=,qt4] ) |
| 36 |
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) ) |
| 37 |
- ) |
| 38 |
+ phonon? ( media-libs/phonon[aqua=,qt4] ) |
| 39 |
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 40 |
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 41 |
" |
| 42 |
|
| 43 |
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild |
| 44 |
index cfcb9167b11..58b778819e4 100644 |
| 45 |
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild |
| 46 |
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild |
| 47 |
@@ -10,7 +10,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 48 |
KEYWORDS="amd64 arm ppc ppc64 x86" |
| 49 |
fi |
| 50 |
|
| 51 |
-IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns" |
| 52 |
+IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns" |
| 53 |
|
| 54 |
DEPEND=" |
| 55 |
~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 56 |
@@ -25,13 +25,7 @@ DEPEND=" |
| 57 |
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) |
| 58 |
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 59 |
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 60 |
- phonon? ( |
| 61 |
- kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] ) |
| 62 |
- !kde? ( || ( |
| 63 |
- ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 64 |
- >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] |
| 65 |
- ) ) |
| 66 |
- ) |
| 67 |
+ phonon? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] ) |
| 68 |
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 69 |
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) |
| 70 |
" |
Archives