Version bump. Fix also bug #433944 by Franz Fellner.

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

3 files changed, 226 insertions, 16 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 9374b0285c9a..ce108a8d8b10 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.219 2013/03/11 17:51:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.220 2013/03/12 09:12:18 pesa Exp $
+
+*PyQt4-4.10 (12 Mar 2013)
+
+  12 Mar 2013; Davide Pesavento <pesa@gentoo.org> +PyQt4-4.10.ebuild:
+  Version bump. Fix also bug #433944 by Franz Fellner.
 
   11 Mar 2013; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.9.6-r2.ebuild:
   Stable for sparc, wrt bug #457046
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 4be8cef2f11a..cdc5a2d251a9 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX PyQt4-4.7.2-configure.py.patch 933 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be SHA512 e2484a7361fabe32861913fe2e81e8c4a2d4e0d697a82a643dfc45332e99221767b0224df3fb0b5da27e33f7c2e6585d5b09a022e3fe35e9c8e3af2ba5feb4a3 WHIRLPOOL 44435221972b24dff022c78ffaa0c5888e035a88e95ebf2220605e34ca736d272b46cf875bbe7bde16b3137f255026f8d07e51c35fc6a9fd52d1256feba32312
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 SHA512 b333f4016b048af66bb13177981dc468f6e645d9280c18a4f419127c48aca8b4d5c034a167be7353884b715e67ec110ff7d4d4e850793883186ebfef7678e372 WHIRLPOOL 9c7a0409023e8c3af3626bfb3887aea687c07feb5235506ea0ed01171095d575b5681171dc5cde1c796448bb83e26449cab7df2432e172b47b43ec751bf99317
 AUX PyQt4-4.9.4-pyuic-custom-widgets.patch 3212 SHA256 8a59ee0fcd3f1d8a52745c68c35eed5e4b0e2b31e6e7bf2f5dca7bdb2396e44c SHA512 58e4e4bb43c32408f3ead09c619c414d717a2ad3b15025a54698d2287c085ac3ec2e14760b6f9e36d11a28202c65aed2a3e378e7c7ed65ee9f6d3b7edc5eaee0 WHIRLPOOL 16d32a6f885fc71205c9208ea8e1ca7fcb6f8fed8f31305e907395dfd3bcb1723c3ea4aeda1eb1f04824cc7424eb00b1318834a98350f5a1d789ca0a2b480b19
+DIST PyQt-x11-gpl-4.10.tar.gz 9353719 SHA256 03eaa01a59b13dc85cad0318dd5ae01d0bd6fb3339f502967bae85c6e8c499df SHA512 caf856d84659375cdaee9eead34d05f7bb0cbacbebf6e53bcfefa054335a774c09475d2e2b4be62967443700fc88e97389484e26e1a7d3ef4e3aa43a20afaade WHIRLPOOL e8ff59b78702c5cfaca81cfca1542339fe96c61c49b4e19adb62b95c617f46b3f0b9d568481bae26419bef6233cd66fcdc6de9fa185ef783fda5498d0df02bca
 DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
+EBUILD PyQt4-4.10.ebuild 5379 SHA256 7feee0b8095f84cbe03cc014a0aae5d4d898769ec906b7d6e205f88acd64385d SHA512 ee8593cfb9df288ab01c897a6e75291e028087bfdd3578ed84d147a241a0bc4b8ebcc098c04629b969bb4a774eb0f84a6f8bc9a0a9916b10afdfab4279823113 WHIRLPOOL 30f14a5b1633c385d1ddd9ef751d935c2ed8b7ba2990a7ce83f5c13d77120e769167c0b2ccf5d45e62b9dc57999f79ada2a079e4fc1e1a5b26b65c3bac0f7336
 EBUILD PyQt4-4.9.4-r1.ebuild 5691 SHA256 b7c690f8e50a26079771bbd776e3c814411d7d345527789badad2a449804824e SHA512 d9fd47db0b7a3e2e5e0726ada90ba66ca6df561054839ca66279fe47058ae479c3fc1dbf3802b917a0b44f0a6dce66d7b9472eff85e05ea838087c9758da8190 WHIRLPOOL e53b90e88bbed69941436459d983d2d9debe95d3f7930121fcf961b9a227845451c88ca73d71a85cc85d8a243fe0a50a377b2b64fe1ff080c447ea65afa732c3
 EBUILD PyQt4-4.9.6-r2.ebuild 5253 SHA256 46262e209f803d6fa4bbb6b719ce48ad6c18e7757720b567dcd36719cee4cd84 SHA512 59bb1e075d62928088938d81e8b89ab5607061d3ddaf9865f203e66f135c7ae5485d6fd38f1545f7ed6252d156973cd9e504e5ab495d0e91374709fa3955c4dd WHIRLPOOL 99333609d64ea845f771541922d71ce379e5ed6669287def4c4806d93d385d68a632de3457e812e27017ffe25a631fdd7e6c8edfa66c78f84f963852a77536ab
-MISC ChangeLog 30394 SHA256 25f9021c008de0cbd596c9c64d6e67007c2904f5b896eaa4d887b2d4dc8dcee7 SHA512 28d9cd769c3aa49b390bd22f72eed9e3559e1b1cf861fd935bb25e8689c4f6bd50933e68e2115522b4ff49444667b7d3f6bc280f4bebbea6bd081ba5510cb6fb WHIRLPOOL de058c2ef6ad844efb6148f880977b086940f9a349a1ebf235336233b4264295fdcf048bbeba35e6d595b9796754b3ff2f32841bcc86574b44f648fecd29904e
+MISC ChangeLog 30548 SHA256 602407522e7b70608a64bab5ffefb5cdcbf9ab6cccd06dd6cd4a0348c0b57225 SHA512 197a9bf429a3ac6a81088bd390944a64301b7dee83507e57f102fbaf91115a96c29434ab74ee21fad9afc6724597ac77d1573bc7dcb65b0c31a6303633a107a9 WHIRLPOOL 1d1b62075b2e2f2e352a0d7a5a693438d3bee9803ea6b09ed9834f35f220c18e74415391b49a5d977e6610dee7bff6734ff74a844e5fa450d8c4800f95432c37
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRPhj4AAoJELp701BxlEWf41wP/iPCb9K+RIuDivkU0IOFo7Ch
-AVxOgB9CX+ywOGafE47TyZVeCQf52XfZhRv1FEUsAvNyeNwB+c45uU2SP83DYN7l
-4bp85xiiNSvFJS9RVNSenAP0QXpWnkiEvyfCvmEcrb+jl49tbwOOd97Luv6mWge+
-EjXa+D1SMSDg5ELQoiF0gSb2EkT9AjvML7YuUXslQGm74Wo3zGDzJIYBbtXNRqu8
-vsaVzasMAxqXJj5dmjdnEfflnldZY9vUFN1iCGq0fOfjM0obU3hh5tvbdAoLU4xa
-P1vEyHuYrSarCDY9faFOkswUpCx+JkT0RLucpzQDiRMBh9b4K/zn0gW+sz3CHz5H
-dBEo5GIPNZWq91lNQLfAlKWjBqIp87cRxlp6f9JdHQHXUFAiCi7MoFT3yZESNUlK
-TE9xf+2U+Yg2ESJWw9vGtdO/1IUGTDo2ugTTUvSSwt+DIKnsOZOi0eM5jZZnvaGR
-1qAElvl05uZ17Kq4WLtCtpMBX7LSHTa/SS/eBENWblXICwt5E2UB8qoAksYm+f1n
-Es+D3m4z5qcXY0uYhuhadmu7X9H8Plte4shpHn8ZUyR6tzCJSolQH2/WCHBLw2EZ
-mrCF7NJGq0pzix42qFXJfHV5G0FqDUGD3tv+3BOfkLSmuuIDI1a0x5KSRm4tu8fQ
-349R9j9GjiA5jTFbiHdh
-=GNvk
+iQIcBAEBCAAGBQJRPvF3AAoJENXLsxwXqFxyL0kP/1dCOaM90cOCDvAE0XvM9f2j
+pVXJeoh5A1DIrCbIRRKqzE8Ooo3rPNGRtSSbVpKnCLnoxX4Nr2P6n9mtwtxyWrZ2
+eu6gzntQkAQ9Rst3bGxam1Mv2R3H1mItX2/Q09Dyd19f2HwSvlRM1Pm9HF9TOqKU
+8LejvMRcUqinOpT9OEXV9wudI29L2Y0Xmc/n2Us5OWzUMZWipqDiY74jCgfH+OBO
+2Dw6MYgB5e4XKUAfKMPJD/R+RSSV0bs1T3aofnNkph93tQVRRScsiWZFyn8VMrNY
+YaJZ0Q2Alh93iBj0rpqkumUNsB+lyEFwOXDJkMcyL5ZEZfxueeYUVEHhS8VRS7cL
+W8RnHpeZUMNG0S84VpQcHp3BVb4WrtN4chwiAV7e1gQcJDL9aPsNfaOJnA/N6lNj
+LRpWRNPXsjYQ13JEZqTfQrxxN+hnxVPrschlIQ1iuVsFmPSunNyua1Bnt9adaX72
+fiYhtcrml3NjWfDbNGzAnZEW4lNfsvwW+MZWc4JXwMMFOYZDnQShjxkpOD9WlNwM
+UhglGXfr1DXVkvRKzjFeeD6QXMuxdIkz459MF1MskFfeXb1xzlU0loh4ZMOO2Fv5
+snFRHehvjOm+uQRiwKMLABe0UBjP7azKqMntuT8ynk1BfbmQirSMVM6rTJ0pcthf
+HmSCvAKCIZrt3juxz+T4
+=EmGu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.10.ebuild b/dev-python/PyQt4/PyQt4-4.10.ebuild
new file mode 100644
index 000000000000..9c7b2123e5bf
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.10.ebuild
@@ -0,0 +1,203 @@
+# 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.ebuild,v 1.1 2013/03/12 09:12:18 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit eutils qt4-r2 python-r1 toolchain-funcs
+
+DESCRIPTION="Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
+
+if [[ ${PV} == *_pre* ]]; then
+	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+else
+	MY_P="PyQt-x11-gpl-${PV}"
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
+REQUIRED_USE="
+	declarative? ( X )
+	help? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	scripttools? ( X script )
+	sql? ( X )
+	svg? ( X )
+	webkit? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.0:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.14.3:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? (
+		>=dev-qt/qtgui-${QT_PV}[dbus?]
+		>=dev-qt/qttest-${QT_PV}
+	)
+	dbus? (
+		>=dev-python/dbus-python-0.80
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	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 ) )
+	)
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	qt4-r2_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 433944 and others).
+	sed -i \
+		-e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
+		-e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
+		configure.py || die
+
+	if ! use dbus; then
+		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
+	fi
+
+	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
+}
+
+pyqt4_use_enable() {
+	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}" configure.py
+			--confirm-license
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			--assume-shared
+			--no-timestamp
+			--qsci-api
+			$(use debug && echo --debug)
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtXml
+			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
+			$(pyqt4_use_enable X QtGui)
+			$(pyqt4_use_enable X QtTest)
+			$(pyqt4_use_enable dbus QtDBus)
+			$(pyqt4_use_enable declarative)
+			$(pyqt4_use_enable help)
+			$(pyqt4_use_enable multimedia)
+			$(pyqt4_use_enable opengl QtOpenGL)
+			$(pyqt4_use_enable phonon phonon)
+			$(pyqt4_use_enable script)
+			$(pyqt4_use_enable scripttools QtScriptTools)
+			$(pyqt4_use_enable sql)
+			$(pyqt4_use_enable svg)
+			$(pyqt4_use_enable webkit QtWebKit)
+			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		local mod
+		for mod in QtCore \
+				$(use X && echo QtDesigner QtGui) \
+				$(use dbus && echo QtDBus) \
+				$(use declarative && echo QtDeclarative) \
+				$(use opengl && echo QtOpenGL); do
+			# Run eqmake4 inside the qpy subdirectories to respect
+			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
+			pushd qpy/${mod} > /dev/null || return
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || return
+
+			# Fix insecure runpaths.
+			sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
+				${mod}/Makefile || die "failed to fix rpath for ${mod}"
+		done
+
+		# Avoid stripping of libpythonplugin.so.
+		if use X; then
+			pushd designer > /dev/null || return
+			eqmake4 python.pro
+			popd > /dev/null || return
+		fi
+	}
+	python_parallel_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
+		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+		mv "${ED}"/usr/bin/pyuic4{,-${EPYTHON}} || die
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dosym python-exec /usr/bin/pyuic4
+	dodoc NEWS THANKS
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}