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 1S3lLo-0002ob-1P for garchives@archives.gentoo.org; Sat, 03 Mar 2012 09:34:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C86EE06F5; 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 2B8D3E06F5 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 5AB0B1B4038 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 4EFD1E542A 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: <1330766648.cf46f75466e7c28ad8c30153a6b9f3036f777ee4.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild x11-libs/qt-opengl/qt-opengl-4.9999.ebuild X-VCS-Directories: x11-libs/qt-opengl/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: cf46f75466e7c28ad8c30153a6b9f3036f777ee4 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: 00256c19-bb16-4fc5-b2a2-ec0e6959a895 X-Archives-Hash: 2abc1bad040cf592bedc39e02d550ca1 commit: cf46f75466e7c28ad8c30153a6b9f3036f777ee4 Author: Markos Chandras gentoo org> AuthorDate: Sat Mar 3 09:24:08 2012 +0000 Commit: Markos Chandras gentoo org> CommitDate: Sat Mar 3 09:24:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Dcf46f754 x11-libs/qt-opengl: Sync with portage ebuild --- x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 19 +++++++++++-------- x11-libs/qt-opengl/qt-opengl-4.9999.ebuild | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-o= pengl/qt-opengl-4.8.9999.ebuild index 3e02154..b40d39b 100644 --- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild +++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild @@ -3,7 +3,10 @@ # $Header: $ =20 EAPI=3D"4" -inherit qt4-build-edge +if [[ ${PV} =3D=3D 4*9999 ]]; then + QT_ECLASS=3D"-edge" +fi +inherit qt4-build${QT_ECLASS} =20 DESCRIPTION=3D"The OpenGL module for the Qt toolkit" SLOT=3D"4" @@ -38,7 +41,7 @@ pkg_setup() { =20 QCONFIG_ADD=3D"opengl" QCONFIG_DEFINE=3D"QT_OPENGL $(use egl && echo QT_EGL)" - qt4-build-edge_pkg_setup + qt4-build${QT_ECLASS}_pkg_setup } =20 src_configure() { @@ -46,18 +49,18 @@ src_configure() { $(qt_use qt3support) $(qt_use egl)" =20 - qt4-build-edge_src_configure + qt4-build${QT_ECLASS}_src_configure =20 # Not building tools/designer/src/plugins/tools/view3d as it's # commented out of the build in the source } =20 src_install() { - qt4-build-edge_src_install + qt4-build${QT_ECLASS}_src_install =20 #touch the available graphics systems - mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||=20 - die "could not create ${D}/usr/share/qt4/graphicssystems/" - echo "experimental" > "${D}/usr/share/qt4/graphicssystems/opengl" || - die "could not create ${D}/usr/share/qt4/graphicssystems/opengl" + mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||=20 + die "could not create ${ED}/usr/share/qt4/graphicssystems/" + echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" || + die "could not create ${ED}/usr/share/qt4/graphicssystems/opengl" } diff --git a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild b/x11-libs/qt-ope= ngl/qt-opengl-4.9999.ebuild index 3e02154..b40d39b 100644 --- a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild +++ b/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild @@ -3,7 +3,10 @@ # $Header: $ =20 EAPI=3D"4" -inherit qt4-build-edge +if [[ ${PV} =3D=3D 4*9999 ]]; then + QT_ECLASS=3D"-edge" +fi +inherit qt4-build${QT_ECLASS} =20 DESCRIPTION=3D"The OpenGL module for the Qt toolkit" SLOT=3D"4" @@ -38,7 +41,7 @@ pkg_setup() { =20 QCONFIG_ADD=3D"opengl" QCONFIG_DEFINE=3D"QT_OPENGL $(use egl && echo QT_EGL)" - qt4-build-edge_pkg_setup + qt4-build${QT_ECLASS}_pkg_setup } =20 src_configure() { @@ -46,18 +49,18 @@ src_configure() { $(qt_use qt3support) $(qt_use egl)" =20 - qt4-build-edge_src_configure + qt4-build${QT_ECLASS}_src_configure =20 # Not building tools/designer/src/plugins/tools/view3d as it's # commented out of the build in the source } =20 src_install() { - qt4-build-edge_src_install + qt4-build${QT_ECLASS}_src_install =20 #touch the available graphics systems - mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||=20 - die "could not create ${D}/usr/share/qt4/graphicssystems/" - echo "experimental" > "${D}/usr/share/qt4/graphicssystems/opengl" || - die "could not create ${D}/usr/share/qt4/graphicssystems/opengl" + mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||=20 + die "could not create ${ED}/usr/share/qt4/graphicssystems/" + echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" || + die "could not create ${ED}/usr/share/qt4/graphicssystems/opengl" }