diff options
| -rw-r--r-- | x11-libs/qt-phonon/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-phonon/Manifest | 34 | ||||
| -rw-r--r-- | x11-libs/qt-phonon/metadata.xml | 2 | ||||
| -rw-r--r-- | x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild | 11 |
4 files changed, 31 insertions, 22 deletions
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 6495d65c0abc..9950f4b284db 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.90 2011/04/13 21:08:11 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.91 2011/04/14 23:13:48 wired Exp $ + + 14 Apr 2011; Alex Alexander <wired@gentoo.org> qt-phonon-4.7.2.ebuild, + metadata.xml: + added qt3support use flag, fixes bug #346355. 13 Apr 2011; Alex Alexander <wired@gentoo.org> -qt-phonon-4.7.0.ebuild, -qt-phonon-4.7.1.ebuild: diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest index 4bdc6696c841..bcd7703c9c2b 100644 --- a/x11-libs/qt-phonon/Manifest +++ b/x11-libs/qt-phonon/Manifest @@ -6,23 +6,25 @@ DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9c DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336 EBUILD qt-phonon-4.6.2.ebuild 1231 RMD160 7b739d53de2fb5a3a3542aeaaf9c9e7a8efbe480 SHA1 3a2855a86c950c09da09e722cfe1dbc7d1ada447 SHA256 3e596e4553f691400e5a4778245dd6ebdb7a69340bcf3e858c9275aaecd179cb EBUILD qt-phonon-4.6.3.ebuild 1240 RMD160 a81b6f2f093be31fcc794eb08e984d6bee1819e7 SHA1 1e4aab92c4b85b1fe601498f12df72c77bb8dbf7 SHA256 ef5ea94b1d12a3ba3243c9fe5d6328242df1efff791c7e0cb2dbb69c14c3d155 -EBUILD qt-phonon-4.7.2.ebuild 1230 RMD160 98ba0dc2737f36fa2b4a83162203722b0f506242 SHA1 f90c6b70098f7fdb94f9bb83610022ac069a529a SHA256 729909ba2b03ee772fe16b75d1f0f879ac3e66bce446a664e9f13fae91737a3a -MISC ChangeLog 11199 RMD160 3db7dc0230d3717df09c56ea8aadc8844b984c8c SHA1 5022c640c5362a13ee7b4690587ce1b21cd28abb SHA256 74126c491f98027d9ca6a97dcfc80d5877e078295b281366d8ba4e8c713349e3 -MISC metadata.xml 301 RMD160 aa2284f184a81d3eaae9c9673123973f6ed2ed0f SHA1 352e78778b7f2a3932a6c2034487a4d4d907ba0e SHA256 9b73621c335d23781d5e680a07bea4c6e427bf337e53223a6c71a1bdd4d8382c +EBUILD qt-phonon-4.7.2.ebuild 1268 RMD160 844ba2e8312cfcd1400e1d0aa1dfb3841cc0b0db SHA1 311472fba28884563c00695a09a0926926746d31 SHA256 9b24fcff5bbe04ff3a88142359a2155b6409570567b04aebe9c7731e57f1e484 +MISC ChangeLog 11337 RMD160 6cfa3a2b267d47c7e151e24a3fa681f500fec2d0 SHA1 aa2436e92ec9f14d0c597c3d83428003bf350741 SHA256 41281322be006fd4351bb54733945ccf8e388fc87bbd412e01cf40a4afede1f5 +MISC metadata.xml 451 RMD160 417a7c518178d120ddd73cb7f48b2127d2305c41 SHA1 9bce915ce5abf124f4cdb74a6ff0c0e90b195670 SHA256 2692bead511835be5d028b236a8ba1a0d59d4e6e9a8e6f9bf7a68e3f62bb3506 +MISC qt-phonon-4.7.2.ebuild.orig 1230 RMD160 98ba0dc2737f36fa2b4a83162203722b0f506242 SHA1 f90c6b70098f7fdb94f9bb83610022ac069a529a SHA256 729909ba2b03ee772fe16b75d1f0f879ac3e66bce446a664e9f13fae91737a3a +MISC qt-phonon-4.7.2.ebuild.rej 896 RMD160 8277176249e6a0dae11e54e1fc9c5addd70cb8e8 SHA1 ba61b58edd517b93bc19908c14161fdbcf275ae8 SHA256 1cad8ba6277550f3b918c12fded665dac32d414f4e233f9f6e8d947d1d0435c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJNphEfAAoJEDZF8K7rm0r60TgP/AzG3WYJw1bWyqKYK3fJKKyz -5HSFugMzkzTLiGuHooq7FHIu1lhd5u+3uJa1d4XIeDzAFpU2ozTQd4NdasSlLJsi -o0HtEIiQCazbTiXOY8pad00BNp30hLZFd2Brldd9OAf0KDIBb3vBXeruRL515vm/ -JJXPCeovjJjHJ6HyP/k5AIUQ6M6oSk097VM6f4v1h+kMQbYlJ/BlzG2StFP3NiOQ -H1b8mJbEcCzR8yjT3LhR8esnYUnXj4UtMP1i0XNAua6DX7tFnFfQ7WXEgeMYHBur -KnRsI4LcMJ1YYuIwbJo867KR4VL/vrBC9CLuytDPTSDRLVyQSlhksYyQz5s1JRJc -tKn49toAAQMZUMeBxzowUYgwPJ2h9zE2hp8S1SJN7k8vLLQNWw7+/EXzQ92Jzk6e -t5+mGY9akmniH9fVoEmofA5gkffH3zgjvZ9VPjiFQk7E88NiC+LNJVZdrRkq8ZU4 -hXp7v/17w1NfWps6tWmSvDdeHkiA+zV9vzyDLY99ydFOhJFzzPOpCYBzOZdTgVm2 -9NGgnyZCeXk+4MxglS99SLrwpqRRU8gTreRUWF/wQUKTHcvFJCpicy7JfUOpjnLp -0EwR7u1Iutdl248oaNFPoQg+QW5ip7nHmjbYUxMWcqlfyHoxiP3a3za/YC/cLtx7 -04vwitSSkNMtPw6vQrCk -=6r8g +iQIcBAEBCAAGBQJNp4AeAAoJEDZF8K7rm0r6qv4P/1OzbfsEMehlIpuP9mYygrzp +74GYKp0qP4dv7rB0pCgFW6gV72LGJ75fexqAWJ7fCe0i92GSwqw2GnahBVPWh/FX +JmolftLqdAozSDFqbvtwJOU1SCyKD4nySJv9Z+BqBdAg5pV3/3BCZnEMd5TOelpZ +LOMAahKmwUCnR0nmlBII80fBxF3AqN+e3j1o2A5V2o1luGGmK5/k3k61bb02yu8t +q45v35KtZd7CcSfE9gfBb9vqcb/+oG+8KnDs0EmZOUd/1TwwJK+dLUfi1SJQYGfA +avb7zVTkStzXy0fJFGRerAWfjTCOGyg/dw+7fFStdWmeiV+60pAdRlvPlBXR4tS3 +VAhNGPbYdeU9s+kMXCRXGFV94xP5cnwbG8ewk6ysD76gZwADXOxWzBr1QV6SkaUX +XeRBX11ZROqgEPFOoI382djYIIaeT5FvBzGfe/xPmUes+NOy0BFxBu4YWbvVISJc +pQl4Y6RiSwJNgP2EtEJ8VjeAUp2HGW6tu8W2exqkGC/VWoPGmljIMkMQzSEqaoG0 +6cEufYddxLcNsqMJ0Yq7kAfg0w5FwgiHaIJ2OFtDaCoLoDabaScfErIqRObI2XwS +m9P5Cak5CNAax9+SPUikOKrjJbmHilP5wK/pjnTINj3NUdnXjXJOr7GduqG3If9F +fFho95Sa3eMs6tcbZjyA +=ozPc -----END PGP SIGNATURE----- diff --git a/x11-libs/qt-phonon/metadata.xml b/x11-libs/qt-phonon/metadata.xml index e34a8eb7ed3e..cd68118d37a5 100644 --- a/x11-libs/qt-phonon/metadata.xml +++ b/x11-libs/qt-phonon/metadata.xml @@ -5,5 +5,7 @@ <use> <flag name='exceptions'>Add support for exceptions - like catching them inside the event loop (recommended by Nokia)</flag> + <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that + this does not mean you can compile pure Qt3 programs with Qt4.</flag> </use> </pkgmetadata> diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild index e52b722f0903..61e0ef940be0 100644 --- a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild +++ b/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild,v 1.2 2011/03/26 16:49:00 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild,v 1.3 2011/04/14 23:13:48 wired Exp $ EAPI="3" inherit qt4-build @@ -8,16 +8,16 @@ inherit qt4-build DESCRIPTION="The Phonon module for the Qt toolkit" SLOT="4" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="dbus" +IUSE="dbus qt3support" -DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support] +DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer media-plugins/gst-plugins-meta ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] ) + aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )" RDEPEND="${DEPEND}" @@ -39,7 +39,8 @@ pkg_setup() { src_configure() { myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus)" + $(qt_use dbus qdbus) + $(qt_use qt3support)" qt4-build_src_configure } |