pesa 14/10/14 02:49:02 Modified: PyQt4-4.11.2-r1.ebuild ChangeLog Log: Fix building against media-libs/phonon (bug 525354). (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.2 dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild?r1=1.1&r2=1.2 Index: PyQt4-4.11.2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyQt4-4.11.2-r1.ebuild 13 Oct 2014 19:27:07 -0000 1.1 +++ PyQt4-4.11.2-r1.ebuild 14 Oct 2014 02:49:02 -0000 1.2 @@ -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-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.1 2014/10/13 19:27:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.2 2014/10/14 02:49:02 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -49,8 +49,8 @@ multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) opengl? ( >=dev-qt/qtopengl-${QT_PV} ) phonon? ( - kde? ( media-libs/phonon ) - !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) ) + kde? ( >=media-libs/phonon-4.7[qt4] ) + !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-${QT_PV} ) scripttools? ( >=dev-qt/qtgui-${QT_PV} ) @@ -70,6 +70,9 @@ # Support qreal on arm architecture (bug 322349). use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" + # Allow building against KDE's phonon (bug 525354). + epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch" + if ! use dbus; then sed -i -e '/^\s\+check_dbus(/d' configure-ng.py || die fi 1.273 dev-python/PyQt4/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.273&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.273&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.272&r2=1.273 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- ChangeLog 13 Oct 2014 19:27:07 -0000 1.272 +++ ChangeLog 14 Oct 2014 02:49:02 -0000 1.273 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.272 2014/10/13 19:27:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.273 2014/10/14 02:49:02 pesa Exp $ + + 14 Oct 2014; Davide Pesavento <[email protected]> + +files/PyQt4-4.11.2-phonon.patch, PyQt4-4.11.2-r1.ebuild: + Fix building against media-libs/phonon (bug 525354). *PyQt4-4.11.2-r1 (13 Oct 2014)
