From: "Markos Chandras" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/
Date: Sat, 3 Mar 2012 09:33:53 +0000 (UTC) [thread overview]
Message-ID: <1330766648.cf46f75466e7c28ad8c30153a6b9f3036f777ee4.hwoarang@gentoo> (raw)
commit: cf46f75466e7c28ad8c30153a6b9f3036f777ee4
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 3 09:24:08 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 09:24:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cf46f754
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-opengl/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: $
EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+ QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The OpenGL module for the Qt toolkit"
SLOT="4"
@@ -38,7 +41,7 @@ pkg_setup() {
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
- qt4-build-edge_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
@@ -46,18 +49,18 @@ src_configure() {
$(qt_use qt3support)
$(qt_use egl)"
- qt4-build-edge_src_configure
+ qt4-build${QT_ECLASS}_src_configure
# Not building tools/designer/src/plugins/tools/view3d as it's
# commented out of the build in the source
}
src_install() {
- qt4-build-edge_src_install
+ qt4-build${QT_ECLASS}_src_install
#touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- 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/" ||
+ 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-opengl/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: $
EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+ QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The OpenGL module for the Qt toolkit"
SLOT="4"
@@ -38,7 +41,7 @@ pkg_setup() {
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
- qt4-build-edge_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
@@ -46,18 +49,18 @@ src_configure() {
$(qt_use qt3support)
$(qt_use egl)"
- qt4-build-edge_src_configure
+ qt4-build${QT_ECLASS}_src_configure
# Not building tools/designer/src/plugins/tools/view3d as it's
# commented out of the build in the source
}
src_install() {
- qt4-build-edge_src_install
+ qt4-build${QT_ECLASS}_src_install
#touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- 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/" ||
+ 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"
}
next reply other threads:[~2012-03-03 9:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-03 9:33 Markos Chandras [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-17 16:04 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/ Michael Palimaka
2012-07-03 23:03 Davide Pesavento
2012-09-20 10:52 Johannes Huber
2012-09-21 6:53 Johannes Huber
2013-02-22 8:54 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330766648.cf46f75466e7c28ad8c30153a6b9f3036f777ee4.hwoarang@gentoo \
--to=hwoarang@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox