Add PYTHON_REQUIRED_USE. Remove old.

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

4 files changed, 22 insertions, 216 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index b1298c882961..f2eb46321bf7 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # 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.223 2013/05/22 07:58:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.224 2013/06/24 08:35:02 pesa Exp $
+
+  24 Jun 2013; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.10.ebuild,
+  PyQt4-4.10.1.ebuild:
+  Add PYTHON_REQUIRED_USE. Remove old.
 
 *PyQt4-4.10.1 (22 May 2013)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index d5df3d385c5a..b6df5343a78a 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -3,21 +3,25 @@ Hash: SHA256
 
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 SHA512 b333f4016b048af66bb13177981dc468f6e645d9280c18a4f419127c48aca8b4d5c034a167be7353884b715e67ec110ff7d4d4e850793883186ebfef7678e372 WHIRLPOOL 9c7a0409023e8c3af3626bfb3887aea687c07feb5235506ea0ed01171095d575b5681171dc5cde1c796448bb83e26449cab7df2432e172b47b43ec751bf99317
 DIST PyQt-x11-gpl-4.10.1.tar.gz 11279330 SHA256 623586f6dcb8a3ac5af688015dfb721b76498242081e3e331c882dd38798fa16 SHA512 997421d80ad6915cbff672bcb60ae4d7a361912d7be03bc4fcaa8c36747f04464a8acc452c235cb0c5c498135fb3a2cc4d945de02f6d2ad2014cce48726e3af4 WHIRLPOOL 23f256882917a5b5cfb3683074c107501fcdd32739c60110585783947885445441649869eb4645854eef3c2181f596afc3ec7cce6c3449f717e5d3d27de3f9a9
-DIST PyQt-x11-gpl-4.10.tar.gz 9353719 SHA256 03eaa01a59b13dc85cad0318dd5ae01d0bd6fb3339f502967bae85c6e8c499df SHA512 caf856d84659375cdaee9eead34d05f7bb0cbacbebf6e53bcfefa054335a774c09475d2e2b4be62967443700fc88e97389484e26e1a7d3ef4e3aa43a20afaade WHIRLPOOL e8ff59b78702c5cfaca81cfca1542339fe96c61c49b4e19adb62b95c617f46b3f0b9d568481bae26419bef6233cd66fcdc6de9fa185ef783fda5498d0df02bca
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
-EBUILD PyQt4-4.10.1.ebuild 5387 SHA256 3184e7e2bd167d4fe554801a63c65319307e5ed88fd66ea39af644c70bd281bf SHA512 ab2779276061cde8393530bbdcb7ed579e1e9daa3cb07c475b86f9e38666cfbba21c53b4c5697d9c176d2102b075c21416be14aed752a50bc287c94cd06d269a WHIRLPOOL 8540e74b26e46e35f04753a291981dd33a4b1e61a3594c19d8a2f0d9ccdaba0ca2e3544665b53c36f8718c051a1e6e7f4f8d50bf67bb4fc3eac2e6696fd3981e
-EBUILD PyQt4-4.10.ebuild 5379 SHA256 7feee0b8095f84cbe03cc014a0aae5d4d898769ec906b7d6e205f88acd64385d SHA512 ee8593cfb9df288ab01c897a6e75291e028087bfdd3578ed84d147a241a0bc4b8ebcc098c04629b969bb4a774eb0f84a6f8bc9a0a9916b10afdfab4279823113 WHIRLPOOL 30f14a5b1633c385d1ddd9ef751d935c2ed8b7ba2990a7ce83f5c13d77120e769167c0b2ccf5d45e62b9dc57999f79ada2a079e4fc1e1a5b26b65c3bac0f7336
+EBUILD PyQt4-4.10.1.ebuild 5405 SHA256 a03026c7c2aaba8c7ab13b46f9c49edef7ba99821342c564c32959916d5998e7 SHA512 d0b247cd1608ba43c26dc9686674456d46c536f456cb00a8a11fb62124378192c7812f9339cbc19ff6e15e976fc8e40cc1d74941b3ed80ab0eca77bb4b2e9efd WHIRLPOOL a8982de6d408e3f6c99c472b3af650691a5372e252f1d15e7a5f19514606bd31a005c677fb4469e5f86740934542338ad990df08997ae031d38b25530b2ed01b
 EBUILD PyQt4-4.9.6-r2.ebuild 5253 SHA256 46262e209f803d6fa4bbb6b719ce48ad6c18e7757720b567dcd36719cee4cd84 SHA512 59bb1e075d62928088938d81e8b89ab5607061d3ddaf9865f203e66f135c7ae5485d6fd38f1545f7ed6252d156973cd9e504e5ab495d0e91374709fa3955c4dd WHIRLPOOL 99333609d64ea845f771541922d71ce379e5ed6669287def4c4806d93d385d68a632de3457e812e27017ffe25a631fdd7e6c8edfa66c78f84f963852a77536ab
-MISC ChangeLog 30964 SHA256 7a5e48d0d9452a5606ebf9cb35688b90a7a049441e8e34d5328d50697f90ee77 SHA512 e31b6e5622b641c03e96e51c00472e618f150c72ad9f11f79cff8230d4ed853040d69de53b59b74ad14bb817dcd0b592860344aa15d0c32d90e2c8661def5fc4 WHIRLPOOL beb98ecef5043c56e723a8cc91ec0286cff9d7828b3333b0572ae181bb3797d5ca7c554df1c7cabd9ef6074fd779e139ac1afd35a34111f72477e780d1b27540
+MISC ChangeLog 31091 SHA256 48bfb4f3c5fd3c55ee12776e2e6def1f37e85e0b4c98e753a6c1f4607280b27a SHA512 8ac403552b502f60ee6148022ef0378a6b19af6689a03dc52be5409609447fad3b85f975c80823eccfe26f2e6e069f3c06fc2f1a45fa14fd74b1f0479c856cbb WHIRLPOOL 73dd8803f95c931d9b6861f3e32c35729d203a602966db3f8076a02dc0259dc8bce707e9f753ce82383f1b3e55d83298e669961075892fa22858f6e4b11272e5
 MISC metadata.xml 1190 SHA256 0b7ebf415df373643682290fbf79b9ed1ef4817f4be6b3a53aac9b7441dd898c SHA512 fcb38aa8872b50b6e087bc3cb375667f5ed3524b18920090c6b5d3d1ce1807f6cd0cc5bb5e8a7e9c23659bc40ceb3988392ea37ebc92f9d6bdca0b2c3cd4ea45 WHIRLPOOL af88cfc998264e3c7d5857a1e5c7ebeb2889b73a92c86c16ae9185c25fdbe7176114b6fb4b0eae1ffeb4893fb948b745c69010d30bbc25691bf3ec1bef3e0e81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRnHpOAAoJEMbwO6tnXQ0sFywH+wVau+2xLVyXjqTzKRoSrYrI
-jNG6X4igykY1sO08l46s4he5GJMLh4PeuFnRRk8WvVDNVXqE0q9A0Jpa2/JQzmdA
-Ejzb1evdVM8ucg6vKJE933jnTK3R4pT6mOwaLYqlBGIs6v9pjSG6pKE9wW/3RoL3
-tu+ceXc8msWadOfx1I4rXN75QdKjZc7uveV7YtokZhAWfznsl/DUUQAqdWwUaCnX
-AMj7XgdG2K+bI7KvDkaFelYJPXTp1IVZf/Fy2WGzwV9RDDPPHS3ffDfIQ3dmXVTM
-FJXJpxzDT/uov7ektdrbR+htCXGFV1XWHAPbPO/qrlyx5sbpviT246NWYArrHcc=
-=QJPp
+iQIcBAEBCAAGBQJRyATVAAoJENXLsxwXqFxye2EP/jzlCF7vSNOxMxS0OcVjj9As
+atrBQowZnAvSHGRGRvgLdRk5yJcGOPJ3xtF1y49sPKAueoTCQ+N5FupqzDtCEFKX
+W2XHHXJfmjBCP1DbTy7tDy1IWF9TdDsXxMiR2ebABapySghg+DBMAMJDLljzQGot
+Q27x3a0wEaOUvfBvfO2fCqFFjw8i+8WV4nCzv9Vec+e5scLvmRo4llX7SaQHjhE0
+v9k33vaAbJAY1QCtA3TqIRkzth/T4i/Nsv+Mo5O04nxENgnAi1aF0XhpQHUM4gg6
+03k5G2B8KO7IhsN3dilLYIC8EiGPphOVSQcw8WPfkYHvzxyO34ZvenVGUW21HeOA
+/ImTyzfBbkfDuzCV9e1dBGicn2A3rbDTLYgdfNcxeVYlFID90XGykNkk5th3lTvr
+vvniteiXuWhYt22bWmXVGn6qBvox7R4ei7KOe7zLd02GyjlukCBv3XWvlFcJJAgM
+4c5g9lx+5qPx6D/7qz12odzgUjC8sP0XgI7rZVyykqO5w+v0BDWEgTbspxEN1CWa
+zDT2q7NijFlVXjQ5E01IN33Xk/nIB8lIMP9U89ljgXFWEIQ2ymoe3+yedyGBWeoF
+P/znH1cFZ9QyiQleHn/mRBgmOhjOQBaj0BWfoglw5Q3GWHy6SB46pYkmJKZWpaoX
+IiJc/13rQ7ULH71+ikFz
+=D1k3
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.10.1.ebuild b/dev-python/PyQt4/PyQt4-4.10.1.ebuild
index 51a7da772fc6..4f24a39216d0 100644
--- a/dev-python/PyQt4/PyQt4-4.10.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2013/05/22 07:58:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.1.ebuild,v 1.2 2013/06/24 08:35:02 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 
 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 )
diff --git a/dev-python/PyQt4/PyQt4-4.10.ebuild b/dev-python/PyQt4/PyQt4-4.10.ebuild
deleted file mode 100644
index 9c7b2123e5bf..000000000000
--- a/dev-python/PyQt4/PyQt4-4.10.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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
-}