Restrict incompatible versions of dev-python/sip and dev-python/PyQt4 wrt bug #506452.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 28 insertions, 19 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index a0cce64a8b9d..01072c8b2198 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.294 2014/07/17 10:49:14 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.295 2014/07/17 10:59:25 kensington Exp $
+
+  17 Jul 2014; Michael Palimaka <kensington@gentoo.org> pykde4-4.12.5.ebuild,
+  pykde4-4.13.2.ebuild:
+  Restrict incompatible versions of dev-python/sip and dev-python/PyQt4 wrt bug
+  #506452.
 
   17 Jul 2014; Michael Palimaka <kensington@gentoo.org> pykde4-4.13.3.ebuild:
   Raise dev-python/sip and dev-python/PyQt4 dependencies as patch to solve bug
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 27b14d43303d..8d70bcfeaabd 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -7,26 +7,26 @@ AUX pykde4-4.13.3-pyqt4-4.11.patch 560 SHA256 bc0084342c177b3dce7196a9be4bb159ad
 DIST pykde4-4.12.5.tar.xz 2005104 SHA256 f03649015070ad9a2c6b0015af0c9972503012b3fe7f3d9b0c6d06fd3f479554 SHA512 b26ef3cac39e03141dc739bba03d8be4a095f74b31de0296fc1991e9cf60013a43bb03a4fb5a8673fc98d4824a5a10ed6fd18261d1b23bcf74059d28c780b834 WHIRLPOOL f176ccb420abee5768836bdab650152a335f06cc72b21bb559192c04a08f0ebc04c3d08c2150291ab2d93b931846cf4a0fcbb0bad7af8b39994aa011b216774c
 DIST pykde4-4.13.2.tar.xz 2005460 SHA256 e114ba9fa96cce2c2e9ab2a5b4b094b031e18eb706350c0407fe3e7ba812371a SHA512 152533966e1dd7889443c8d397344537eb0a164e37ae1d697abe35bef9272e0b1dfa46ce28ac258c66525ee4c461e83d63d1258f3eee824fba3c99a2a890b35d WHIRLPOOL e0f80992c61ee42f44830ffb95f97d986aa9b4f4c4a8df6002a9ba06c24f34ad28e417349986c3008a53e0720d5866d3db2052a5c5f3c89bcadfefb1cb7731c5
 DIST pykde4-4.13.3.tar.xz 2005404 SHA256 94392ac9026c506428b20696efd4b9061dfdb034fb8741c1800b41fb8dd8d16b SHA512 4a431e25b178c65516abf8409646fb06ca7d7f46dcae4c994863257677158fb01af12ef61a7fa8bf12762c96113a7e42255e0f0cd5baedae595ec41a14a8d099 WHIRLPOOL c3a9dc61c13c9b33a0251c3eb701c7bf4040a37a736af5b17836a50d7a776840b76e65f78e323e48bf9dabdc9f118c8da2e4541b1d3a65fd1feb92a62ee744a2
-EBUILD pykde4-4.12.5.ebuild 4244 SHA256 ae4d8b14922211fbc8e69d9f8a722b4cd6d79c366d9b7ff114d23e70736babc8 SHA512 0ebb9e04ae2c0fcd3ff0555282bb38fa0f909dedd07d60c5477ae226e287412c7526ec585d93e722674e30152fb017c80302f09fb1763b19607e2a5cbe85b011 WHIRLPOOL 83105b106f04c4c4c2ce5f3624f251ff65414ffc7c2f6412dec681c79d4768b786cecfd7fd1b6660078a6d5677b26d312146f42dc082a053104666b92137f1e7
-EBUILD pykde4-4.13.2.ebuild 4198 SHA256 d1f7cc76f14d24bb22f8f8e796b782c724b217547b8291d7b4c7a7696752ff01 SHA512 b9d58674d5200d8d4daf2d5daa69f0b2b6f3f82ba934b2a7b24de4c66afd1c436419a4efe5cb5ac01a69045da4a5499530f494786f10a8e0461d4b8cd60c3538 WHIRLPOOL fc6a9a99f06e392df004d44b3f522030f055d3fef4756f2af8c8bec79e8ed997ad2430573aab668eb9b67eac652763a1936b41f86f0ec381dbcc887bebfeddef
+EBUILD pykde4-4.12.5.ebuild 4297 SHA256 5aef84bf386fe13ef85edc339e88359028901d86dd7805276ce17f937592ea50 SHA512 04826db535c19e69e29a97b03fefac295cb334caf8878d74125f7a3cfa311443655f2188223e217b2429845600af087cff4708fa913c5b708e3ea6dba6bcbc41 WHIRLPOOL 1d232fd64914d2ff2b7c3e5826259da5a2347d75ed5ad03c273b9d4319f437ff4897366bb894d070b2f419c23404dd5d96a83189c4fc29eab0409d5165b52f43
+EBUILD pykde4-4.13.2.ebuild 4247 SHA256 c945da124407db190ce5583fff9838f7a04285a61d018e1227cc9906a68b628b SHA512 19c5ad371b7d2e9c8c04ed9f0b81bca02a9e2d04c16fb629babf3d6ba697402d5244e9392e704f68c6feaad784d5cf24c0e49aeddf78a610e4326716ea1e4f7a WHIRLPOOL 48563b1ad7542ba959645284393e910772537902556b12e7c67c58c1fb0c1ec2b2b92d40e3d7d8d1495ff64774fa7d7385987ec218aeb46ddd013a70545758a7
 EBUILD pykde4-4.13.3.ebuild 4261 SHA256 0c08247a8260c797c4161b57e68db613205761777e9f82238b7df07b0d4feb65 SHA512 2b91ec73b79050e6d1318caa47c7f0185cc0768515b9936b65ee64cd9987897eae84b2a5e0bd596cc42e4c7c0f41ae53a82064358a15864d5668b93a5542984f WHIRLPOOL 2c5b1d798b91d414c265ce0c477e042ed7d264bc28181d06f3d0bfbd35af686b72aa09b91a0134f1b48435c7d0342f95e980351271130a0cf3c2bf235bdeced5
-MISC ChangeLog 37516 SHA256 d336009268a0cb5ebdc191d991a96d3a7b9a12ef02c090fca0b2cc921bcc7e8f SHA512 93a610323c83420a40cf568b1e20f7dc2cfbdb640359075c64f2c984ace85e5e45f034c86cf94a3e1902ba0d4efc7293f0f15711f02dbf55ec439ac805472f48 WHIRLPOOL 4e1a5edbf7b6e92c002dc27f0aef43f35c4308856bd19c46dea5447902c6c070ac2d6ffc2070d69ceb76006a522acb49609b8fb16c2571bb5d9cb8fbc9cba732
+MISC ChangeLog 37710 SHA256 4090151ce736f5b8e16330b53cdf668d1bddc2122568e566962ef02bb3c19498 SHA512 bae57b452c09ef797a56bd38ae488c8bba845e71b19639c88a756c050a40de161f48d0100dd0db38fa46077ff5fe951afdea58ff4ac7186edede4b25b56d35a2 WHIRLPOOL 8978e1130e053d337c7c43c30152761e774c0f77e71e55350416cbb971d46cccda06babd87cd64f4312e20a4e58344df25ad17c37bf17e968eed8e9974a857ba
 MISC metadata.xml 382 SHA256 25b7cd412982aad7c20c6c613ee3d70ea82528fbd674476db1640d71174b27dd SHA512 1d90dac63896b5c49aac8d7ed5bffc81036ba7543c8674618da986ebd69abc45d5d7e2d0a33e39f34a2572b7942718338d26dbc0068b9671cfe260a18ec19563 WHIRLPOOL 04e9b0a99f7008c67727a2491115c18be708ff0e20a56ea677a8223f17e47c9e2f3e0385c5b0ceb9b6dfb755602d46c3d2db37e8ad1cafe9dad8d6d3cb15e37e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTx6osRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJTx6yPRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Hx6D/9A0Yh9j0Q/KEfFYN5ODAEllNIrTwQZAbKX2KhHu/9bQr03cqys6hO1BhAx
-+hEN7eZHKDp52EfnvtPhfxEZfZeUZM5KKnaOT0Pj9H3dJ7cXFfj0VgEGkQvuGuBY
-G/9UTFMd9YcUrQhR1hdt84STWsF8dbAdZiQ8MfLsNuS5NgfqE11jc37ovBrnK3k2
-cRwF4byLM4GG7l8NqAnTnPtM440u3Zp1S5raW7AqBZDujTPBJ2LnRDPmy7+at2Yn
-ftZA0pmZX00CGH8duj33AuculwJu0I23IIG+6z+Z5T7QrHnOWwKrwteCYILi789V
-wpq0IJCUtvDI/XfSKxpnHLt9stm37J1pXjSNocE68Dr5Gk0FmOCwvlmKy/3zg6iA
-z3EQRIeoL7vWP4po/XxqxSiWb/fVqh8nu+5VI3lF54giwdXDzGMmG92BWFUAieEG
-66OqWAH3VRI8xiifzwkJ2BDAa9IPzqKHXAHw5wbkxzp5ZnLL0vKruzhYsf46U+f8
-KcEmCJFb37gss9vbHKFOs4gHHqAtzEOn8nBLStz14uFM4/6+CAKDoQXcHSLP/wIJ
-uHXf6p0HKyyEMKiHVm0ut9MX5+6vYxjeogQO9szZGF/0T04fjwdWW0tbdlCSbQZz
-FEJP1qhyx+e1YBLqW/1c/+SYRRqH0oU6UlK0iO8leAbVo7EI0w==
-=Sj2X
+7Hs4D/9zkprtp1G8mBP3hJ5+qGULXRTImueTf+C08r/rbYiY0c4cdzwAzVGMhoEw
+g3t8C4bSc6qStolM8LDm8K9HB4+Gxq8uBwPBPgawVuhmVJ2eEAKNbSDVLXrq9kdS
+KDar7pxqDpm+e9kSdKjES8YsiIjBM96ZHVqFxkNQbjxwNrFp/Iv7NC/h57NTx808
+piFt4rbxilbu8pzANci3AEIzDxtfB0JvLL7wbrfnK6CUpfGocB5Mt1f8r5ubm6bB
+NQqgP6ANj4tIzVwaiz+i2JdioXVk9m2FQSnmBx4tDkt+Pksh4+ObnTJRYKGfx7Gz
+W1t6b29ama4bMpCri48qlzsvEEJftmmzl1HDaOEhh/qqDsCFedG98HrpzcuTtixT
+dpGt37ZwDD7MJ2VhH7JOCTLU+fpKlHAkuKYzY1Av8DF9ZlRAb/c/P9/brs83qww1
+nyRsev9zPFoQWoY9bg0sA21fEPE0jRx2Cp4OIRlix6yCQaRFfJJbXhknVjbguYzM
+mJf+uThp9cHWy5JKBIVkz9j4Fd+BpTumwoouPRbMq31FIppwrwZ/xoq8FX6b/h2K
+q8g2Kg81QXL2snqGB73NBID4tjbZk5Qyolkc+GkNn6yfpywsh+a1k2y9lMtSxBl0
+M21tXLGeeMdRPc2VIbiHUjdfhqzWxlE7KzktkGUKfOY2b0i8MA==
+=0fp2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/pykde4-4.12.5.ebuild b/kde-base/pykde4/pykde4-4.12.5.ebuild
index 3425b2ac7f6a..a1a6f57c5677 100644
--- a/kde-base/pykde4/pykde4-4.12.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.12.5.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/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.5 2014/05/08 07:32:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.6 2014/07/17 10:59:25 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
+	<dev-python/PyQt4-4.11
 	>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
+	<dev-python/sip-4.16
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? (
 		$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/pykde4/pykde4-4.13.2.ebuild b/kde-base/pykde4/pykde4-4.13.2.ebuild
index 44837ef73eef..d40584c7c4ab 100644
--- a/kde-base/pykde4/pykde4-4.13.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.13.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/kde-base/pykde4/pykde4-4.13.2.ebuild,v 1.2 2014/06/25 04:12:13 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.13.2.ebuild,v 1.3 2014/07/17 10:59:25 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( nepomuk )"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
+	<dev-python/PyQt4-4.11
 	>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
+	<dev-python/sip-4.16
 	$(add_kdebase_dep kdelibs 'nepomuk?,opengl')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	nepomuk? ( >=dev-libs/soprano-2.9.0 )