Add python 3.3 support.

Fix detection of media-libs/phonon, thanks to Gianluigi Tiesi <sherpya@gmail.com> in bug 475786.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

2 files changed, 25 insertions, 12 deletions

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 2403cb07eac3..0f5e8da5d8b5 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.57 2013/12/25 01:41:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.58 2013/12/25 19:26:11 pesa Exp $
+
+*pyside-1.2.1-r1 (25 Dec 2013)
+
+  25 Dec 2013; Davide Pesavento <pesa@gentoo.org> +pyside-1.2.1-r1.ebuild,
+  -pyside-1.2.1.ebuild:
+  Add python 3.3 support. Fix detection of media-libs/phonon, thanks to
+  Gianluigi Tiesi <sherpya@gmail.com> in bug 475786.
 
   25 Dec 2013; Davide Pesavento <pesa@gentoo.org> -pyside-1.2.0.ebuild:
   old
diff --git a/dev-python/pyside/pyside-1.2.1.ebuild b/dev-python/pyside/pyside-1.2.1-r1.ebuild
index b4a36e2cb3dc..77d6ecd9f060 100644
--- a/dev-python/pyside/pyside-1.2.1.ebuild
+++ b/dev-python/pyside/pyside-1.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/11/14 00:46:04 pesa Exp $
+# $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 $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit multilib cmake-utils python-r1 virtualx
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="X declarative designer help kde 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="
 	declarative? ( X )
@@ -48,10 +48,10 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	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 ) )
-	)
+	phonon? ( || (
+		media-libs/phonon[qt4(+)]
+		>=dev-qt/qtphonon-${QT_PV}
+	) )
 	script? ( >=dev-qt/qtscript-${QT_PV} )
 	sql? ( >=dev-qt/qtsql-${QT_PV} )
 	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
@@ -73,10 +73,8 @@ src_prepare() {
 		libpyside/pyside.pc.in || die
 
 	if use prefix; then
-		cp "${FILESDIR}"/rpath.cmake .
-		sed \
-			-i '1iinclude(rpath.cmake)' \
-			CMakeLists.txt || die
+		cp "${FILESDIR}"/rpath.cmake . || die
+		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
 	fi
 }
 
@@ -100,6 +98,14 @@ src_configure() {
 		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
 	)
 
+	if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
+		# bug 475786
+		mycmakeargs+=(
+			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
+			-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
+		)
+	fi
+
 	configuration() {
 		local mycmakeargs=(
 			-DPYTHON_SUFFIX="-${EPYTHON}"