Fix building against media-libs/phonon (bug 525354).

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 53 insertions, 20 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index cc41c23b0445..9f940db86041 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.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 <pesa@gentoo.org>
+  +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)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 829619429d98..37f27a885c92 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,32 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX PyQt4-4.11.2-phonon.patch 897 SHA256 0e0f5ff891fce64e9d8b6e743e2807c622921456e08af35f7f20085281ab2737 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee WHIRLPOOL ebc3f8da193764195f63b4306a7d8f240d95bb276f4702f0dd81af6cd766b4a0f984cee153ff0ae153481464724a53246f009bd21d6b2503a3c212076849a424
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
 DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
 DIST PyQt-x11-gpl-4.11.2.tar.gz 11120742 SHA256 05dfc4060d25f81e5d45fb020ad59d21af7dc4c01ace4d2b37f3b49493d03f6e SHA512 c849a28070aed1ab55a407da7b3386d5c899e5ada3c8b21b50f8182193a9f6fb53c7ef9ad02b2b261fd3ce901fb2a0189fe4266dd20cf6036bc2c8047f47ba79 WHIRLPOOL 0106a5c4f1f91e79280da3ff834ef61285cf6b8a18cb3d48df7ab969c28b35f76fbdfa648401f8d1e128feee139fcd7eb74edc0fd9ee17ff7a04f28855563eaf
 EBUILD PyQt4-4.10.3-r2.ebuild 5661 SHA256 b71c877ca0b824dabb9ac99ab1c0e27b5b1686be20a642ef278e344c33413238 SHA512 67195e69490050607741915966ecd3cf4b4be2a7036feb731ce8535aa7fc82c9fc932d6a2e1eb1d301204971d53d6901bf01731bcdbdcaa500916e3cf91b24fe WHIRLPOOL 70db74ec457deae5ff938067882c2bf48973f15e625a2214450e04db8a6ef04219a64894e7993df71ad1fe78e521404bde003a6800fd9153007c18d347381a00
 EBUILD PyQt4-4.11.1.ebuild 5614 SHA256 86dc8dc29ff7ada0ae44147b441440db712476150e21c43247952e513ec1d9f2 SHA512 558c0948e9e3dc2519cba5e6955685fcfdcb7e19913d95e074d1b79671b8672c5054feca10a3d0f6bbe1454bf106a0fdccfd3820d9677fccb2dadf29679bdaf0 WHIRLPOOL 3d66b972e6f61e466de8eab842e2d171d4d32baaffd7de52d82fd5adb69dee377239d21224689219ff6c643b3c55345a88e0eca4b6aa5be0b50619f596d1f695
-EBUILD PyQt4-4.11.2-r1.ebuild 4426 SHA256 dbfabf97423e3fb3802933461a4f1775ebbb088486ef8f70b1f8dd241c35919c SHA512 21f7697523a5b4b80744a5c23af04f84542b69242dd7f1a29b9eb5bfe0523cc152004c9c7d90b9cdd2498cff3b9e291175156978b1cfe23a28f3b904ad5c2f1c WHIRLPOOL e6eac7985904d2d06f43e7e9cd9d6c50f4a21823f0f8f1868f6a7d8775e2eada197a09fca7968aa4d684761912748bdf3e5bded5ba70523f69c27d10801f30c7
+EBUILD PyQt4-4.11.2-r1.ebuild 4550 SHA256 ac63340690e66c021786f7636d18b1c83f65f56caae96857bd023924020ba861 SHA512 a871d5c7b0c2f0c89f1aa4ea97f0f7eb1c10920e86b5647035058b5bfab59617b0f6c4cc98291b1a5b0d3088bdccdc5493f215d7e999d3c165002f45bafe1c59 WHIRLPOOL 32812af179293415838d22a4ae49dec94ad6f00daff3ace079eb719d17192824f0a4ddae39afc91a99c83e50af2259f81e95c3fa21d1d40f1a2630b1895c417e
 EBUILD PyQt4-4.11.2.ebuild 5615 SHA256 6f3b0b50cde02e9fa9507c0d1bab42f8514c029d8e5c110382547b56ed8611f5 SHA512 e10ec78547a1fe49701d8ce73f3dbe4f4e3adec055f32209af55c8ec7da43b5f5bf7f4ce7bf14b42241878626f21b2803f5535cea90fde40f73211b6683ac2eb WHIRLPOOL 416cdce1aee0a233acbbeb1d8adc63344c69538c7c513154167cf23b4aea1efedf4166fb51385d7795939d02a0286bd2558f0cb591a20c70387521cbde6861f3
-MISC ChangeLog 37425 SHA256 9ddec1378d2f2d958f2623d58ac5096f0fdbb87eccf871906893b91f597a9620 SHA512 5605e64bfb2eba13143664a2ec281385ebd02861a9d80d24751c28ced07ace11b6a5e9e10d65a3740489315f212a10943e0944cecde107ac9d3cea56397e4595 WHIRLPOOL 4dc601ca6d920debb91b07e20bd05e6670d974e60f1cb450a8809c5fb8d107952435ee9c05d378e67218e810293bacd8fb592e440ef591c1aa6637e86495c847
+MISC ChangeLog 37591 SHA256 73b6f2540bcfdc9abecbb58c3b0d372aa7a1156e5d8139c7c62a4f512ef1e892 SHA512 3320a71f7bf301a3b4b6c371406c3c1124522c73010edf870df20a6a788b64574acc831d1f7b044658e1bc92ac578a754dae56cf3e01d2fc244eed7a80c45863 WHIRLPOOL 9e5f5b92b8ee9325319b0a9076bdb284acd6947a06845382d6b96ea93f143497fbcb1c650592fd85354eef57fb10268ec99de58aa6fc033b256bf5775e79d5e9
 MISC metadata.xml 1577 SHA256 166e2a7e692d873540177609fc64de3b423048895c919b0e092d0e99e2b6476a SHA512 7ed844b5f4d2e9355aab4672448eab120f9914dc96ff29ca1197df5fa3ee657a00444f3c5ff11135eaced730664738b3f43205ab1d61a54a656166046beef203 WHIRLPOOL 108e531296bfa72819d5a1364b021c2587bf1c023b498ccb0a3fb75385b26f458c95eaec3d4392377e3bdae901aaa4b6a4486c9e30f61a0b8e2b264c13f1d76e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUPCeUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUPI8nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9xmwP/0vzIP8lVy2HgiJm27keoSFD
-exCo0lX1UCq+aPah/gOUlxlbanD2LF0j8SYXfeBgq5PjcKD+mTc98cHVFmuK5W2i
-hNE/w1xeb1SRuRUVwy2J1VnpLMJ8geS/3/rfDRmN9alocccocLNvQDBFzXN6gMYS
-Xh9NzDDXJDYIzMjQ24CyKQHZhzv13i+ixvxg1TPNNUHBT4TzkTgphqzY7GR4xs0R
-yVO6uqzPPfMWBfIX6zVU/1cyPocfGykfaaK1/6g/EZQEY+KuyIeam2k2Cgby/RZj
-lO2tkl0pvtJXZxTwKUbMXX/AZPAnXe24l6MFdf8zYcFnutc5lq11icaYLE2Lrx6u
-qLCJ3njWV2sSlTRq8MMzuzYJAqqiH97jKMMWIpoIdnAk8hcdG+AoYzpEs7Bp4z+I
-XH/LbINIMMxvb0u6D9XbttlUFx1LtfNOIBSz7zWod7pfDkk0Qed4hK0Xgju/8LMq
-/jT/nEgGaZq7HdKUrGor0fgTLGZOA7rBw6AVpQQoa9wlI4TXTcgVwr+tita0yGTG
-74gNxBwkdGlJufycWWPwxW5UoqMz4fgYRmQ3mOZwvpyfVtT/B8B7+3+nRPc2OxKj
-2jt1rmuSKUxYcR4txrS/fGv13osrNJQ/mS0XUkHx59adN8eeJAc6oXi3c9G2kS4l
-r0t5GenSBUNXV8gpCjFB
-=0E0R
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9T9MQAI+wZZxjY8sKNcEINPk8jD8S
+v6Xk/Cple/WsjNFCtikvQUHGji6+iNoZH/u+u3yftk0waSYHdYViGUsKsZ9sg7KG
+yUu6WsX8e/HOGbLzdgFDThiL23/rg1MuI9lU2TbNWEp3tLGhp1uzK6jfSoi2cEB0
+rqt537qGfFFZQ1vc9eWMikshWzkie6AKYnNqpP0pGKxlrVl3yoa1wqUDR39lNHCE
+7lY6M/tHHiTkmXASoY4zr5GgWN7O5gHgZkkgHWjSF1mf6hn+ES1CNpcotgdb6jt6
+x7RLGWDmuvc4K0MReOWC4n/2aO34hKoqHOXReYt5b9iQstw6+xbKDWNCsinjhUsO
+PiUH36iiSQyfRRUMI+uhx4f9qH4T36WI2RtsOPOZ4j5i3/hLff1ZaEYF7wSKAckf
+7dPU2HjDqLIUk/PXHS0H6IZUPiq8C2ywIrkGpeKf7+8VlIuRhaPs5Qf1QjBptIC9
+6dewG4PZW6v2NU7HH/lITzmaJou6rvgc9By8Kv+gjZYWeuk/btgMsD/hxVrHugWw
+OYyJqL9z65tBClZuQWtNKTGUSF6Zbnggwo+5iBYNGzn7+nClr9+5eu0aB1FtWX09
+/IMDdNvR7G0Sg6B66NMWCWKmY4CmSNuIG2sqysUYkXOm/tIJPyHMItbNGyFXKSXS
+4HZeNmoqz7+f/ohkO9iu
+=Khk+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild b/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild
index dfa6ad9b8a6f..9a8a273845df 100644
--- a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.2-r1.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-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 @@ 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-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 @@ src_prepare() {
 	# 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
diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
new file mode 100644
index 000000000000..e3449b3b4bfc
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
@@ -0,0 +1,25 @@
+From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Tue, 14 Oct 2014 04:30:29 +0200
+Subject: [PATCH] Support building against KDE's phonon variant.
+
+---
+ configure-ng.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure-ng.py b/configure-ng.py
+index a80cb57..fd2c56c 100644
+--- a/configure-ng.py
++++ b/configure-ng.py
+@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin
+         if mname == 'QtCore':
+             includepath = target_config.vend_inc_dir
+             libs = '-L%s -lvendorid' % target_config.vend_lib_dir
++    if mname == 'phonon':
++        includepath = os.path.join(sys.prefix, 'include', 'phonon')
+ 
+     generate_module_makefile(target_config, verbose, mname,
+             includepath=includepath, libs=libs, qpy_sources=qpy_sources,
+-- 
+2.1.2
+