dev-python/PyQt4: sync with upstream

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 18 insertions, 10 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index b9953c8..381b0e8 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,14 @@
 # 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.261 2014/05/30 18:30:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.263 2014/06/20 14:01:12 idella4 Exp $
+
+  20 Jun 2014; Ian Delaney <idella4@gentoo.org> PyQt4-4.10.3-r3.ebuild,
+  PyQt4-4.11.ebuild:
+  add py3.4 support req'd to support py packages such as pandas
+
+  30 May 2014; Davide Pesavento <pesa@gentoo.org> PyQt4-4.10.3-r2.ebuild,
+  PyQt4-4.10.3-r3.ebuild:
+  Restrict sip dep to =4.15* for older PyQt4 versions.
 
 *PyQt4-4.11 (30 May 2014)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 59de558..28f6367 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -2,7 +2,7 @@ AUX PyQt4-4.10.3-sip_4_15_5_compat.patch 5005 SHA256 3f205037802d8f2bd99f19f3b01
 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.tar.gz 11118078 SHA256 d91b942d2aa8115acb83f9aeae71a4afb4d042c1cd23a2a9ee75329a7c539366 SHA512 ba6e42afa5ea235d5b1e9be79ff57c458f1d0f11cd4bffff38c48c4c55692409c0750e7d6dd385fb811e874f308a2eaf3adce70e3d5aec70dfed0c540df65b58 WHIRLPOOL f71685defeddc3a182073b0ec9970b28416ed2bb61d4dafbd9dfdc887fa1e076426241e42a305cea744f17911ec0df9829c36fa5de30bb2881a0a40bdc1ead46
-EBUILD PyQt4-4.10.3-r4.ebuild 6136 SHA256 8270b600fd5f364cd86b803c934f0c234892baafc66aa5c2420ad5c1be4736fa SHA512 dcbb314a1fb26508335c7d3e735c947ecc985e78c07c59f2b1ab8f09ae6185db20adae49b34de8a3756afba3607e13d474989e7a042742ce3516a6346f97739b WHIRLPOOL f729394467054bf53f007b460b2895a6727f2ce0375d47cbfcb29986d7b09424da8d4a7496a7c628fc7966832760f18fb05fff00898c0703cba80020d8886b09
-EBUILD PyQt4-4.11-r1.ebuild 5933 SHA256 60322551328e6a5f391190aabf6e29136fd0e497454ec0b7b02e170f5119fbba SHA512 7f56dd477de933003d7eb4eb28552a789c468e468c33353ca2d9018526f1c21fe7a0f39b4e256d5dd1aad9998ef961484868afaeb67c2c081e9ba980e1a4c312 WHIRLPOOL 05f982c8461a9dfdd10f51cd522555bad1c72a077f86644b53b94df42e754024262978c803e2b3b64d16857148f5dabe685cbdbb406b6e1ee218f7fe9d582353
-MISC ChangeLog 35926 SHA256 0128c602a46d8930a2b593773d0a0e11c33c308db1ca705ab31c9e17243d80ed SHA512 6b2fcbc70c4406f1f048330c3ad6ddffd96010b9019b26adaeb9c1ac6e104773fde8e2147fcb1ab3b6b80b174fef7acf744acf7a4e42889b1dc7c8de30237a57 WHIRLPOOL 9854f193030281884154b44fa04b30145c58854ef380ad2471da1fe56cc8e285b2e1104ba43ed1cc1034bdfa45ecd4629cd4587a1b19945762ce174ff2d78f0f
+EBUILD PyQt4-4.10.3-r4.ebuild 5975 SHA256 47a28f3d2fdb296e29ef0801ec57c101e899db9e7806ccb3c85880c23bf33c7f SHA512 7733321551918f29360a8f36dcb8d05f405bc98e132fe76cd76184a0a7a5c6f66ab2e4b2ff01b311cd88f9bea04b0a6c845d23a242e4184090ef7a226c0db37e WHIRLPOOL cffbcc6f0bcf8013f23d89dbc356cfd538eb776c6606ffd3060fe385667c9c95f996852d2cc9a28f89ac93830911a7ea3e6b82dad154f7683b11407280630007
+EBUILD PyQt4-4.11-r1.ebuild 5867 SHA256 6025140a4b04de2eebb2aff98ace8fb166aff806e844350af2160d66e795919f SHA512 342f8c97e2a12eefae2b1517aace8bd69c53290dec6ccc54cb84ebd01814ea4aa9ee8786f634e3ad0872d56720b4e1cf25e9f033946ec5460030773901e37af6 WHIRLPOOL 0548a51f506d545a0478c7eb2eb0015de3b6180f75c52a7e536c7bc6e4c95895606a836ba667346ce0978cec53c10ca69e8b901cfb21b773fcafcce6b940856b
+MISC ChangeLog 36243 SHA256 931ff0eb8c5414433d83d9e327fa7a0d29ef6fa963b932934f63fc0b3b0982ab SHA512 eca76889f8d6ebdd213827cd59019ea1c13353768f86455e2c01e3f8fbb12e653f9520750efb96ba14311580d49de1e896435a8272b685122a273d2e96122f46 WHIRLPOOL a168bebb2f43dc43f12d934ce156ca2b81eaa1b4af65c8fe5abdf624b26ff85874bc88aa59d38c34e88682d70ce66871280abed857d0bf9bae15c73f75d04c56
 MISC metadata.xml 1206 SHA256 1757eb7c7f29865aecd996948d3f6a2eb20986a3b938cddba4618e1eedfc69d3 SHA512 d94177fa61099360b74bdeb3e3f9667d8b1b5b7e5b055323524b325a655970bd61420ae76da59e8d519c3e020394f4174d0e50dc95e7bb57d3d7fca602932104 WHIRLPOOL 0c93eff1a6dad85699c198f0496695b88d01541ed35dce79a316360f123242e6daf8955e36bb848c92dd3210815065fc89a4d0e94438be169f2aa87f2e478b33
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
index 287464e..d44e5a7 100644
--- a/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.1 2013/12/25 21:00:36 pesa Exp $
+# $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
 inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"
 
 if [[ ${PV} == *_pre* ]]; then
 	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
 
 IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="
@@ -42,7 +42,7 @@ QT_PV="4.8.0:4"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}]
+	=dev-python/sip-4.15*:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	X? (
 		>=dev-qt/qtgui-${QT_PV}
diff --git a/dev-python/PyQt4/PyQt4-4.11-r1.ebuild b/dev-python/PyQt4/PyQt4-4.11-r1.ebuild
index 0e1ef12..47d176d 100644
--- a/dev-python/PyQt4/PyQt4-4.11-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
 
 IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="