Version bump.

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

4 files changed, 46 insertions, 54 deletions

diff --git a/dev-python/PyQt5/ChangeLog b/dev-python/PyQt5/ChangeLog
index 072eddc765a8..38084f144133 100644
--- a/dev-python/PyQt5/ChangeLog
+++ b/dev-python/PyQt5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt5
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/ChangeLog,v 1.4 2014/10/24 16:37:59 axs Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/ChangeLog,v 1.5 2015/01/09 01:24:26 pesa Exp $
+
+*PyQt5-5.4 (09 Jan 2015)
+
+  09 Jan 2015; Davide Pesavento <pesa@gentoo.org> +PyQt5-5.4.ebuild,
+  -PyQt5-5.3.2.ebuild, -files/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch:
+  Version bump.
 
   24 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   +files/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch, PyQt5-5.3.2.ebuild:
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 590f943792bd..b08966d179ee 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch 786 SHA256 b3d19c603704d07665b160bf4fd7d37586a4219e132323526a79a53620e16170 SHA512 2c1ebceb537e71a0fa9432672024f203e5e16d17b02bc1525ab4747779205cb7e523fe6df5eafdad76ac7e9378262dd6c56cf657487aece70f123d9d2742ebac WHIRLPOOL 3a0a8377a45a8865501e97de87d76aa70fa9e8ff58982731826f1b2b4f2ae7c2864e5a15ed29ee6d0f4d1a31759cfb85db4ccb68bf0312a8f9ac45a5cbc9470a
-DIST PyQt-gpl-5.3.2.tar.gz 3553362 SHA256 bdc06613caa718977fcee43ce3bc4e959ea1efd02d86268d8c478b48c259448e SHA512 b4c7df8c3034bcc5faa02f175b518e1f9d03e2d10aa1b6e83fecd46ed246294a6f2791ce32cddc74e24d4af25df006c4affdb324f194333582b0043eb7a05872 WHIRLPOOL f4ab3c78a4bcb3928902edd2c6d151c3cd904abe23a49eb2b92f214b014fd1dff3d49dea29bad609ac117d36921bfc331606361df67aacc18a7665ba7f3f89c8
-EBUILD PyQt5-5.3.2.ebuild 5206 SHA256 e7b87fb8da6eaf89b44910eaad418b825cf73b38e793b6158804a562b8acd2d3 SHA512 2cea346919c9d7c66884aef14289ab0807e94172519b6e455d613796e76ab3b710c9dfcba423cb6b5cf4c1a57321b4b4b4a81329cc77fea741249ff0630d734b WHIRLPOOL e1b5e69d53cf496d96696a80acecd7978de9c867cd5795fc50378f156f560779d88d84786f4eae7778c0f270e70dd9c7d0bad6095c11899181cce89445eb151e
-MISC ChangeLog 814 SHA256 cfb7a44c595d6ff4ef854c18fe8de5766edfa8a1d9865a5ed5c3e4233cb6a7e3 SHA512 3c1740efc2616cb769854ff89e63ba8e86d76dc31a8f2ba99cecbfdd9c080f81d786cc079bb6421af00531842b212a4d3a8160522490c4e542cdf8b6cad4138b WHIRLPOOL ab99800746cc4a838b38f314e0c89a2ccb13d256fad316ccf0144def8d3444e0310b0968027a4ec0578d4eb0b4f24b206348bbdfe481ddda11c15a8b578721d8
+DIST PyQt-gpl-5.4.tar.gz 3644542 SHA256 760264f5faa68ae22900d27ac114f3a7fffbb9b3ec12e7a62a0a45c887517731 SHA512 dbd8a8194df605d2938b69634827b7ed8c8534f1352ee4e1442df6821d2b01e37b7aec98c8baf12e28a2fb6ffd75a204a79920072b3c7a853aa8de08097520be WHIRLPOOL aa62d2ff017139f3daaed989e72a2fd49cf99ee697f185417efb5e8733365fcc3c63a9151492739f514ac403f3cf6c8292d6ef0a787899d08ac7a1e8cdbb7746
+EBUILD PyQt5-5.4.ebuild 4731 SHA256 c036a1f9daf3387ca80de593012f94700e027f4804613681e713e8d2b76e6f09 SHA512 8455da07beea76a08bc6c76c0fda93e5a94f9a505a36159b1f4aa864d4bc55d00ce91243a885512a4c9347dd9ab3afb4613ce99f70d3a32ddcde24baa851fddb WHIRLPOOL a3b2035b8e11382145e653c877a3ae41ef96d20576d11271230a3d2d719d55971c834004cc0ca78baecfd022dce0a18e01d1a867a5e93388cc8018b9f03295ae
+MISC ChangeLog 1003 SHA256 dd3d52275dcb0955cc3a1b5120f101c956c4e475d29a954fec5fb75cc2b61260 SHA512 714e7ee43552dcb84333c35dc3bc2c8aab01fb01c9695f058304d6fb3fe20d85bb03b193fb8a1325d3cf70fbc39b3b2a062f2e1086365edffe625119e0d73ec0 WHIRLPOOL 742e58ff4bd67470b356a16d101ac9b000e123bde7eabe84bd09f432472e295745887a5869abc41909c5cf04306705999d66d20354856f6e584bd137fd4d4410
 MISC metadata.xml 1896 SHA256 0df3c40650d6b504691e315e87834836e6f29f2c6894fee4130ed66a88c781ce SHA512 dc0fed6b807b0847eede0b75621fc1d017b1d71a22438fcba2e7ac54669928f812cc6b1d83892f00f1419a67cef0ff7600f1448ce2676ea958b0040b94cdc3e5 WHIRLPOOL 32f93fa45c46d0d8d08cfc9245f67e4d72f69a1a47b5c0bb214ddcfe38b7ba9b99f1a471c1ebc8fa077b3b16a2e50728e51974306746006842ed0f55c9175b05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlRKgHYACgkQ2ugaI38ACPA3BAD/flBEdP9+Ut3uCmt06B4AutTC
-Cs7U6iIZ60/fho/PWNUA/1u48D4zcaUQLFi/NSKUZfA1RDYW9GRyDQ5y7bx0TiiI
-=uAwx
+iQJ8BAEBCABmBQJUry3SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ZEsP/iWOZDIPPyQvIvSVXzp2SjD3
+YV4J4C2sdjMGdtcbkDXzwKXbo5AvTJYTv7vo2N0QaJY2fm5yfYygmWgK9J32nTfP
+ucaGImSvyB9tbo3+Eml7Ff50DMVw2fgrCyi5UGySHhP8SwDq8XWg0VR3T4oqdnbj
+Vc4LLPX+pEoBgPPd2ljONBQS2guktiDe1PPbnmrEKzOMrVJOmr5jz0iZ+GekR/Mi
+YAKG/OGRGUP8I11sKCt1JKmmEHYO8x0nBOc5+85zPKU1YZY0mvJ9uXjiUANETdtD
+K+G1ydDvZ4MDG7PYy7sWzamNgt4Nl0yJc/hqG1doN/kFPgZVLeiwoNLjnWCMydsz
++QBTL1mvmNiWh9ocIgR5WcPbLLNxZgnROdmmCKfYrQlsV/dTzr6i8i1KMK4HOLp1
+AwPOFQBbR+rfgVZp3+YVdlfSHNJT2vtF3jw13K+viA0CBkVa9JrZv/ycDw4LfcUK
+XBZ51pqhlHMqTuWC55zCcDwahz779ot21njYRpKK8naKffOopPcyA2QZSmBXgtc0
+ZmLKDwNaJZ2ZDig+JVVD+0VCUv2pPQF6hjSHysjXEppdG8Jmaq9ULA0YkAGG8gaA
+msax3uXwQRqN6n+alpHWm8ogYKVaD7pw1VWVGEVgdiVFpBaA3n//9D3Wk6X01cI6
+XPsuX8tmlTZHaNMBQCX7
+=+RzM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt5/PyQt5-5.3.2.ebuild b/dev-python/PyQt5/PyQt5-5.4.ebuild
index 5961914e173f..2a2cce9b1e19 100644
--- a/dev-python/PyQt5/PyQt5-5.3.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/PyQt5-5.3.2.ebuild,v 1.4 2014/10/24 16:37:59 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/PyQt5-5.4.ebuild,v 1.1 2015/01/09 01:24:26 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.
 MY_PN="PyQt-gpl"
 if [[ ${PV} == *_pre* ]]; then
 	MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION}
-	SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 else
 	MY_P=${MY_PN}-${PV}
 	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# TODO: bluetooth
+# TODO: bluetooth, webchannel, webengine
 IUSE="dbus debug declarative designer doc examples +gui help multimedia network opengl positioning
 	printsupport sensors serialport sql svg testlib webkit websockets widgets x11extras xmlpatterns"
 REQUIRED_USE="
@@ -41,7 +41,7 @@ QT_PV="5.3.2:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.16.4:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	dbus? (
@@ -75,21 +75,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	if ! use dbus; then
-		sed -i -e '/^\s\+check_dbus(/d' configure.py || die
-	fi
-
-	epatch "${FILESDIR}"/${P}-add-dep-to-QtWebKitWidgets.patch
-	python_copy_sources
-
-	preparation() {
-		if [[ ${EPYTHON} == python3.* ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_foreach_impl run_in_build_dir preparation
+	# Avoid automagic dependency.
+	use dbus || rm -fr dbus
 }
 
 pyqt_use_enable() {
@@ -99,7 +86,8 @@ pyqt_use_enable() {
 src_configure() {
 	configuration() {
 		local myconf=(
-			"${PYTHON}" configure.py
+			"${PYTHON}"
+			"${S}"/configure.py
 			--confirm-license
 			--qmake="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
 			--destdir="$(python_get_sitedir)"
@@ -108,6 +96,7 @@ src_configure() {
 			--qsci-api
 			$(use debug && echo --debug)
 			--enable=QtCore
+			--enable=QtXml
 			$(pyqt_use_enable dbus QtDBus)
 			$(pyqt_use_enable declarative QtQml)
 			$(pyqt_use_enable declarative QtQuick)
@@ -138,17 +127,9 @@ src_configure() {
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die
 
-		# We need to specify the .pro file name when it doesn't follow
-		# the subdirs naming convention or recursive qmake won't work.
-		sed -i -e '/^SUBDIRS/ {
-			s:designer:designer/python.pro:
-			s:pylupdate:pylupdate/pylupdate5.pro:
-			s:pyrcc:pyrcc/pyrcc5.pro:
-			s:qmlscene:qmlscene/python.pro:
-			}' ${PN}.pro || die
 		eqmake5 -recursive ${PN}.pro
 	}
-	python_parallel_foreach_impl run_in_build_dir configuration
+	python_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {
@@ -158,9 +139,14 @@ src_compile() {
 src_install() {
 	installation() {
 		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
 
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
 
 		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic5
 		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic5 || die
@@ -170,7 +156,7 @@ src_install() {
 	}
 	python_foreach_impl run_in_build_dir installation
 
-	dodoc NEWS
+	dodoc ChangeLog NEWS
 
 	if use doc; then
 		dodoc -r doc/html
diff --git a/dev-python/PyQt5/files/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch b/dev-python/PyQt5/files/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
deleted file mode 100644
index 739cf2770057..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt-gpl-5.3.1/configure.py	2014-07-04 11:09:11.000000000 +0200

-+++ PyQt-gpl-5.3.1.new/configure.py	2014-09-09 03:13:52.351527684 +0200

-@@ -86,7 +86,7 @@ MODULE_METADATA = {

-     'QtSvg':                ModuleMetadata(qmake_QT=['svg']),

-     'QtTest':               ModuleMetadata(qmake_QT=['testlib', 'widgets']),

-     'QtWebKit':             ModuleMetadata(qmake_QT=['webkit', 'network']),

--    'QtWebKitWidgets':      ModuleMetadata(qmake_QT=['webkitwidgets']),

-+    'QtWebKitWidgets':      ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport']),

-     'QtWebSockets':         ModuleMetadata(qmake_QT=['websockets']),

-     'QtWidgets':            ModuleMetadata(qmake_QT=['widgets']),

-     'QtWinExtras':          ModuleMetadata(qmake_QT=['winextras', 'widgets']),