diff options
| -rw-r--r-- | x11-libs/qt-demo/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/qt-demo/qt-demo-4.6.1.ebuild | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest index 9af5d73373e9..0b170ced1256 100644 --- a/x11-libs/qt-demo/Manifest +++ b/x11-libs/qt-demo/Manifest @@ -5,6 +5,6 @@ DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6 EBUILD qt-demo-4.5.3.ebuild 1272 RMD160 168e9d8582c92dec3f98d8caab4b60b240eb66d0 SHA1 c7946621ac78e89455f8971e5a4e23d53d22fba8 SHA256 972f3f857e794cc2ad62d84ee5c2d4e1203befbc2da07293a6ca961a480867e1 EBUILD qt-demo-4.6.0.ebuild 1371 RMD160 b9c9f371482c7920271baf2630a2d3702a34b2a5 SHA1 5673e7e5b8a65a940f0760edad569ec5629d4ce4 SHA256 ab47f2cf20e7d9eb552ffc0ce52071e4bd35340e427f85fbd42f454b898e3092 -EBUILD qt-demo-4.6.1.ebuild 1371 RMD160 d9f11aad361f13dc118ba1617ed2c18f6854a52a SHA1 cfb79e0bcf67f609af201db8ccc789ec87588dea SHA256 b69c6049b0b1a5a7b28c4c8a306f68079fdd8d0385f60b8a0b366f95fb384556 +EBUILD qt-demo-4.6.1.ebuild 1383 RMD160 2304bab07e423b763318b2af7e69929b33c0f043 SHA1 d7273c0992a820f319865a46b69569df6c09ad6a SHA256 e6f3d4c7eb51247b20802a514e01f5422eb122fe078ec1c9c065d94d590e7ef5 MISC ChangeLog 5284 RMD160 919af55c0c83ab068e1aafa80f5027ece52a5b4f SHA1 d1ab971c5262c347163064675ad22fae2ad8d375 SHA256 9fdc719b37c48a9e465b666d5bb0ea565a9e4ac093b3fff62cd0559d35f43716 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 diff --git a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild b/x11-libs/qt-demo/qt-demo-4.6.1.ebuild index 8de18a77c232..1d5016b10c4e 100644 --- a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.1.ebuild,v 1.3 2010/01/22 19:49:45 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.1.ebuild,v 1.4 2010/01/22 21:57:17 yngwin Exp $ EAPI="2" inherit qt4-build @@ -16,7 +16,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=] ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=] ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=] ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=] - || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] media-sound/phonon[aqua=] ) + !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] + media-sound/phonon[aqua=] ) ) kde? ( media-sound/phonon[aqua=] ) ~x11-libs/qt-script-${PV}:${SLOT}[aqua=] ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=] |