* [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
@ 2013-07-25 9:13 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2013-07-25 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 76db9f951057558d40a45f436f1b0ee054781c86
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul 25 09:13:30 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 09:13:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76db9f95
[dev-qt/qtdemo] Fix bugs #477652 and #477862.
Package-Manager: portage-2.2.0_alpha188
---
dev-qt/qtdemo/metadata.xml | 1 +
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 46 +++++++++++++++++++-----------------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 5038698..feb2119 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -11,6 +11,7 @@
<flag name="multimedia">Build QtMultimedia examples and demos</flag>
<flag name="opengl">Build QtOpenGL examples and demos</flag>
<flag name="openvg">Build QtOpenVG examples and demos</flag>
+ <flag name="phonon">Build Phonon examples and demos</flag>
<flag name="qt3support">Build Qt3Support examples and demos</flag>
<flag name="webkit">Build QtWebKit examples and demos</flag>
<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 4085f64..2d892e5 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -13,29 +13,29 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
DEPEND="
- ~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qthelp-${PV}:4[aqua=,debug=]
- ~dev-qt/qtscript-${PV}:4[aqua=,debug=]
- ~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
- ~dev-qt/qttest-${PV}:4[aqua=,debug=]
- dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
- declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
- kde? ( media-libs/phonon[aqua=] )
- !kde? ( || (
- ~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
- media-libs/phonon[aqua=]
- ) )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
- openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
- qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] )
+ ~dev-qt/designer-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtsvg-${PV}[aqua=,debug=]
+ ~dev-qt/qttest-${PV}[aqua=,debug=]
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
+ multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
+ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
+ openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
+ phonon? (
+ kde? ( media-libs/phonon[aqua=] )
+ !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+ )
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
@@ -49,8 +49,8 @@ pkg_setup() {
examples"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
doc/src/images
- src
include
+ src
tools"
qt4-build_pkg_setup
@@ -66,6 +66,7 @@ src_prepare() {
'multimedia:spectrum'
'opengl:boxes|glhypnotizer'
'openvg'
+ 'phonon:mediaplayer'
'webkit:browser'
'xmlpatterns'
)
@@ -99,6 +100,7 @@ src_configure() {
$(qt_use multimedia)
$(qt_use opengl)
$(qt_use openvg)
+ $(qt_use phonon)
$(qt_use qt3support)
$(qt_use webkit)
$(qt_use xmlpatterns)"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
@ 2014-05-27 22:59 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2014-05-27 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 7bdd7364dc646f9be951ecce490b5e9741add07d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 22:26:28 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 22:26:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7bdd7364
[dev-qt/qtdemo:4] Remove bogus dependency on qt3support.
Thanks to Rafał Mużyło in bug 510042 comment #2.
Package-Manager: portage-2.2.10
---
dev-qt/qtdemo/metadata.xml | 1 -
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 22 +++++++++-------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index a03d28e..5db131c 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -11,7 +11,6 @@
<flag name="opengl">Build QtOpenGL examples and demos</flag>
<flag name="openvg">Build QtOpenVG examples and demos</flag>
<flag name="phonon">Build Phonon examples and demos</flag>
- <flag name="qt3support">Build Qt3Support examples and demos</flag>
<flag name="webkit">Build QtWebKit examples and demos</flag>
<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
</use>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 7a57ed4..db57ecf 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -14,27 +14,26 @@ else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
fi
-IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
+IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
DEPEND="
~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=]
~dev-qt/qthelp-${PV}[aqua=,debug=]
~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=]
~dev-qt/qtsvg-${PV}[aqua=,debug=]
~dev-qt/qttest-${PV}[aqua=,debug=]
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
+ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] )
+ openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
phonon? (
kde? ( media-libs/phonon[aqua=] )
!kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
)
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
"
@@ -84,11 +83,9 @@ src_prepare() {
fi
done
- if ! use qt3support; then
- einfo "Disabling qt3support examples"
- sed -i -e '/QT_CONFIG, qt3support/d' \
- examples/graphicsview/graphicsview.pro || die
- fi
+ # Remove bogus dependency on qt3support (bug 510042)
+ sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
+ examples/graphicsview/graphicsview.pro || die
}
src_configure() {
@@ -99,7 +96,6 @@ src_configure() {
$(qt_use opengl)
$(qt_use openvg)
$(qt_use phonon) -no-phonon-backend
- $(qt_use qt3support)
$(qt_use webkit)
$(qt_use xmlpatterns)"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
@ 2014-07-08 19:33 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2014-07-08 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 1ac3aebf90daef6f5adce9cdf6db5190eae72541
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 19:28:51 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 19:32:06 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ac3aebf
[dev-qt/qtdemo:4] Stop installing doc/src/images.
They don't seem to be used, I couldn't find any references to them
in the examples/ and demos/ subdirs.
---
dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 7 -------
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 7 -------
2 files changed, 14 deletions(-)
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
index 6128e3d..04fffca 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -95,10 +95,3 @@ multilib_src_configure() {
)
qt4_multilib_src_configure
}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- insinto "${QT4_DOCDIR#${EPREFIX}}"/src
- doins -r doc/src/images
-}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 6128e3d..04fffca 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -95,10 +95,3 @@ multilib_src_configure() {
)
qt4_multilib_src_configure
}
-
-multilib_src_install_all() {
- qt4_multilib_src_install_all
-
- insinto "${QT4_DOCDIR#${EPREFIX}}"/src
- doins -r doc/src/images
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
@ 2014-12-31 13:06 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2014-12-31 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 4bfece27570f105f1f3534aff0bd6242c4e37e19
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 31 13:00:08 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 31 13:00:08 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4bfece27
[dev-qt/qtdemo] Enforce USE dependency for media-libs/phonon.
Package-Manager: portage-2.2.15
---
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 04fffca..d178f98 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -31,8 +31,8 @@ DEPEND="
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
phonon? (
- kde? ( media-libs/phonon[aqua=] )
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
+ kde? ( media-libs/phonon[aqua=,qt4] )
+ !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) )
)
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
@ 2015-06-06 23:48 Davide Pesavento
0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2015-06-06 23:48 UTC (permalink / raw
To: gentoo-commits
commit: 26bbc1a9ef749caab0c31682651f5462817bae5d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 6 23:48:32 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 6 23:48:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=26bbc1a9
[dev-qt/qtdemo] Sync.
Package-Manager: portage-2.2.20
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 49f9617..b612789 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -28,8 +28,11 @@ DEPEND="
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
phonon? (
- kde? ( media-libs/phonon[aqua=,qt4] )
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) )
+ kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
+ !kde? ( || (
+ ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}]
+ ) )
)
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-06 23:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27 22:59 [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2015-06-06 23:48 Davide Pesavento
2014-12-31 13:06 Michael Palimaka
2014-07-08 19:33 Davide Pesavento
2013-07-25 9:13 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox