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 1S3lLn-0002oa-Sq for garchives@archives.gentoo.org; Sat, 03 Mar 2012 09:34:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61056E06EE; Sat, 3 Mar 2012 09:33:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 21E14E06EE for ; Sat, 3 Mar 2012 09:33:56 +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 5A1851B4036 for ; Sat, 3 Mar 2012 09:33:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7CFBEE542C for ; Sat, 3 Mar 2012 09:33:53 +0000 (UTC) From: "Markos Chandras" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markos Chandras" Message-ID: <1330766787.2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-gui/qt-gui-4.8.9999.ebuild x11-libs/qt-gui/qt-gui-4.9999.ebuild X-VCS-Directories: x11-libs/qt-gui/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: 2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f X-VCS-Branch: master Date: Sat, 3 Mar 2012 09:33:53 +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: e9e2e2c9-5ec9-4177-8ce5-d679edff547d X-Archives-Hash: 126f7caa7e926ead57fcdf817ecaa2b2 commit: 2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f Author: Markos Chandras gentoo org> AuthorDate: Sat Mar 3 09:26:27 2012 +0000 Commit: Markos Chandras gentoo org> CommitDate: Sat Mar 3 09:26:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D2f5e6e58 x11-libs/qt-gui:Sync with portage ebuild --- x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 25 ++++++++++++++----------- x11-libs/qt-gui/qt-gui-4.9999.ebuild | 25 ++++++++++++++----------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-= gui-4.8.9999.ebuild index 6fee2ac..43f119b 100644 --- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild @@ -3,7 +3,10 @@ # $Header: $ =20 EAPI=3D"4" -inherit eutils confutils qt4-build-edge +if [[ ${PV} =3D=3D 4*9999 ]]; then + QT_ECLASS=3D"-edge" +fi +inherit qt4-build${QT_ECLASS} =20 DESCRIPTION=3D"The GUI module for the Qt toolkit" SLOT=3D"4" @@ -103,11 +106,11 @@ pkg_setup() { # mac version does not contain qtconfig? [[ ${CHOST} =3D=3D *-darwin* ]] || QT4_TARGET_DIRECTORIES+=3D" tools/qt= config" =20 - qt4-build-edge_pkg_setup + qt4-build${QT_ECLASS}_pkg_setup } =20 src_prepare() { - qt4-build-edge_src_prepare + qt4-build${QT_ECLASS}_src_prepare =20 # Don't build plugins this go around, because they depend on qt3support= lib sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || = die @@ -140,7 +143,7 @@ src_configure() { -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit -no-phonon -no-opengl" =20 - qt4-build-edge_src_configure + qt4-build${QT_ECLASS}_src_configure =20 if use gtkstyle; then einfo "patching the Makefile to fix qgtkstyle compilation" @@ -167,7 +170,7 @@ src_install() { $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRE= NDER" =20 - qt4-build-edge_src_install + qt4-build${QT_ECLASS}_src_install =20 # qt-creator # some qt-creator headers are located @@ -185,12 +188,12 @@ src_install() { doins "${S}"/tools/designer/src/lib/sdk/* || die =20 #touch the available graphics systems - mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||=20 - die "could not create ${D}/usr/share/qt4/graphicssystems/" - echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" || - die "could not create ${D}/usr/share/qt4/graphicssystems/raster" - touch "${D}/usr/share/qt4/graphicssystems/native" || - die "could not touch ${D}/usr/share/qt4/graphicssystems/native" + mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||=20 + die "could not create ${ED}/usr/share/qt4/graphicssystems/" + echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" || + die "could not create ${ED}/usr/share/qt4/graphicssystems/raster" + touch "${ED}/usr/share/qt4/graphicssystems/native" || + die "could not touch ${ED}/usr/share/qt4/graphicssystems/native" =20 #install private headers if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gu= i-4.9999.ebuild index 6fee2ac..43f119b 100644 --- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild @@ -3,7 +3,10 @@ # $Header: $ =20 EAPI=3D"4" -inherit eutils confutils qt4-build-edge +if [[ ${PV} =3D=3D 4*9999 ]]; then + QT_ECLASS=3D"-edge" +fi +inherit qt4-build${QT_ECLASS} =20 DESCRIPTION=3D"The GUI module for the Qt toolkit" SLOT=3D"4" @@ -103,11 +106,11 @@ pkg_setup() { # mac version does not contain qtconfig? [[ ${CHOST} =3D=3D *-darwin* ]] || QT4_TARGET_DIRECTORIES+=3D" tools/qt= config" =20 - qt4-build-edge_pkg_setup + qt4-build${QT_ECLASS}_pkg_setup } =20 src_prepare() { - qt4-build-edge_src_prepare + qt4-build${QT_ECLASS}_src_prepare =20 # Don't build plugins this go around, because they depend on qt3support= lib sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || = die @@ -140,7 +143,7 @@ src_configure() { -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit -no-phonon -no-opengl" =20 - qt4-build-edge_src_configure + qt4-build${QT_ECLASS}_src_configure =20 if use gtkstyle; then einfo "patching the Makefile to fix qgtkstyle compilation" @@ -167,7 +170,7 @@ src_install() { $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRE= NDER" =20 - qt4-build-edge_src_install + qt4-build${QT_ECLASS}_src_install =20 # qt-creator # some qt-creator headers are located @@ -185,12 +188,12 @@ src_install() { doins "${S}"/tools/designer/src/lib/sdk/* || die =20 #touch the available graphics systems - mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||=20 - die "could not create ${D}/usr/share/qt4/graphicssystems/" - echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" || - die "could not create ${D}/usr/share/qt4/graphicssystems/raster" - touch "${D}/usr/share/qt4/graphicssystems/native" || - die "could not touch ${D}/usr/share/qt4/graphicssystems/native" + mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||=20 + die "could not create ${ED}/usr/share/qt4/graphicssystems/" + echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" || + die "could not create ${ED}/usr/share/qt4/graphicssystems/raster" + touch "${ED}/usr/share/qt4/graphicssystems/native" || + die "could not touch ${ED}/usr/share/qt4/graphicssystems/native" =20 #install private headers if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then