[gentoo-commits] proj/qt:master commit in: dev-python/pyside/

[Davide Pesavento]

commit:     fe6ef7a3d10e3c66aa90fe04c7f611e79d9622e5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 21 12:51:02 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep 21 12:51:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe6ef7a3

[dev-python/pyside] Sync with portage.

Package-Manager: portage-2.2.13

---
 dev-python/pyside/pyside-9999.ebuild | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev-python/pyside/pyside-9999.ebuild 
b/dev-python/pyside/pyside-9999.ebuild
index b78e3b4..2d456de 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.1-r1.ebuild,v 
1.1 2013/12/25 19:26:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.2.ebuild,v 1.4 
2014/09/21 00:42:17 pesa Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit multilib cmake-utils python-r1 virtualx git-r3
+inherit cmake-utils multilib python-r1 virtualx git-r3
 
 MY_P="${PN}-qt4.8+${PV}"
 
@@ -20,9 +20,10 @@ EGIT_REPO_URI=(
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="X declarative designer help multimedia opengl phonon script scripttools 
sql svg test webkit xmlpatterns"
 
+IUSE="X declarative designer help multimedia opengl phonon script scripttools 
sql svg test webkit xmlpatterns"
 REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
        declarative? ( X )
        designer? ( X )
        help? ( X )
@@ -37,9 +38,10 @@ REQUIRED_USE="
 "
 
 # Minimal supported version of Qt.
-QT_PV="4.7.0:4"
+QT_PV="4.8.5:4"
 
 RDEPEND="
+       ${PYTHON_DEPS}
        >=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
        >=dev-qt/qtcore-${QT_PV}
        X? (
@@ -47,7 +49,7 @@ RDEPEND="
                >=dev-qt/qttest-${QT_PV}
        )
        declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-       designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
+       designer? ( >=dev-qt/designer-${QT_PV} )
        help? ( >=dev-qt/qthelp-${QT_PV} )
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
@@ -79,6 +81,8 @@ src_prepare() {
                cp "${FILESDIR}"/rpath.cmake . || die
                sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
        fi
+
+       cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -120,15 +124,14 @@ src_configure() {
 }
 
 src_compile() {
-       python_foreach_impl cmake-utils_src_make
+       python_foreach_impl cmake-utils_src_compile
 }
 
 src_test() {
        local PYTHONDONTWRITEBYTECODE
        export PYTHONDONTWRITEBYTECODE
 
-       local VIRTUALX_COMMAND="cmake-utils_src_test"
-       python_foreach_impl virtualmake
+       VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
 }
 
 src_install() {