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)"
