From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S3q4J-0000p7-K7 for garchives@archives.gentoo.org; Sat, 03 Mar 2012 14:36:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8A9BE0684; Sat, 3 Mar 2012 14:36:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 98D66E0684 for ; Sat, 3 Mar 2012 14:36:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5C0A1B401A for ; Sat, 3 Mar 2012 14:36:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 871E2E542A for ; Sat, 3 Mar 2012 14:36:10 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1330785318.e972ee1f4ddf9c00d170c5f607af5138adda3fbc.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/ X-VCS-Repository: proj/qt X-VCS-Files: dev-python/PyQt4/PyQt4-4.9.1_pre20120204.ebuild X-VCS-Directories: dev-python/PyQt4/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: e972ee1f4ddf9c00d170c5f607af5138adda3fbc X-VCS-Branch: master Date: Sat, 3 Mar 2012 14:36:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 93118e88-9d47-43ab-a486-7ed7d86986ce X-Archives-Hash: 996cae478b89ceeb750d2ee20309d3df commit: e972ee1f4ddf9c00d170c5f607af5138adda3fbc Author: Davide Pesavento gmail com> AuthorDate: Sat Mar 3 14:35:18 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Mar 3 14:35:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3De972ee1f [dev-python/PyQt4] Sync with portage (EAPI 4). (Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commi= t) --- 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: $ =20 -EAPI=3D"3" +EAPI=3D4 + PYTHON_DEPEND=3D"*" PYTHON_EXPORT_PHASE_FUNCTIONS=3D"1" SUPPORT_PYTHON_ABIS=3D"1" RESTRICT_PYTHON_ABIS=3D"*-jython 2.7-pypy-*" =20 -inherit python qt4-r2 toolchain-funcs +inherit toolchain-funcs qt4-r2 python =20 REVISION=3D83ed847d0273 =20 @@ -29,7 +30,18 @@ fi LICENSE=3D"|| ( GPL-2 GPL-3 )" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE=3D"X assistant +dbus debug declarative doc examples kde multimedia = opengl phonon sql svg webkit xmlpatterns" +IUSE=3D"X assistant dbus debug declarative doc examples kde multimedia o= pengl phonon sql svg webkit xmlpatterns" + +REQUIRED_USE=3D" + assistant? ( X ) + declarative? ( X ) + multimedia? ( X ) + opengl? ( X ) + phonon? ( X ) + sql? ( X ) + svg? ( X ) + webkit? ( X ) +" =20 RDEPEND=3D" >=3Ddev-python/sip-4.13.1 @@ -73,7 +85,7 @@ PYTHON_VERSIONED_EXECUTABLES=3D("/usr/bin/pyuic4") =20 src_prepare() { if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || d= ie "sed configure.py failed" + sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || d= ie fi =20 # Support qreal for arm architecture (bug #322349). @@ -82,12 +94,12 @@ src_prepare() { qt4-r2_src_prepare =20 # 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 =20 python_copy_sources =20 preparation() { - if [[ "$(python_get_version -l --major)" =3D=3D "3" ]]; then + if [[ $(python_get_version -l --major) =3D=3D 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 >=3D4.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=3D"${CXXFLAGS}" LFLAGS=3D"${LDFLAGS}") echo "${myconf[@]}" - "${myconf[@]}" || return 1 + "${myconf[@]}" || die =20 local mod for mod in QtCore \ @@ -169,10 +179,6 @@ src_configure() { python_execute_function -s configuration } =20 -src_compile() { - python_src_compile -} - src_install() { installation() { # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTD= IR. @@ -181,15 +187,15 @@ src_install() { python_execute_function -s installation python_merge_intermediate_installation_images "${T}/images" =20 - dodoc NEWS THANKS || die "dodoc failed" + dodoc NEWS THANKS =20 if use doc; then - dohtml -r doc/html/* || die "dohtml failed" + dohtml -r doc/html/* fi =20 if use examples; then insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" + doins -r examples fi } =20