Restrict pypy for older versions too.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

5 files changed, 25 insertions, 196 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index dd829d04d70f..a7005c9c5c57 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # 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.168 2012/02/21 00:46:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.169 2012/02/21 01:06:46 pesa Exp $
+
+  21 Feb 2012; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.7.3.ebuild,
+  PyQt4-4.8.1.ebuild, PyQt4-4.8.4.ebuild:
+  Restrict pypy for older versions too.
 
   21 Feb 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.9.1.ebuild:
   Build QtTest module only with USE="X" because it needs QtGui (bug #348349).
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index f93ef69fbac7..1b52f989b40d 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -4,30 +4,28 @@ Hash: SHA512
 AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a
 AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 RMD160 f022dc75ccde5b923c689f82d169d02e8b066a19 SHA1 2e000133b482f5bb36a5795e375bfa3f60dd5c55 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16
-DIST PyQt-x11-gpl-4.7.3.tar.gz 7803557 RMD160 fb86bb4abc665e67620d6a77dcd37ad6c6f038c4 SHA1 7ad7ed37509f13b4975c50f5fbf557bd58815558 SHA256 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
 DIST PyQt-x11-gpl-4.8.1.tar.gz 9409175 RMD160 e5ba0d98359ce315432f479a5f44b2c1ae69b77a SHA1 e064ed38817bafde72f2a57679d80d40c7015afb SHA256 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
 DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 RMD160 100d16e9005e3b83f0030e498a16d99636c9034c SHA1 747236d5dd103687cac54746af0a24a1adbc067c SHA256 fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98
 DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 RMD160 056d6570ffc5ad873ef36d8181122cbb79d7b5ef SHA1 6aa0e64cdcca0f23946c5e6c244b19189c234306 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1
-EBUILD PyQt4-4.7.3.ebuild 4669 RMD160 0208dafc83dcb892ac552c45e66b5cdb0c46cd1b SHA1 e510e9063228a6343f23d4d18fbc8ba7faf628e3 SHA256 4b281787c6524a485164d368d57de0487061fb50f1f565ce08123a09c0426fcd
-EBUILD PyQt4-4.8.1.ebuild 4795 RMD160 b4b8231a2db12262ad5de15a2f799b2acb59496a SHA1 8983bf93eb33c8a2eff9430f6e03d00c2423e3b7 SHA256 9885ed7e8c946135d4e548f329cb3bf0578cc46080632bdfe152f379c12582aa
-EBUILD PyQt4-4.8.4.ebuild 4975 RMD160 59478b9d7d484f4ac9f8f89bfff5e442a38fceb1 SHA1 b4520606a28122e65195c9b7c5e652b2306ed813 SHA256 4d7c965c31650d8d5bc2a5a8ceff8fd066a448cd0e4e7242df863d807d1841bc
+EBUILD PyQt4-4.8.1.ebuild 4803 RMD160 646e9ccd0a8580fb908fccc6e9cdaa7fdb74fd53 SHA1 8c6cd017ec2aa80d2afe663aeea2569cd9829a32 SHA256 f2a669e5c291fd35a46a3ca4f163d51c273654b47e9bb019c86dd033fa4d55f6
+EBUILD PyQt4-4.8.4.ebuild 4983 RMD160 11eeaaff2a4e606504e4854d6719bf82686e61d8 SHA1 02fded68ee3e797203309ffa39e398c55d4a2d32 SHA256 4f56a4970a1cf271b094ccb2d0e200af65aab1e379dfbf7a73fba382aca40438
 EBUILD PyQt4-4.9.1.ebuild 5804 RMD160 0a26987acda81746411611c2b691ee20a1ffee7b SHA1 572e86788e4a63ae572ad2d021758b3ea8bd8050 SHA256 feb09cb27f86fc750ac212881bf5c7b57032dc2140cad97431c36336f5f33f61
-MISC ChangeLog 23680 RMD160 a5f752b8489a2d17df3c9e22823831f969c06750 SHA1 986b8ca0d45c5644f6014d5dcf846d03c78fc201 SHA256 a37a2b45f74522e57dddc7ae25a3d5e91e0500c3908904fc412a03cfa3c49bb3
+MISC ChangeLog 23834 RMD160 fc625a665eb9d58e2e9b6a4a3e7ff55578744c0f SHA1 9e845fa3b90d1fe16cb498ace97ebf8d4c8c1796 SHA256 42a2cdb1925f03de1c7c0fdf15d81cf228fd9ac7229b77c3e651afc853da6833
 MISC metadata.xml 1101 RMD160 063bcdaa197bc36e68607dc1763db7632e9bf2a7 SHA1 0e0af73c38ef13195a610013895660d5b644156f SHA256 7cea702a27791d9fd0f1d8f4f220dfbbab50faad817f807df7a15bf7b3f8f470
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPQulmAAoJENXLsxwXqFxycO8P/3tmBl/+C7XCTDcgcvZ+HBEJ
-rkfHZTfI53mElXqHNyUdgpruQMsVC4HldsauS6HXKwrgH5c+jxz/veXOjb7/y5gM
-FBRTYbhUApyWgL5cUivC5T1zPW5hXdZMF33bZtSwkXckAzi9e9suUMk01PTf/aw0
-aM2J562QvQ/PE68OF3ynoItgIL2xv35DxKzx4pwBz/ClaHvtGL6M9MIqxx8YTkXy
-3xMx7qUBVCw9wngTc9hjtLgn318ABdoOGnct5HKJ/7WKYdM3fqUOpNfhXNjrZI7R
-hbfG1nmrCc6W26QhH1+gqxxCd/i4bCl+9GDb/ojJpeFWwkCr1O80bYG8UqdwYO9C
-M2duzKeOL0IuIhZw3rKTiOVY4CVtHjwJ2pRMVx5r5sh7Gm5HdKb4L+fD0PNFKKaK
-51cY8uEA0x3mpDYUMIIAP67xxLutXrO5ZGJIAlEebZSNFiNGB4VEXBkcRo5HPlbx
-lwz/glivGOgvlDyF32k7RuHVeEfpuklHTThC45zDhxpaz8czntViuPAn4PfWxfcV
-onetVTDt50jLhDCYNiIp45h+dDET2S4vCrb2hn4Tv8tIrJio9ICay5B/fHa6q/t7
-CVP7YsA9DdPYMbQp2dYD8KB3Cjnvf9EKfJ0folo1JRTApsx9mkKjsgy25L0il2cI
-n3+XZr57MAnWwGy0sgMq
-=P1W9
+iQIcBAEBCgAGBQJPQu4tAAoJENXLsxwXqFxy0MoQALA9bTrKymiIr/RUBaHh2pNx
+6k6ziwCXG3Y+Y8P109nYqyrhOkykJ3p0RvactaIC8LcL86rmVfiCTijv6yPX2Q2M
+F16ubJ7JPbNc8F6CNQzXKUM1ibtUgHMELbZQmbAbVJsaMxDOMaVl+aKahnWvflXH
+l6JregDtvumCYKYz6vI3YRzH2/462l7V1Za92Gwp1+oqfFTXlP7B7z345SUVlB/s
+KlpQWpXyA76v+WrzGo6FBLFnr3jLBhAMaPqOFIzkWKTfHlmiyVDPKpZwUylDaIKV
+vNOpcuCociRsW3foyY57mLpF0CJJHd/K4EiO+g1JKctM5cO/zQXS0xxM5ShI/Vir
+ymbHxlqrhH9rmM1KbmSWvz2mFQPEnitBkpGyMr5XRaRF4kC6kSovuApAI/oqSnys
+QdPZde589UXdxAtvE4ra9yPS6SFZo7qtgdZi0bKSrCmM5sDv/Pwcns0Si2La2KyO
+g3Dv7DeQqHGy8YAObntZZlq532nfS1rupyFgA2Qs1JibUirUgRQML6yWryNW/47V
+GP/FcnMAFHBoePPUaNP/MPpGsT4NloiBZnj4UOKB82ykTXHC0q0A5ai22o2Xes1d
+nafqMuUbDkYp8dIQnWqS14IBkswyMTlYH9yhm1iqYtXgHp3CT/TlNphPT9qwRhYk
+2VHEmhi6IZuUoKF6UQEU
+=VhqG
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.7.3.ebuild b/dev-python/PyQt4/PyQt4-4.7.3.ebuild
deleted file mode 100644
index 4ca7040e516a..000000000000
--- a/dev-python/PyQt4/PyQt4-4.7.3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.7.3.ebuild,v 1.14 2012/02/20 14:24:02 patrick Exp $
-
-EAPI="2"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit qt4-r2 python toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-QTVER="4.6.2" # minimal Qt version this is supposed to work with
-
-DESCRIPTION="A set of Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.10
-	>=x11-libs/qt-core-${QTVER}:4
-	>=x11-libs/qt-script-${QTVER}:4
-	>=x11-libs/qt-test-${QTVER}:4
-	X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
-	assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QTVER}:4
-	)
-	multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-libs/phonon ) )
-		kde? ( media-libs/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
-RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.2" # doesn't build with python:3.2 (yet), bug 292419
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	use prefix || EPREFIX=
-
-	if ! use dbus; then
-		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
-			"${S}"/configure.py || die
-	fi
-
-	# Patch to support qreal for arm architecture
-	# wrt bug #322349
-	use arm && epatch "${FILESDIR}/${P}-qreal_float_support.patch"
-
-	qt4-r2_src_prepare
-
-	# Use proper include dir
-	sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \
-		-i configure.py
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "${PYTHON_ABI:0:1}" == "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:-$1}"
-}
-
-src_configure() {
-	use prefix || EPREFIX=
-
-	configuration() {
-		local myconf="$(PYTHON) configure.py
-				--confirm-license
-				--bindir=${EPREFIX}/usr/bin
-				--destdir=${EPREFIX}$(python_get_sitedir)
-				--sipdir=${EPREFIX}/usr/share/sip
-				--qsci-api
-				$(use debug && echo '--debug')
-				--enable=QtCore
-				--enable=QtNetwork
-				--enable=QtScript
-				--enable=QtTest
-				--enable=QtXml
-				$(pyqt4_use_enable X QtGui)
-				$(pyqt4_use_enable X QtDesigner)
-				$(pyqt4_use_enable X QtScriptTools)
-				$(pyqt4_use_enable assistant QtAssistant)
-				$(pyqt4_use_enable assistant QtHelp)
-				$(pyqt4_use_enable multimedia QtMultimedia)
-				$(pyqt4_use_enable opengl QtOpenGL)
-				$(pyqt4_use_enable phonon)
-				$(pyqt4_use_enable sql QtSql)
-				$(pyqt4_use_enable svg QtSvg)
-				$(pyqt4_use_enable webkit QtWebKit)
-				$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-				CC=$(tc-getCC) CXX=$(tc-getCXX)
-				LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
-				CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
-		echo ${myconf}
-		eval ${myconf} || return 1
-
-		for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
-			# Run eqmake4 inside the qpy subdirs to prevent
-			# stripping and many other QA issues
-			pushd qpy/${mod} > /dev/null || die
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || die
-
-			# Fix insecure runpaths
-			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "failed to fix rpath issues"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}"/designer
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module,
-		# the other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc doc/pyqt4ref.txt NEWS THANKS || die
-
-	if use doc; then
-		dohtml -r doc/* || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
index 89227f5e824b..c96efa9365eb 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
@@ -1,12 +1,12 @@
 # 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.8.1.ebuild,v 1.14 2012/02/20 14:24:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.15 2012/02/21 01:06:46 pesa Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
 inherit python qt4-r2 toolchain-funcs
 
diff --git a/dev-python/PyQt4/PyQt4-4.8.4.ebuild b/dev-python/PyQt4/PyQt4-4.8.4.ebuild
index 26cb85daa73a..ba7c81326e9c 100644
--- a/dev-python/PyQt4/PyQt4-4.8.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.4.ebuild
@@ -1,12 +1,12 @@
 # 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.8.4.ebuild,v 1.5 2012/02/20 14:24:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v 1.6 2012/02/21 01:06:46 pesa Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
 inherit python qt4-r2 toolchain-funcs