summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2013-07-25 09:07:41 +0000
committerDavide Pesavento <pesa@gentoo.org>2013-07-25 09:07:41 +0000
commit3ecfa5eb2c93505f19573c601f50914208b77eaa (patch)
tree36668e5451610eeea8296e3c8f845ca2100ead9c /dev-qt/qtdemo
parentMove building of mans behind ifdef in src_compile() as reported by hwoarang (diff)
downloadgentoo-2-3ecfa5eb2c93505f19573c601f50914208b77eaa.tar.gz
gentoo-2-3ecfa5eb2c93505f19573c601f50914208b77eaa.tar.bz2
gentoo-2-3ecfa5eb2c93505f19573c601f50914208b77eaa.zip
Fix bugs #477652 and #477862.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
Diffstat (limited to 'dev-qt/qtdemo')
-rw-r--r--dev-qt/qtdemo/ChangeLog8
-rw-r--r--dev-qt/qtdemo/metadata.xml1
-rw-r--r--dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild (renamed from dev-qt/qtdemo/qtdemo-4.8.5.ebuild)48
3 files changed, 33 insertions, 24 deletions
diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index c59f47d212f5..4fd3569baf8c 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-qt/qtdemo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.4 2013/07/09 10:47:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.5 2013/07/25 09:07:41 pesa Exp $
+
+*qtdemo-4.8.5-r1 (25 Jul 2013)
+
+ 25 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdemo-4.8.5-r1.ebuild,
+ -qtdemo-4.8.5.ebuild, metadata.xml:
+ Fix bugs #477652 and #477862.
*qtdemo-4.8.5 (09 Jul 2013)
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index e7b551b15594..2d20d629c78f 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.5.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
index 393f63272fb7..336fa6d6d309 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.5.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5.ebuild,v 1.1 2013/07/09 10:47:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.1 2013/07/25 09:07:41 pesa Exp $
EAPI=4
@@ -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)"