[gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/

[Davide Pesavento]

commit:     e972ee1f4ddf9c00d170c5f607af5138adda3fbc
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Mar  3 14:35:18 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 14:35:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e972ee1f

[dev-python/PyQt4] Sync with portage (EAPI 4).

(Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commit)

---
 dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild |   38 +++++++++++++---------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild b/dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild
index 1ca6a55..46326ef 100644
--- a/dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=4
+
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
-inherit python qt4-r2 toolchain-funcs
+inherit toolchain-funcs qt4-r2 python
 
 REVISION=83ed847d0273
 
@@ -29,7 +30,18 @@ fi
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+REQUIRED_USE="
+	assistant? ( X )
+	declarative? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	sql? ( X )
+	svg? ( X )
+	webkit? ( X )
+"
 
 RDEPEND="
 	>=dev-python/sip-4.13.1
@@ -73,7 +85,7 @@ PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
 
 src_prepare() {
 	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
+		sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die
 	fi
 
 	# Support qreal for arm architecture (bug #322349).
@@ -82,12 +94,12 @@ src_prepare() {
 	qt4-r2_src_prepare
 
 	# Use proper include directory.
-	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
+	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die
 
 	python_copy_sources
 
 	preparation() {
-		if [[ "$(python_get_version -l --major)" == "3" ]]; then
+		if [[ $(python_get_version -l --major) == 3 ]]; then
 			rm -fr pyuic/uic/port_v2
 		else
 			rm -fr pyuic/uic/port_v3
@@ -120,8 +132,6 @@ src_configure() {
 			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
 			$(pyqt4_use_enable X QtScriptTools)
 			$(pyqt4_use_enable X QtTest)
-			# QtAssistant module is not available with Qt >=4.7.0.
-			$(pyqt4_use_enable assistant QtAssistant)
 			$(pyqt4_use_enable assistant QtHelp)
 			$(pyqt4_use_enable dbus QtDBus)
 			$(pyqt4_use_enable declarative QtDeclarative)
@@ -140,7 +150,7 @@ src_configure() {
 			CXXFLAGS="${CXXFLAGS}"
 			LFLAGS="${LDFLAGS}")
 		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
+		"${myconf[@]}" || die
 
 		local mod
 		for mod in QtCore \
@@ -169,10 +179,6 @@ src_configure() {
 	python_execute_function -s configuration
 }
 
-src_compile() {
-	python_src_compile
-}
-
 src_install() {
 	installation() {
 		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
@@ -181,15 +187,15 @@ src_install() {
 	python_execute_function -s installation
 	python_merge_intermediate_installation_images "${T}/images"
 
-	dodoc NEWS THANKS || die "dodoc failed"
+	dodoc NEWS THANKS
 
 	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
+		dohtml -r doc/html/*
 	fi
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
+		doins -r examples
 	fi
 }