commit: f26d082a1d9cbb0d0cbef84a046c6b7eecb1f047
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 12:02:30 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 12:02:30 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f26d082a
[Qt5] Change some IUSE defaults.
---
dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild | 3 ++-
dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild | 3 ++-
dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild | 3 ++-
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 3 ++-
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.3.1.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.3.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.9999.ebuild | 2 +-
12 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.1.ebuild
@@ -14,8 +14,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +localstorage +widgets +xml"
+IUSE="gles2 localstorage +widgets xml"
+# qtgui[gles2=] is needed because of bug 504322
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.9999.ebuild
@@ -14,8 +14,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +localstorage +widgets +xml"
+IUSE="gles2 localstorage +widgets xml"
+# qtgui[gles2=] is needed because of bug 504322
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
@@ -14,8 +14,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +localstorage +widgets +xml"
+IUSE="gles2 localstorage +widgets xml"
+# qtgui[gles2=] is needed because of bug 504322
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -14,8 +14,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +localstorage +widgets +xml"
+IUSE="gles2 localstorage +widgets xml"
+# qtgui[gles2=] is needed because of bug 504322
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
diff --git a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
index 664b14b..36b0bcf 100644
--- a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="designer +opengl webkit +xml"
+IUSE="designer +opengl webkit xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
diff --git a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
index 664b14b..36b0bcf 100644
--- a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="designer +opengl webkit +xml"
+IUSE="designer +opengl webkit xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
diff --git a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
index 664b14b..36b0bcf 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="designer +opengl webkit +xml"
+IUSE="designer +opengl webkit xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
diff --git a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
index 664b14b..36b0bcf 100644
--- a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="designer +opengl webkit +xml"
+IUSE="designer +opengl webkit xml"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
