Support python-exec:2.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 231 insertions, 18 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index a009233318dd..cd81dce1f0a6 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.241 2013/09/19 11:23:03 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.242 2013/10/23 10:14:55 mgorny Exp $
+
+*PyQt4-4.10.3-r1 (23 Oct 2013)
+
+  23 Oct 2013; Michał Górny <mgorny@gentoo.org> +PyQt4-4.10.3-r1.ebuild:
+  Support python-exec:2.
 
   19 Sep 2013; Ben de Groot <yngwin@gentoo.org> PyQt4-4.10.3.ebuild:
   Depend on sip >=4.15.0 to fix build failure (bug #485274)
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 8aba385fc326..3aa3be3a0d65 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,26 +8,27 @@ DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.10.1.ebuild 5513 SHA256 5216480cc57882124e741855a46736427e2bf41e979ab8c3d35f6e6ccc487f80 SHA512 58a4401951a238a5c481bf95a836c3701e09509cac126c8bd6621b6dfe1ea630b13b6dd540a84db96ac73c0e3f6ff4f4dc463568841d0519f9b843f35782b5fb WHIRLPOOL 672f01b2b8248813bb73a644eaf91c77db6e5726d340bb0b0cce0b806a83617b78e3a81b13a035185ed8ad18af89144832dc51adeef68688f5bcaf9727a4f62b
 EBUILD PyQt4-4.10.2.ebuild 5497 SHA256 2c465c6a3d1012dfe40db04eda2464352ec7f04e7e3490f9174409c163f3ea5b SHA512 5678ffce817047702c675174cac4fb53a13c7dc498e3684052ab76edc4b2443bdf5f02657b4a75e27d988efd4df677339148b5418025f2ef86e09a6565062ea3 WHIRLPOOL e0e9eb478d9a1139e0b8de4046a39363f4e1e8f8bd56b77cfea2f135e38838349558c10c4c44a8f58b93e9562940e9bccec40b54ea566979e33aca0abced2de6
+EBUILD PyQt4-4.10.3-r1.ebuild 5609 SHA256 6b940857e648b3f3854814bb40d32f77cdccebf70d3a0d5a1467de926d723e45 SHA512 6ba9c93d36161abcc7af09780195b6fa6307fec62a0f74cfc809822e5781c0bb42ff496f6329764ad9bfecf7abe2e733d234c1528dd9360d58f6ded172c05047 WHIRLPOOL 1d5c1f1396a95ed42d8f094c6b42c9d1510733550a57ab29b2346e588bd9b1ebba36ea28b4e126a222488c55a92335e62e59151445a376ce51ed1d2fd5f6d451
 EBUILD PyQt4-4.10.3.ebuild 5503 SHA256 631aa6ed7fe26f9bb5952bf2c1d2bf0f6187c7eb3ff54001f4ff22c0cf1661eb SHA512 6f440db6e2e5de8ad3166b0cc9aba57673964eab1be3cdadfbb22388e80f0a0e6dbeed2d4b2045ab95a8773a3a07a395213571eb7749e79bb3d27b7eb2d2ed1b WHIRLPOOL f81c148f99b61712044dd3f31a9fabcf354cecde3df566c98552c7e5840855ef98ffaf7cab93b63d20022ad89419b7ad5b2d9aac03abacd0e38e0bb17af15b49
 EBUILD PyQt4-4.9.6-r2.ebuild 5362 SHA256 b7a851feed028802b2ce620b85779822c05d99ac35418cce9abef74169c98cc9 SHA512 0c05f92ac61f0143c82759eb873ac73d962847576e97ac5b5421077495e41dc8752ed3fe1b24600642b8e603e5751c33323d85ae21a4112eaeacf46f84a2a2c0 WHIRLPOOL 3d6d95175572678910ccae63f93c0bc1e06e04ccf7f8f46f8c0e2e3f6aac32d9c8d0761c79f41348a6f255b2bcf0e903a0b42df9fa6010cf11767530bb6fc2bd
-MISC ChangeLog 33299 SHA256 4ec0485f239bc78edfd53950cb3fe9d5184e312f45ff9ebc48e29b964b77450a SHA512 0ef28ee5dbcdd5ee4c9b048356843b35909d91ef120f59783fe54784a5d8bc5feb33f7a112a29248b1e3311721ade9eda6681495bbcfb6115e46143267e73436 WHIRLPOOL 5a7385a7b746d66d3e21425403b39316d644b5a469cfcd53bb5c1f6b38ecd47a46e17e3a07d411d6e8194a587c036404a88f1a923a0f58acc6bcb445fafb196d
+MISC ChangeLog 33432 SHA256 7f7f127bd8f70e4194cbacacb7dfd275a59c27b74b0256a89f71f507146b3b26 SHA512 c54c0154078dbe7f5565e3611f059092cae83673a8f17930b354975bef7fae84b158234bb86eb18d70a1e096298e94123341774e6f3df87fef6345026d044e43 WHIRLPOOL 104a22c9bd39137aef67054d5a4df4e4389541c10fc41d4ae18704f1cb3de641954a7bcd1865117d032fce9a85144dd77ab24660bf9476a8539d7cb2141d2a87
 MISC metadata.xml 1190 SHA256 0b7ebf415df373643682290fbf79b9ed1ef4817f4be6b3a53aac9b7441dd898c SHA512 fcb38aa8872b50b6e087bc3cb375667f5ed3524b18920090c6b5d3d1ce1807f6cd0cc5bb5e8a7e9c23659bc40ceb3988392ea37ebc92f9d6bdca0b2c3cd4ea45 WHIRLPOOL af88cfc998264e3c7d5857a1e5c7ebeb2889b73a92c86c16ae9185c25fdbe7176114b6fb4b0eae1ffeb4893fb948b745c69010d30bbc25691bf3ec1bef3e0e81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSOt6fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluAoIQAJIxgwUCzc5sCz8xGDALsg6P
-VdGXPBOb3zrXFz8paOABeXLcCXai+EAkbbUuRhyGV8IMxmkzZaRxNBwSjAnXjUNE
-RQ8XPsL5wahS7zZ3bpapOaU0MuxwE+0UqcyNLMeH2Ml9yWZpqQR6DmmoCdoYsUSb
-BDrEwPmv45XIKQ/YB9TXx/9mcivTRWhyAY6zUVncx8z/ttMtJn/Jgxt2onhFhnTx
-/gIs7o2NGV08Hm9aMyH/Y1qWqGFkt15Exstz0kAQDmuzY3hcPHIuPlm2fEmSI+un
-HIKp6nGu03kQz5/4q5tGGk/gxGtq0NSft53vso5x6Vkgqy7GdRGD8UtCPldosEAI
-yX6v/0BBkvLLNF7P0ax3zwBYsSuyQGtY9+CuSDD6CPHLy99t8J6oDgb73xr54rJZ
-CvfMP5qd2vAqvx3NIv0zD19ew5FJVoIl6CLhTTPZLwm2ljdEsWOWdD6DMAuFMqPv
-nOPaycgwVVbOOZHa6lGPxEe4a/kRwQMh0LslQAKtahQKkYidJ70PJwDlfe1pQQo7
-ez5UuEruwblZ3rAJqOOJrOROvukEkc+JPeN5269x9e5Vu6Ycl3//Eh3WAAXS2qQS
-aWhDHg1ytFp/qAJpMWXv+uPDlxsG1gj3viOngfTbU5+VKLdISCsU4kFR8A6+1KeO
-/Nzg/vl4RFbArXVZY8tk
-=OBEu
+iQJ8BAEBCABmBQJSZ6HdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZvAP+wT2n3oS6rHFDYNlRZ3014AE
+PuQIU3+i9hbn6wOQYMIDrUJ6wzASwms166VZWnnV5G3Br2HNU84YNo0DkAqQI2XV
+4QNlUBHNiT2F7Alwyl/9NAMtZCbCxfD3kBrXjbcWeU7oe1EQi/PRxwyjyt9dXPNs
+G6OTvWvuxdZeflYFFOmgoGd0UpmJxDQ20KGXZM3sSCHPy5HI1dwFgwafIx2D30fl
+lrTrivr+CqQ0GlVg5Kq2GDZVNx9E73o52Ww0kD2UYkfW2MjEH+9pdeZtnO6B6yBj
+j2p+zpc8+KrvU3LIn9LJrQ1ZCJgyl/AM1BpIi9h0BRyDimyu1kaLjZwNNbxJXd4G
+qDDC4vNPEwgeQXFw0COZUbeuXtpb8DqtCNm2N+OrUsipbZCND/NVzA3AEAZ3X7BD
+YuPZ53wYiT9WomvyBmJk+ePhrlgBfGRyODWDMvZOv3Fy3tUqyiMpTLkFcJB/+yQV
+sQu5FBfYcoV73EKTNNEkLQqYr8zWaLNIwrK1uiUxl+lhzV5PA+WaszsEvdZ0RmmS
+mWdlQJEPwfgGNckUjprK3oy8g7XP8dHX9kEzD1ak46owgLWDi5W7ZP/YxEdA2gpV
+iNOGuVdRbD1eVnDNBXm6duHlZQjlIwRhFxNe2Jh9xp+SU1MAK3yvqZTMRKBYHKte
++VIsVm6hTJ+rMAZ8QuH9
+=2NV8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild
new file mode 100644
index 000000000000..15f14ea33e68
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r1.ebuild
@@ -0,0 +1,207 @@
+# 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-r1.ebuild,v 1.1 2013/10/23 10:14:55 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,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="
+	${PYTHON_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/python-exec:2[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? (
+		>=dev-qt/qtgui-${QT_PV}
+		|| ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 )
+		>=dev-qt/qttest-${QT_PV}
+	)
+	dbus? (
+		>=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
+		>=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
+		mkdir -p "${ED}"/usr/lib/python-exec/${EPYTHON} || die
+		mv "${ED}"/usr/bin/pyuic4 "${ED}"/usr/lib/python-exec/${EPYTHON}/ || die
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dosym ../lib/python-exec/python-exec2 /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
+}