EAPI=5 to be able to use slot operators in sip dependency. Sync USE flags with pyside: rename assistant to help, add script and scripttools (bug 431460 by Arfrever).

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

4 files changed, 237 insertions, 16 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index bcc8ab1027a9..541f9e9abc6f 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.203 2012/12/10 11:20:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.204 2012/12/26 03:11:43 pesa Exp $
+
+*PyQt4-4.9.6-r1 (26 Dec 2012)
+
+  26 Dec 2012; Davide Pesavento <pesa@gentoo.org> +PyQt4-4.9.6-r1.ebuild,
+  metadata.xml:
+  EAPI=5 to be able to use slot operators in sip dependency. Sync USE flags with
+  pyside: rename assistant to help, add script and scripttools (bug 431460 by
+  Arfrever).
 
 *PyQt4-4.9.6 (10 Dec 2012)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 360e4aa470d1..017c5476c520 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -9,23 +9,24 @@ DIST PyQt-x11-gpl-4.9.5.tar.gz 9824076 SHA256 75ff0a3a088ae22c4d6e8adb242f7e5931
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.9.4-r1.ebuild 5742 SHA256 601ced757792b9e858a0c4ad69a5aa5ccb6fd961c791f681de8ad2469db0b83b SHA512 294287e228c70a3ca41b52cfeebc7e35b121aeea46ce6c84ead7e9239f1cd2a15d195535376306f917a9b51a9936a8b48c1c985410cd1b402f1be80f5a001820 WHIRLPOOL 6ff0cb2300333730e50222b00bc2f1b3ff66f03e379e33872214df44be9773b324645964aee7a1ff87d1140187e7737dd3f1892163fdc70c88d00b94bed52de2
 EBUILD PyQt4-4.9.5.ebuild 5683 SHA256 30fd5e957168b9f61743b97218beb144e4bae6f9bb9f3d3fa4df6c480df63953 SHA512 e185dbc8b8aadc8c73fa95c91f42c77f65a8e28975e95f0fa0f7d8c41f93da46240f536e2fc5f3f00dc8c33519f1b21c0a380279f77d5376dc6670320f40e266 WHIRLPOOL 4ec781091281f5f1b16afc0a5dd1b7d729c2859a1bbf802b2addac63c5811360c8d79f7fb6cae4f21be5c501431fa148ddeb5a64e2593462f1f8d60bf9e02fec
+EBUILD PyQt4-4.9.6-r1.ebuild 5425 SHA256 791d48fd8f7704df806565daa36ab485e5abad20b584081ccaafb8fdb599a6d5 SHA512 f628542bf2d0ddc89ef73e201f520d2750327cb809a57f35baee80e61bcff8b4d6197f8f19724ce086d16c4326cc3c411c5663668ad344f89eac291e9ef2e6c3 WHIRLPOOL 47bfb0021a5a8f7826f1f5fa6960cacffeadb3d491fb230c78e3d699b0ab029963e923fb55af9002cddfbeebe1502037d34a7e97181c233859907e02582355dc
 EBUILD PyQt4-4.9.6.ebuild 5777 SHA256 83d708e29360ace76838a47a7c6c65e2bf52d580a485974d04f64c5dd4368ac8 SHA512 fc32778b2fdd722c49a95c61f8c0e4450f8953b9beba8d7fe5862d4b4ae56624dde4ce486e0e3790c002c5e9b4b99345c65658f26a088940d159886b65c5316f WHIRLPOOL 5bb620c8d34a813a0a5cc525715e0837e5bbb7fbd489c48bcf8d16948116c5fbd22d6bc1424ec6b269126f0b7f8ac8f34720c08b955c4f4301bf3bde13d737e2
-MISC ChangeLog 28314 SHA256 bcf22a258ac2088a0294663c34b6827ea7512d25e42f41326307ab2a16e1fde6 SHA512 ed2ae7032fa6865ee7b6b77c2f47502a75741193cb2e3a7b4a9e2efca0f4b901cd876eb1ecbedd0984c5f7cd4b21a1b7f98bf66d0f60cf8ecc66b5f25f0e6d0b WHIRLPOOL 085e048f085de017ffe82afe5dcb8d97cb6288b971c4596af2ca9378e4a30a7fe0c363752e0bdae0e0acef54f50718fc845b22e95e1285817f42ce217ace9e80
-MISC metadata.xml 1100 SHA256 7ca5b5cd157c0cea93a86c007b0eaa57882a3b738933299c33eb6e1d4ceca6ae SHA512 b1985381f5b92d5e7839027028ac96de52fb034c8fdaa80e3f71464182d7ab8eac1060e0a7663faca55b8db64138ed59bd2e733d24d83466085be92aa6c7914b WHIRLPOOL 3a1309fd3b39a43f3dd2a16c9943bfb7eb8b0130c4ec0dcd717ded72a8d6c1c522896ed3bcfc3d396379d12afefeea3d22deb0caa40d9d359e4a7c859d2f4530
+MISC ChangeLog 28608 SHA256 dd591b01ba25ac3b78b04d4712cd6053a60a00117ad8b6178c269613cb0a93b3 SHA512 bdc32683db442a9d4ba97a0b23afe6fca0a3f881ed93f2e64d161fdd8cff51b3453ff54c2d64f3021e2605bbf3e8931a0521e53a81816461e32467b1f7f93b40 WHIRLPOOL 50891167228a5a74fb26e50366e66b108327d0011613939e34012444f8955f9dc2f43d0c3dc2ad22e373e75ec0200f55bcaaeca86e07b2799753d9b18b2fc41a
+MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQxcWIAAoJENXLsxwXqFxyjvwP/3H+WptEOf0AyewdnapZMTPI
-SZHLBVq50DaPrV0JTj1kl946coSiqyPbeilSMihlzODOiBWqBBbmaq/PIUb/wrSz
-rryWJKk75NbI97KFJl3KafcORffycrIdw8vzS4n2sNv7GyRvoj6U+FhYfa/NJB+J
-VkWFv0OhxGPSAf2C411mnxtivwS1EAa5zsUnRtQZX79AXL3DUijuCSu7CH3Xa9Zu
-dLTu/EAT9TEHxzzxv5S4L1KaUD6UiImc+DdFBfK0aa0bNkdaguA83QcoLEgapDrl
-VZVazYjjB96RmkPAM7hvIJbMJND8QvY/63yijbwXoBi4WBih1I7mdfif4eELJwit
-4Ivt/qLjwV1yBiTcfb2KzrPBfp7I8g7wS0UtHVTPREO3D0z6nrG/66IXyX0Nfo/Z
-tU83w+JBuCcmS9u75+aHgtFbgScOHethWRKT4dt/dnDGwwFNF7e6OnMd+/6WLRyw
-jjuILAeeQudU1z+jNGdBsPUW63NT+1Xq8bcIVyDo8Z4wCRehriqgcNwjoerSjVts
-ZS0faQKKt1d1ecsQecFzCk5vutAbS+eTn8Mw6G30aU9FPY17hVXyGD6mWNQ7LpGN
-kGHSEcMGyv0FuzldrbN/0+4pYJogvHZcY2lNP00MOIBnE5e4lzy6Ne5HlkiRuikW
-RljQpl/1jB/KDsjaqrp6
-=Rl+f
+iQIcBAEBCAAGBQJQ2mr+AAoJENXLsxwXqFxyBR4P/1sqo8pkihQMVx2XmgrOZJIA
+WfQ0obiqxOfKMnNYnePlq3wsASkhbc8zkBWzoIlUbIJRC45qPQiMKly9+iFQvLL/
+yo7tvbS/To3nwvU4z+6Cxi+/hnUgsfWYGXPquwHnVAlyu4tSeDuHSn140CMRsL9Z
+Y1YTMImpoIAaIltdZ64HXVGSimVZA9sSNaHmayambXjeyYxhpXR8yT+3r4J8J/yE
+bhrQLpgwtBNdBFNr0UFRiYr9X93msbHBtMwaL4s7qFVV9fsrqG1aY+puYfr95mTg
+3GzCn1G0RR1eW54dl6amClQ3q2MkqPP4psto6j3Ic20l0vmbHOwg5Se3WTMRCCZB
+XrXEy/LfYPTDchfgSIOMu3dl55yPZmM12ZaqtiXY0sPxi/njytVZCheJPbFV48fz
+EhMGd5q8B5U7UkiWbeAUbpzV0mNEeJlM5TnBtRO9vje/izjIQTITk0vFquqxXNmG
+qYwKWTI7ZGvTsfPchwJPwgkcVdFvTSeSJwkhVnEMYP7l9QK66u+aLIKhmOx3+Nnh
+BfZKusp1mQHzGuFmB6W5KGKq5muaK4Vr02S3R6MFFpX7iUBKMQXyaCtRcfYEYTE+
+suTXGU6KpHPf5vRjqas/kE52BT7y2Xo550MWsq3md4mSsHbD1vnfeCf7onfX2fsW
+uROe9JG1fcdBQW6LWNBi
+=7JVg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
new file mode 100644
index 000000000000..194d4448b316
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.1 2012/12/26 03:11:43 pesa Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit eutils qt4-r2 python 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="
+	>=dev-python/sip-4.14.2:=
+	>=x11-libs/qt-core-${QT_PV}
+	X? (
+		>=x11-libs/qt-gui-${QT_PV}[dbus?]
+		>=x11-libs/qt-test-${QT_PV}
+	)
+	dbus? (
+		>=dev-python/dbus-python-0.80
+		>=x11-libs/qt-dbus-${QT_PV}
+	)
+	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
+	help? ( >=x11-libs/qt-assistant-${QT_PV} )
+	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
+	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
+	phonon? (
+		kde? ( media-libs/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
+	)
+	script? ( >=x11-libs/qt-script-${QT_PV} )
+	sql? ( >=x11-libs/qt-sql-${QT_PV} )
+	svg? ( >=x11-libs/qt-svg-${QT_PV} )
+	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
+
+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"
+
+	# Use proper include directory for phonon.
+	sed -i -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 [[ $(python_get_version -l --major) == 3 ]]; then
+			rm -fr pyuic/uic/port_v2
+		else
+			rm -fr pyuic/uic/port_v3
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+pyqt4_use_enable() {
+	use $1 && echo --enable=${2:-Qt$(echo ${1:0:1} | tr '[:lower:]' '[:upper:]')${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"$(PYTHON)" configure.py
+			--confirm-license
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="${EPREFIX}$(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,${BUILDDIR}/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_execute_function -s configuration
+}
+
+src_install() {
+	installation() {
+		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
+	}
+	python_execute_function -s installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	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
+}
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index d491ee6fb109..6571f1b3d18b 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -7,10 +7,13 @@
 		<flag name="X">Build QtGui, QtDesigner and QtScriptTools modules</flag>
 		<flag name="assistant">Build QtHelp and QtAssistant modules</flag>
 		<flag name="declarative">Build QtDeclarative module</flag>
+		<flag name="help">Build QtHelp module</flag>
 		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
 		<flag name="multimedia">Build QtMultimedia module</flag>
 		<flag name="opengl">Build QtOpenGL module</flag>
 		<flag name="phonon">Build phonon module</flag>
+		<flag name="script">Build QtScript module</flag>
+		<flag name="scripttools">Build QtScriptTools module</flag>
 		<flag name="sql">Build QtSql module</flag>
 		<flag name="svg">Build QtSvg module</flag>
 		<flag name="webkit">Build QtWebKit module</flag>