From 8e8754151c3c98e6a37ddc4462f75a16bfbd88e6 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Wed, 31 Dec 2014 13:12:35 +0000 Subject: [PATCH] Enforce USE dependency for media-libs/phonon. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC! --- dev-qt/qt-meta/ChangeLog | 5 +++- dev-qt/qt-meta/Manifest | 33 +++++++++++++------------- dev-qt/qt-meta/qt-meta-4.8.5.ebuild | 6 ++--- dev-qt/qtdemo/ChangeLog | 6 ++++- dev-qt/qtdemo/Manifest | 35 ++++++++++++++-------------- dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild | 8 +++---- dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild | 6 ++--- 7 files changed, 52 insertions(+), 47 deletions(-) diff --git a/dev-qt/qt-meta/ChangeLog b/dev-qt/qt-meta/ChangeLog index 1655f1e2eb3c..88ab02142c79 100644 --- a/dev-qt/qt-meta/ChangeLog +++ b/dev-qt/qt-meta/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qt-meta # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/ChangeLog,v 1.8 2014/09/28 22:54:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/ChangeLog,v 1.9 2014/12/31 13:12:26 kensington Exp $ + + 31 Dec 2014; Michael Palimaka qt-meta-4.8.5.ebuild: + Enforce USE dependency for media-libs/phonon. 28 Sep 2014; Davide Pesavento qt-meta-4.8.5.ebuild: Update HOMEPAGE. diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest index 8dc2104bd73a..8ca198558fa7 100644 --- a/dev-qt/qt-meta/Manifest +++ b/dev-qt/qt-meta/Manifest @@ -1,25 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD qt-meta-4.8.5.ebuild 1307 SHA256 8f3d9c26328e50be2b523853f100d42af7334109fd7186a731a309fea9afc6d9 SHA512 3be07a9f6d1a592ee4a60750c9364dfa081c643d8219865ed9ab98ea5aa19a7dc8b5c9d8bcf3cfb25549f7ed120679647970ec45027aa192d2a112ccdaa30bae WHIRLPOOL 8da94190c6b827dcf381a7b140232d30631cbbe68ae25ba373b2713218c9a7e57fe3748a116f6877f395e69f647050d140564c38dc4f09bf6af41627c45c6997 -MISC ChangeLog 2410 SHA256 a4287a56a4d1bc8622ea8ffbddf762d7786882833c652300255b815205e94242 SHA512 da29c93c8616791c740d92d62f951016c4fc21335f070257a7b0eb17e9539f7c51e9b21aabfce43f8ab7f11dc10b559cb2822e2109d91cc036618673221454ab WHIRLPOOL 7222190c8acca88623de895814df6f334ce245231de514e94505fd2f6c08ea2f993b1bb48d55414b2a449b7d6cfc35c462374c394235b3e3e7a5fb23bf402011 +EBUILD qt-meta-4.8.5.ebuild 1323 SHA256 8fd6dfb32c74f515a06ff3ef2de835cffbf354aae7dd5ef888f3ee52faf0eb61 SHA512 8af9436f382a06583568e599f78b910345454fca866e5a5ac45e78e1f396ecc357b2d57a6503cb75ecc63953152334891d099b87a223dbc6a32b9659d28d93f0 WHIRLPOOL e5ff30cd5b5ad01ab644dd00757866beac4cb9dcac1dc2dae1dfe3621445c3322c7c2b00233f3e7a039545554aab6c2b81b60254161edc2868f78f981f444095 +MISC ChangeLog 2543 SHA256 720b9d6429fd1a869e3892b36ce832230d162de2d296b445340ea636137ffaa7 SHA512 19a92d52f0de043fff7d0524cf84951382c8cc24bb1f75901933ecc1c93cf13a6c947d926de967671b123f0c6848129e6aedadcf231b01e669471f063cdf1bf3 WHIRLPOOL 28ab9ba053b8ec4bfa7cc8df523be3f6003367f94f3fd97a58447bb1180cc07711d7db43775f214213f578174c2fc0dedd9ac6b34a267863a97d4ec8c51c31da MISC metadata.xml 395 SHA256 69c3bf90d4ba70fa911ef0fe49ab5cd9a84c982c2e91808536cc3333d6865221 SHA512 a490490bb3c964a59a13569b26d5f66569597a77f9e2539fa927eead3b76edd96c3baef62d3cebf06b9c1fe6607bdd42d3bd8cbb59af89e70888aa31116a2a6b WHIRLPOOL 77cdc493d24a61c158e593faaa5ca0e63a1c8aee5402eb9b9110df67d54b8f07071f9753707bbe22d44880f9fc0e3e0fb4d671ac690234d4c844dfcae24740a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUKJGvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9iGgP/RP4lhawLjNamwmrQdV5RqXa -SP4+pVUsqMpR5jl2z2mB+x+GqiXlG6J/VeZ2QeBTsBH4WMQ11WDHqEzHfnzRDuwQ -c8CLmazxE70nxV56+FUhcBhD4VpHfn4imVQfgiNfY+DX+QoI12qe6nTf4F3UaXA4 -+VNOvZ3P/UqdMCF2G4v5FZnh/0dONTif8ftqdkjlv+nVByosfpanlGOLCQ+sQlkC -TYgeu4t6QOlvBHIT/Ubu7mlZBLtlRA7edPScXV1rT3NlDh3Jf5LlNkOpUVXZRdM8 -eqzDlUfgjwI/Y/UxEqU+EgGZjefP1AjW4wRsYKLQqYZG2allhkj2KbBMAURZEX6X -6spe2CQ71lxcFzdJfz8w1TalnXwcWR2Tp9o2vFX5Iwko3/2vTnVYg4G5cmpMNbrJ -WSKvfn2pQSl6q9CWGqBk68PXSbx9EJis6eMENBwf84SANkr5QXqInmOl9Mm7GiOY -vaM3hzXsia6wB1/yBkmVqu74LduLgJi2LcyqmzR+G4sdvFPxTzrNzIn3p8R/WzHF -jdilK6wlPIzEef8xTvdyYHmtxuG6QA9Yz1MQhA8eNuODyjyluVK9KElMmxMSukjD -SRlN1uqOUb2c6ERJ6onyNVzm1dMz4Xs/B9JArdP0n9ykbByLNYQTeNLdKI+L8NVE -q1vjWsBJFU/A5MAtZb/M -=nUtL +iQJiBAEBCABMBQJUo/ZMRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7GxrD/9P1Dga8+Mx/Ku/Elh0lDmwfN1EJl5ZSYOPDmfejG8QLOTiCYrZUL4Tmjkm +uvR9buQG00Yetj4mxc17MumbRQ9YKMzokqIIANW1+YxiBT+xJnm437RIQi4WnME8 +qQQ3mTZn2jlQecPlur+JytmXj5bzeCujspAztlgZ3pRRgIVthtQyQ0E9soRpSRDL +lSpC9TeBQzTcW18IH9wcUQjfWLD/QsPeKOkCfNGZZ1mlYT8zm9RetcWnkfEGNDWi +TGjgTCWx13e8bkS8XFDN2gcR9z7YY9Z7e7LqU5aJj0gRkQMJAt1r3rr5hxuMYcCX +AZGEN9bTQMIbIFM+ryXf7Xb2Jgx4adD1H4Oo6Z5tYQBhq8sxhnm3J1oODWpI/y3k +Lf5ybdHlbRc6lE4Dp4fEVnlQxu757U7qX0mUGDSIPg8jeNXkjwMbZKawLFD8NGgI +6yQkiib35DvFO7w2Y9xVIJuYiEK9n3XG+6cvrowzwH81d/sL8oa9x6TRilqQx6rb +j60goGSC9B/8kIecSqTy79Y9Xs/Eib5LpxdHPgdVl9uhjatzvwe5e07pFKhrONoB +Q8HWO+ZhAs3k04AEOBFRakRfIIXqZKdZckDTPqWybFHP0jL6wYxcl79xv2cIrVMF +Up4aTedq5xvfVAczGjtelVWpakOXGA5PXI4MhtmMWVFqofg40Q== +=SsXw -----END PGP SIGNATURE----- diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild index 7361b939f698..b0ccd796f7a1 100644 --- a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild +++ b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/qt-meta-4.8.5.ebuild,v 1.4 2014/09/28 22:54:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/qt-meta-4.8.5.ebuild,v 1.5 2014/12/31 13:12:26 kensington Exp $ EAPI=5 @@ -30,8 +30,8 @@ RDEPEND=" >=dev-qt/qtmultimedia-${PV}:4 >=dev-qt/qtopengl-${PV}:4 openvg? ( >=dev-qt/qtopenvg-${PV}:4 ) - kde? ( media-libs/phonon ) - !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon ) ) + kde? ( media-libs/phonon[qt4] ) + !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) ) >=dev-qt/qtscript-${PV}:4 >=dev-qt/qtsql-${PV}:4 >=dev-qt/qtsvg-${PV}:4 diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog index 7998ca189a3c..54f0a2e92c6d 100644 --- a/dev-qt/qtdemo/ChangeLog +++ b/dev-qt/qtdemo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtdemo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.12 2014/11/15 02:36:28 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.13 2014/12/31 13:11:33 kensington Exp $ + + 31 Dec 2014; Michael Palimaka qtdemo-4.8.5-r1.ebuild, + qtdemo-4.8.6-r1.ebuild: + Enforce USE dependency for media-libs/phonon. *qtdemo-4.8.6-r1 (15 Nov 2014) diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest index e17d92f3b93f..60d146c0b370 100644 --- a/dev-qt/qtdemo/Manifest +++ b/dev-qt/qtdemo/Manifest @@ -4,26 +4,25 @@ Hash: SHA256 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 -EBUILD qtdemo-4.8.5-r1.ebuild 2922 SHA256 2a8b0b050419c6b15dc62aa5e64ddc129c9107899c2ae96385425132b2ece2eb SHA512 7b35bf6737ea85c04653077a7d763dc833f44c858a177381fc45029651038f1d8814192d2e06f68b3a36f1d3042efc6a9bc6507cc25ea9bf783f789701e6214c WHIRLPOOL ce22d3812314352f3a7cd3648c92538ac79004ee09309da552b794004378420dbe52b4546110331d55ce8e09e305e7c72fe1b9b1ebc769e7f7521fba50c5202e -EBUILD qtdemo-4.8.6-r1.ebuild 2861 SHA256 8c16a8ffe7d176d491a4f63e535653ec9be9036e2f3cfa02fdd8a99c165fb2c4 SHA512 d0c42f400e4b4088dc0b7b0f328ac706a753951133397860a7f7f68f2e7d537a872dd7a3173e541ae74ade1533fb7cd62919fd518f2f707639ed400eac824f28 WHIRLPOOL fd844992668899e5d2c7c9462e773742404489a1ecb572c4a98ee524363e808816a7718c2b2abb32edeaee8efee4808fd01fbc07c7f5a600a27898b431c1f2c0 -MISC ChangeLog 14454 SHA256 1f5fb8c78f6083abe78476cec468f93d8a6726a0dbecaee82ab9a471ebcfd827 SHA512 75f0c40c289768576256a0979b39e260682ff506f70b541abb8f1b1cb2d7707c0a2789f7d6b32bd7f8bbcd93d31f5a6736e95d19ac16181994e36574444ff77c WHIRLPOOL e642fce029af2c19237435de955ba657ba52ac51536d3d641932e953b906860b81f2eccecd096db81a6f4c367a1d366cd58da609310683b3dc45aff2cbc9c7b5 +EBUILD qtdemo-4.8.5-r1.ebuild 2936 SHA256 aa695e2d44301f5724d76cad2f52f7ac9a6b7b72512d816c3f18d79f966a77f4 SHA512 4d60d71301526c2a66a3ba154ad84d3a28e2c1d806346b2c6c200553b5f992dba9d403028d80c0fbf8e1c01837e75413de0df1c043b954ccc6db04b5d960f778 WHIRLPOOL 8e1a9fa8b96fcb6f871897ad1764dc656f3500d8df7beec2a22c9e5d62509a219ad03eb442748243e2b9aaaa0966f892844f486dd759ee314c2167eb7fc0107a +EBUILD qtdemo-4.8.6-r1.ebuild 2875 SHA256 6f8aec51628b543730ffb6f4ea63342259524ae9f762715e6f197c0e944ada68 SHA512 bbe3ff4317d06fb1c45bda498a829e3e1964c2316f9c91c3999f02ae3381e2f631dc6edf592c9d49e5b91e63822ea8301a0cdb4e2eda21a495246b2572fd17c1 WHIRLPOOL 499b5dfa6413ca60a471bb734d5d58ad29459964376e500d54088e4901950d65266924fbc2fa60838e01d7bbb2257478f9c512de8e620cf031c95e306e821d50 +MISC ChangeLog 14615 SHA256 dcd8fcb689bf69e54b8ee8de11ac6d33bdc31df6ab946d697889d0bf444356c5 SHA512 a25a4bfeda40511fd9fe9a22d77666cca1530d7678a17b0fc6a8e0dd04bd5e1555b4e716f871d08d2cd6307b9350ee5309552925c7152d9823c1576433f44549 WHIRLPOOL 5de06022a4529ec2e8e8a01847f3b6a8defdfd418c309ea5484834dc1712cb6428b6be397fde8cc31f31239c575560be77a3a2be1e74218eb22e6483b777efc5 MISC metadata.xml 1019 SHA256 6ae799502dd83e7d68685cf5d3277b3f7eb21bc98c247c92d997658b65f7e109 SHA512 b171d7d14bf8a45524816cd02923bade4bd76c3e3458c5f75f0d9ca532e598fc06e23f007b9f7881a53d6e63a70c802264b6b06c4922db135b38823cb83b4b8b WHIRLPOOL 3faacd90a8a124a25d6487c764f35d947b5afbf76675c60068b7b42c75e88383e377bcde3af0280726f46835bd6e40335ad07d8d4a6eab642c0f9be60a467952 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUZrwtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9v10P/jKpz0JsCBgOy+EUr5Q2Y/fe -w++yIcYfLX/7SENDr8DKoiTmeaDOAYSCMzYOO5F3JnOJstaEdwRjKujsGgoAufmK -i68LJxJah3Oyb7MzkEpTscaM4P77MUtlRgPy1qedh5V/9n8d9zuxqnLIQVlGvAls -z7Kc1f5eOvxXThjlULCtZNmcsHUCzS0tAooSoE2FEmZ7jTmUZXzt63DfxMYSedIP -SeQ77yCAXiRXOkBdbn44EQd/NtK8IBwSvQzuqy9/2TQA7FKUoB3kQPZIp/SMrVvp -OB8YF2xHkBWp1rTEEDGmB7dIponqqCZQwjKEQLSfP1vMbP/CXgvmvemF6UrecBWG -p9slfMkDzCgRxcEtavjyZ3kZuvHJGmvUxUNdVU1Ii5XsyNlNZFUSvgoRs4by7d6L -ul+epAMaUtAppKurLOqj4FVTdYBt3f0q1OkrQFjxIRoXURWuxhLwq5Ghn4HSmFWh -zSrxHM8iLuSod7ZsvS2oRESJqE+/XoPHZlUEMg8FDJjdgM/mOzcP5oEFGkc2siss -YbDIOwY4uo+7ayJqixmxTn54lqew7k1gsBnEHVb9voTdarBQAlVpjkFLJElHr4kE -oURK8/ijU8ayrZ6Q05oY1dSAA4oIL9boblSQ9BrBe/BEyznhWc52zpiK66jZF86j -1izD9VUoFdZLdfRk0Bib -=7cRh +iQJiBAEBCABMBQJUo/YWRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7M2ZEACKxwIQXJbpvymmlZU6PCxttmZU/CND5L4PioTm5MhgmLuvSlig60UbAXUJ +bVxI/G4RjKuzjPpayWgmflzSPFBvL7VkYzWLZ1YHQDLYYTthIM5m2DIoBqwBsg4m +B9qOf6DsyXNnoxxFKB83rUkqYpm0KS9UQnNWUrp7o2oBtdMoPYq2LGtuofzXU7Vo +xYbvI1ceBzkQF5o8D9nQ/n26TCJT7v4C+zeB/V3n/H3aGYzdraocpL4KYI7ov0Kq +G7GG1pkuBLSQaOgC/4GPSXiEWeqQLQQgUQExOfarxyro2yUL4X9tJ6oRUR3hY5q9 +E4AMVzcK2c3GI94gS2/GgtT7lzqtpn0E3a/12a/xEKiiZchHajnKTB9IICjho4Sq +ZPag1LNB4zae9XgJfAdfYZYNjHmolRcqz8fCc7S0j6ahfUj+TJbH/jRGIhf7GHey +9DBAgOpMDPD8u7QKbytK3yxRIimnwpatB0T1LlY6vb8RrLja16Qj/OTXlOAPeT3/ ++5l9IwJLVSryvb1Uyts0iM5YKeqP3I3KsWPea/yeRM91Qk3mqD/LeLg+Fu9Vd8v3 +Txd93OA2ZwHhBwoS1cF333wDJwWeooV92Gow8sSpe66mNFUqAcL/hScUQ5ptEcbG +cowpu3ldERvZrO28wxYI4Edq9DWP2Md5P+1eBwuFdgjb45iotw== +=sBqJ -----END PGP SIGNATURE----- diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild index 00dba52ca991..07b89f1de9f0 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.6 2013/12/28 02:06:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.7 2014/12/31 13:11:33 kensington Exp $ EAPI=4 @@ -30,8 +30,8 @@ DEPEND=" opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] ) openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] ) phonon? ( - kde? ( media-libs/phonon[aqua=] ) - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) ) + kde? ( media-libs/phonon[aqua=,qt4] ) + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) ) ) qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild index 6491f27a544a..f8dd46c7ba28 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:28 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild,v 1.2 2014/12/31 13:11:33 kensington Exp $ EAPI=5 @@ -31,8 +31,8 @@ DEPEND=" opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) phonon? ( - kde? ( media-libs/phonon[aqua=] ) - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) ) + kde? ( media-libs/phonon[aqua=,qt4] ) + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) ) ) webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -- 2.26.2