Add python 3.3 support.

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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 40 insertions, 27 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/Manifest b/dev-python/pyside/Manifest
index 58df737fe439..6f814057663d 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -5,23 +5,23 @@ AUX rpath.cmake 393 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384c
 DIST pyside-qt4.8+1.1.2.tar.bz2 3758918 SHA256 e15efc67feeda6cfdd9574673fd30f769d9b6529dfd64d53efc80224aecb107a SHA512 16651b13f5ab096313fe4fc1ff9580f241c61ff98167018459720eca6faeed7af3dc6918c85913ee07c4cd27f0070c7c1c204d81a5538754ce7b9dc2b79c41b1 WHIRLPOOL a086b4dc09c1b1a376363c0f3858d8bccd39d083bbdd484ec8b833ddd21fc6502174c2382bd10cbfe99ec4cadee740e3e16ff745ccad30ed0b611275e54049b9
 DIST pyside-qt4.8+1.2.1.tar.bz2 3764773 SHA256 f54c4350c662ecc59a2e0c95b06286a9ab1baa30b22c2b0194ceda59307e687b SHA512 674a0d86be311650b22a9915a91f25e70b0a739d9c2ad92688ec4c624182ecf5184cbc761ea014ca6955b4bc9338acda2371eeffa302afc3873b95b88dea4b2b WHIRLPOOL ba40b8d81bac8719cab40656cda62add20d19f396a371cc282a80bc1923e0ee94669c9dccaf12b51c3305e9ecc8bbf280369ea52808b5dd6a4eebd3c5490aa1c
 EBUILD pyside-1.1.2-r1.ebuild 3304 SHA256 6ecdbe81a79693e0091dc87ef43628d18364374bb1d7f0e764c4d80a67fb9527 SHA512 bba7ccb1d7ed74dfc8d7432bb39e27b532793883074498835b8e53a8e46541fa1858651d76351db29b1cb82c830b8b752691f43e8e000fd4e29532dd8a14770f WHIRLPOOL cec980a4fe5acb5abbb84cbeeb94d28ad80ad06db6680404dfbf5a9d15ce1a2a7dbe58ac6300dd4501e3a328d068ac7c260d250049c5888bba92e87bec30473f
-EBUILD pyside-1.2.1.ebuild 3442 SHA256 e953e4a3f7f6c2c87adc3be0426248ce2c55b03af21f13bc94424431acd0ebb2 SHA512 3f357358b6efc256a134b1dea010ca7886caaabd4055eb215578a6cdd5cf447daedf754af4cf2a4e293f38d3e88f7087a39c9016828c7f5c382ca40f6080ffcb WHIRLPOOL 42e3527fd0a8c1d520df9d28a21dedad72e369a915476c59b5b807684ac2f0191e828419a6435710dd83386ccd9fcc650d58df2a31f3691ee9d93961e8658a35
-MISC ChangeLog 7979 SHA256 3bca6dc762bd3fd8ee65a3907947cac44b7d1bf0cb06d431b6acc792942fd603 SHA512 87830c9c133fcbc3e6097dafe6de079c25d7aaa59ad6ffd7c39a307ee86499952cb450fdbc5bd3a6b29b1b5b17c049959757be300e718005fe7a296854174069 WHIRLPOOL acfbb660d1cc41d8339b1d27de8348be1b6e921fdf2fc557912fcf8663be8c05f710a1dbb738f4446746c30957ed4a260c4325399d957ed1a7749de00791515b
+EBUILD pyside-1.2.1-r1.ebuild 3655 SHA256 85203d525cb9d4bdfcaa4f25839cbce7b8e34580afb106b031f287ebbc53bae4 SHA512 d26d33dffec308c75ff9698f55ed3df69e147c8cd56b936001840ba29be3483807272c21ac009fd618736b68495892d3aff8d25131188988fbb43493f741e43b WHIRLPOOL b8b0f764f42f4338775737051383237d84be7b8327c841ac704fd30a05910e1260fec65bd9611558ae41294aff68251749f4d9e874ff20704fca923c3905b01a
+MISC ChangeLog 8236 SHA256 6fb77775611fb8a86f3418d4f3b0370e9a582586e1edbbd33ce85caf49928643 SHA512 48c6fc8f609ca4c31af5c7c2905b38994df1130cad401a4d679f078de3e7f30aaaba5273f8c7a44ed8dafeced07ccfdf5f7f9ddf768a88fee207124fb4164856 WHIRLPOOL 3928c14c0e19b22da94190b068e7a1f4e66ab725e6704d646c4656d2d792a7aa6d40af05fd578c227ac1eb62e71888b5f6caea23bce71fe1aee5703157659955
 MISC metadata.xml 974 SHA256 53b7dcfa0ed68127d1c447b71efe4aa2ca906e3d42a46b4e3426c59907e0e5eb SHA512 328ccf15280610363142d790251130b41f252f93ff383b4f301860296347679643e0ee7c4411d9f691767b95440caca805c024b2a6f6150e7e12b2db6500a9ea WHIRLPOOL e5f46a7da029459a1ca8cf34b46c341c0c425953fab62e597443c1eeac9819873f916309c0ca2859249227693e733c59131708f8c66c42a065910fc3734b029f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSujfKAAoJENXLsxwXqFxyS/8P/2Dz3Nf6lOoP5lFdLdsed+zU
-4HRkNV6ey678SKvBRGkf+G51HIJ2SJN3MFw/17yosVoizCZFEmzM3I4cocycY8lS
-pQEDRET/GcaKQ9ihVUSLb5jTWglOnSgdHmttQtFu/UbsflW/kgjBdZsdN6Lpg9Ux
-2PjBg6DW2CWrmbq/83TWPOqMWtLk7+ZBN/DlMps6b03btvN4nFaLgWYShZN/3F+v
-0m8HDKUrOhIepWVhPaylw9q3scyiAOvucDxWSw4WY/eL8kAErApwbwttpCAEiFS4
-MJSgovG3nPmqU4tdPq56jQiMEN2MpED4xLnpINPQ46WPmikLD0XvCDfyOw4kL5Vs
-TtulGLr3jgxnyTLEyKuUhU9MwvS+wBzJMDketizH7GY9O7ir+APhUvv8xJ8SE9t+
-/Vld/xSyybX6f2mBGvU+8BS8Cr3oWnDDeeoAxRTzYEwJbVFzRj/MOpMQttgLu0QO
-Wdi/DFqLg1DhXJl8DRzu0zVoY4A5SoCYtMtt53EW6vDT1RZhbM1BuAjHQnJ/1QKU
-7zO1pDEAICGWp69Ntt2UUMYM7UJCH3LTDoAf87o+VN0UkrCwIRNYkkI3r0R08TTw
-iI9u/4vg4CpjOvmnyOk4zFCxJA4SIBUpowJQanO9ynqh22c2x3vsBtrAHxB7kYFi
-UK4dToPb/jhVZcp9PLy5
-=/3AA
+iQIcBAEBCAAGBQJSuzFVAAoJENXLsxwXqFxytPcP/REreVOzJDQNeDKALVU+J/mR
+egTGgPlC7BADd3PbyloVlOsCFcLbC/704OIEt2iL93jrcRW9weiauarsBb1v5Niu
+3yNaBrKDfzBNDh7+RbZDk+lxP0wZKd7h8YkyjMH/tL/vWbzhxk0RNLdJhVcOD3oL
+jwkPrKCcJZ/qHAEl5FzZKtWMINTcd90QjNfFDF3YfMj2Uk6gejnzCTmmZG2619Nu
+lBDXL18EGtiapoGzPEN/HCV3dNV2VM/cHBLLtR97OqXzcIXORiKFGdJLP9BJF5Oa
+wN6WA6c3R9zOuYXFf/18jWecnqpyCRmeMKJdZt85XGGtrHUd/16ne3QK4jNnpOYZ
+dSrEjejm6P1SrjJrb0D1vwNffoF9CU/wb90jAjq7n453JKjKIbV5NBPoJNDlJjQv
+lIoVBMiXHv5VNxl+u1ioKa2SqOBaEe2FIRVpuv8Tyt9SnCDG4TmDYHkIg/Ffu78w
+cgVbxSAnTI8c64TVyMKltXrEAe85wG3GTA609f6IHr+WzOWzcxKJxnXqEpWt3O2f
+bS5aaS4RYdNEeYRUBCpZ4VyLazFGPSvyYMLN+kE72OcYPEmmcVmNYI6HqI602iUW
+iRb9O4OVjnLMxXIhGkSd6dujFReE7cjB0nlCJJ/a/vpaeRVMXUUvT5bxys59R7Jx
+9FcVVAuvM0nx1k6YLb5x
+=5wRf
 -----END PGP SIGNATURE-----
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}"