* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-qt3support/
@ 2012-03-03 9:33 Markos Chandras
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras @ 2012-03-03 9:33 UTC (permalink / raw
To: gentoo-commits
commit: ae92b3d7eaba66b80f462964c05df0f9fc266fa4
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 3 09:33:45 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 09:33:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ae92b3d7
x11-libs/qt-qt3support:Sync with portage ebuild
---
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 19 ++++++++-----------
x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild | 19 ++++++++-----------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 2c9a507..c843e48 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -3,7 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+ QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The Qt3 support module for the Qt toolkit"
SLOT="4"
@@ -13,15 +16,11 @@ else
KEYWORDS=""
fi
-IUSE="+accessibility kde phonon"
+IUSE="+accessibility"
DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
- phonon? (
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,c++0x=,qpa=,debug=]
- media-libs/phonon[aqua=,gstreamer] ) )
- kde? ( media-libs/phonon[aqua=,gstreamer] ) )"
+ ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]"
RDEPEND="${DEPEND}"
@@ -35,13 +34,11 @@ pkg_setup() {
QT4_EXTRACT_DIRECTORIES="src include tools"
fi
- qt4-build-edge_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
myconf="${myconf} -qt3support
- $(qt_use phonon gstreamer)
- $(qt_use phonon)
$(qt_use accessibility)"
- qt4-build-edge_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
index 2c9a507..c843e48 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
@@ -3,7 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+ QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
DESCRIPTION="The Qt3 support module for the Qt toolkit"
SLOT="4"
@@ -13,15 +16,11 @@ else
KEYWORDS=""
fi
-IUSE="+accessibility kde phonon"
+IUSE="+accessibility"
DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
- phonon? (
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,c++0x=,qpa=,debug=]
- media-libs/phonon[aqua=,gstreamer] ) )
- kde? ( media-libs/phonon[aqua=,gstreamer] ) )"
+ ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]"
RDEPEND="${DEPEND}"
@@ -35,13 +34,11 @@ pkg_setup() {
QT4_EXTRACT_DIRECTORIES="src include tools"
fi
- qt4-build-edge_pkg_setup
+ qt4-build${QT_ECLASS}_pkg_setup
}
src_configure() {
myconf="${myconf} -qt3support
- $(qt_use phonon gstreamer)
- $(qt_use phonon)
$(qt_use accessibility)"
- qt4-build-edge_src_configure
+ qt4-build${QT_ECLASS}_src_configure
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-qt3support/
@ 2012-03-17 16:10 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2012-03-17 16:10 UTC (permalink / raw
To: gentoo-commits
commit: ad6e1ae009eb5a071f4c91d07d09aa369ff1a15c
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 17 16:09:56 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 17 16:09:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ad6e1ae0
[x11-libs/qt-qt3support] Sync metadata from portage, fix whitespace, update copyright year.
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-qt3support/metadata.xml | 15 ++++-----------
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 4 ++--
x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild | 4 ++--
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/x11-libs/qt-qt3support/metadata.xml b/x11-libs/qt-qt3support/metadata.xml
index e725c08..d0dee47 100644
--- a/x11-libs/qt-qt3support/metadata.xml
+++ b/x11-libs/qt-qt3support/metadata.xml
@@ -3,16 +3,9 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='exceptions'>
- Build with support for exceptions
- </flag>
- <flag name='phonon'>
- Enable phonon configuration dialog in qtconfig
- </flag>
- <flag name='kde'>
- Select <pkg>media-libs/phonon</pkg> as phonon variant needed for kde
- </flag>
- <flag name='stable-branch'>Use the stable git branch - it is slightly behind
- master but guaranteed by Nokia to compile</flag>
+ <flag name='exceptions'>Add support for exceptions - like catching them
+ inside the event loop (recommended by Nokia)</flag>
+ <flag name='c++0x'>Build Qt using the C++11 standard</flag>
+ <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
</use>
</pkgmetadata>
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index c843e48..59b4e58 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
inherit qt4-build${QT_ECLASS}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
index c843e48..59b4e58 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
+ QT_ECLASS="-edge"
fi
inherit qt4-build${QT_ECLASS}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-17 16:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-03 9:33 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-qt3support/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2012-03-17 16:10 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox