summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/PyQt4/ChangeLog6
-rw-r--r--dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild6
-rw-r--r--dev-python/PyQt4/PyQt4-4.11.1.ebuild6
-rw-r--r--dev-python/PyQt4/PyQt4-4.11.2.ebuild6
4 files changed, 14 insertions, 10 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 998e350be44c..326acec11615 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -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.278 2014/12/10 15:11:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.279 2014/12/31 12:53:58 kensington Exp $
+
+ 31 Dec 2014; Michael Palimaka <kensington@gentoo.org> PyQt4-4.10.3-r2.ebuild,
+ PyQt4-4.11.1.ebuild, PyQt4-4.11.2.ebuild:
+ Enforce USE dependency for media-libs/phonon.
10 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> PyQt4-4.11.1.ebuild:
amd64 stable wrt bug #517344
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
index 665fd0f40245..96489f705805 100644
--- a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r2.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-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.11 2014/05/30 20:55:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.12 2014/12/31 12:53:58 kensington Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -59,8 +59,8 @@ RDEPEND="
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[qt4] )
+ !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
)
script? ( >=dev-qt/qtscript-${QT_PV} )
sql? ( >=dev-qt/qtsql-${QT_PV} )
diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
index d16bc57e3601..4534dfb34294 100644
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.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-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.9 2014/12/10 15:11:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.10 2014/12/31 12:53:58 kensington Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -58,8 +58,8 @@ RDEPEND="
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[qt4] )
+ !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
)
script? ( >=dev-qt/qtscript-${QT_PV} )
sql? ( >=dev-qt/qtsql-${QT_PV} )
diff --git a/dev-python/PyQt4/PyQt4-4.11.2.ebuild b/dev-python/PyQt4/PyQt4-4.11.2.ebuild
index 0802fc2c4caf..d662c2a5a226 100644
--- a/dev-python/PyQt4/PyQt4-4.11.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.2.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-python/PyQt4/PyQt4-4.11.2.ebuild,v 1.1 2014/09/20 20:05:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2.ebuild,v 1.2 2014/12/31 12:53:58 kensington Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -58,8 +58,8 @@ RDEPEND="
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[qt4] )
+ !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
)
script? ( >=dev-qt/qtscript-${QT_PV} )
sql? ( >=dev-qt/qtsql-${QT_PV} )