[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 46ba9155dc4b7040a9705777e7c2b9c2ad68ef1c
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Jun 16 12:33:02 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Jun 16 12:33:02 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=46ba9155
dev-qt/qtquick1: remove obsolete package
Gentoo-Bug: 585386
dev-qt/qtquick1/metadata.xml | 23 --
dev-qt/qtquick1/qtquick1-5.6..ebuild | 52
dev-qt/qtquick1/qtquick1-5.7..ebuild | 52
dev-qt/qtquick1/qtquick1-5..ebuild | 52
4 files changed, 179 deletions(-)
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
deleted file mode 100644
index d9e6c88..000
--- a/dev-qt/qtquick1/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- q...@gentoo.org
- Gentoo Qt Project
-
-
- Build plugin for
dev-qt/designer
- Use GLES 2.0 or later instead of full
OpenGL
- Build the WebView import for QtQuick1
(requires QtWebKit)
- Build the XmlListModel import for QtQuick1
(requires QtXmlPatterns)
-
-
- https://bugreports.qt.io/
- http://doc.qt.io/
-
-
-
- Must only be used by packages that are known to use
private parts of the Qt API.
-
-
-
diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild
b/dev-qt/qtquick1/qtquick1-5.6..ebuild
deleted file mode 100644
index c2d0c58..000
--- a/dev-qt/qtquick1/qtquick1-5.6..ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="designer gles2 opengl webkit xml"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtscript-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- designer? (
- ~dev-qt/designer-${PV}
- ~dev-qt/qtdeclarative-${PV}
- )
- opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
- )
- webkit? ( ~dev-qt/qtwebkit-${PV} )
- xml? ( ~dev-qt/qtxmlpatterns-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_mod designer designer \
- src/plugins/plugins.pro
-
- qt_use_disable_mod opengl opengl \
- src/imports/imports.pro \
- tools/qml/qml.pri
-
- qt_use_disable_mod webkit webkitwidgets \
- src/imports/imports.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/declarative/declarative.pro \
- src/declarative/util/util.pri
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquick1/qtquick1-5.7..ebuild
b/dev-qt/qtquick1/qtquick1-5.7..ebuild
deleted file mode 100644
index c2d0c58..000
--- a/dev-qt/qtquick1/qtquick1-5.7..ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="designer gles2 opengl webkit xml"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtscript-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- designer? (
- ~dev-qt/designer-${PV}
- ~dev-qt/qtdeclarative-${PV}
- )
- opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
- )
- webkit? ( ~dev-qt/qtwebkit-${PV} )
- xml? ( ~dev-qt/qtxmlpatterns-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_mod designer designer \
- src/plugins/plugins.pro
-
- qt_use_disable_mod opengl opengl \
- src/imports/imports.pro \
- tools/qml/qml.pri
-
- qt_use_disable_mod webkit webkitwidgets \
- src/imports/imports.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/declarative/declarative.pro \
- src/declarative/util/util.pri
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
deleted file mode 100644
index c2d0c58..000
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 528af83840ad09fa7904d538b9182bc019282b9c
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Apr 12 01:08:16 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Apr 12 01:09:10 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=528af838
dev-qt/qtquick1: add ebuild for 5.6.0
Upstream failed to provide a tarball for 5.6.0 (actually there wasn't
an official release at all since they didn't even create a git tag for
v5.6.0), so I've created a tarball myself from commit
dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295.
Having also qtquick1 at 5.6.0 allows us to keep uniform version numbers
in dependency atoms.
Package-Manager: portage-2.2.28
dev-qt/qtquick1/Manifest | 1 +
dev-qt/qtquick1/qtquick1-5.6.0.ebuild | 53 +++
2 files changed, 54 insertions(+)
diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest
index 9bed1c2..09cacde 100644
--- a/dev-qt/qtquick1/Manifest
+++ b/dev-qt/qtquick1/Manifest
@@ -1 +1,2 @@
+DIST qtquick1-opensource-src-5.6.0.tar.xz 16020404 SHA256
083a20433d18c50664636ab0de5286250c0f197cbc34b291a150f2d87aae8781 SHA512
cd6cca9b9a4d390da7704218b884520cc7f1f30f7f016f41ee953a5bdc3aa63f1c04ef39b1b55e8e9f985e11c1ba7fa3178552a3c71bf7f5ae25888dc65b1e4b
WHIRLPOOL
2c061e9b368fda98a78156a2dbd10986ef1c887e201d06fa4ab66dbb7f97e18c4cebe87056bc5c876cb9a9b4c08415c55c50bc48c6752529c0a10a251ad4b0bd
DIST qtquick1-opensource-src-5.7.0-alpha.tar.xz 17340340 SHA256
d4cfd91c7a2a2a01ee8cb3725860aa343aaa660c74911f44b86424a94257f7f3 SHA512
af808676f18d1ede53d02ad91de0e9960406f784533b290549925ce7a0804d4df7c5e0d079564b8cfee3c8cbe1b02a13860e449ec62437b080ca9862d05ddadd
WHIRLPOOL
b41a92e21eaf30a06e653ca269f6e4a940cbc22ea15673af6fbc36f66bddeec8180efc185d0a0c5da26d6e221a180afd735c0f48ba234970ed1a9264af271697
diff --git a/dev-qt/qtquick1/qtquick1-5.6.0.ebuild
b/dev-qt/qtquick1/qtquick1-5.6.0.ebuild
new file mode 100644
index 000..62473a7
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
+SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${PN}-opensource-src-${PV}.tar.xz;
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="designer gles2 opengl webkit xml"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtscript-${PV}
+ ~dev-qt/qtsql-${PV}
+ ~dev-qt/qtwidgets-${PV}
+ designer? (
+ ~dev-qt/designer-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ )
+ opengl? (
+ ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtopengl-${PV}
+ )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
+ xml? ( ~dev-qt/qtxmlpatterns-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod opengl opengl \
+ src/imports/imports.pro \
+ tools/qml/qml.pri
+
+ qt_use_disable_mod webkit webkitwidgets \
+ src/imports/imports.pro
+
+ qt_use_disable_mod xml xmlpatterns \
+ src/declarative/declarative.pro \
+ src/declarative/util/util.pri
+
+ qt5-build_src_prepare
+}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 5abb56b3cde54f42915665ba3a73d294af569d05
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Apr 10 17:00:02 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Apr 10 17:00:02 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5abb56b3
dev-qt/qtquick1: delete obsolete comment
Package-Manager: portage-2.2.28
dev-qt/qtquick1/qtquick1-5.6..ebuild| 1 -
dev-qt/qtquick1/qtquick1-5.7.0_alpha.ebuild | 1 -
dev-qt/qtquick1/qtquick1-5.7..ebuild| 1 -
dev-qt/qtquick1/qtquick1-5..ebuild | 1 -
4 files changed, 4 deletions(-)
diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild
b/dev-qt/qtquick1/qtquick1-5.6..ebuild
index 569ba62..c2d0c58 100644
--- a/dev-qt/qtquick1/qtquick1-5.6..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.6..ebuild
@@ -13,7 +13,6 @@ fi
IUSE="designer gles2 opengl webkit xml"
-# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}
diff --git a/dev-qt/qtquick1/qtquick1-5.7.0_alpha.ebuild
b/dev-qt/qtquick1/qtquick1-5.7.0_alpha.ebuild
index 569ba62..c2d0c58 100644
--- a/dev-qt/qtquick1/qtquick1-5.7.0_alpha.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.7.0_alpha.ebuild
@@ -13,7 +13,6 @@ fi
IUSE="designer gles2 opengl webkit xml"
-# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}
diff --git a/dev-qt/qtquick1/qtquick1-5.7..ebuild
b/dev-qt/qtquick1/qtquick1-5.7..ebuild
index 569ba62..c2d0c58 100644
--- a/dev-qt/qtquick1/qtquick1-5.7..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.7..ebuild
@@ -13,7 +13,6 @@ fi
IUSE="designer gles2 opengl webkit xml"
-# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index 569ba62..c2d0c58 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -13,7 +13,6 @@ fi
IUSE="designer gles2 opengl webkit xml"
-# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: c336803b8810f772c29cb3649dc677441393f294
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Feb 10 13:13:40 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Feb 10 13:25:52 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c336803b
Revert "dev-qt/qtquick1: remove package"
Upstream will still be providing unsupported source-only releases.
This reverts commit 080a3c8c0b5aeb382d16ebf162f1db1b5e6dd83b.
Gentoo-bug: 573562
dev-qt/qtquick1/metadata.xml | 15 +
dev-qt/qtquick1/qtquick1-5.6..ebuild | 53
dev-qt/qtquick1/qtquick1-5..ebuild | 53
3 files changed, 121 insertions(+)
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
new file mode 100644
index 000..c4dea83
--- /dev/null
+++ b/dev-qt/qtquick1/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+ qt
+
+ Build plugin for
dev-qt/designer
+ Use GLES 2.0 or later instead of full
OpenGL
+ Build the WebView import for QtQuick1
(requires QtWebKit)
+ Build the XmlListModel import for QtQuick1
(requires QtXmlPatterns)
+
+
+ https://bugreports.qt.io/
+ http://doc.qt.io/
+
+
diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild
b/dev-qt/qtquick1/qtquick1-5.6..ebuild
new file mode 100644
index 000..19597f5
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5.6..ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="designer gles2 opengl webkit xml"
+
+# see bug 542698 for pinned dev-qt/designer dependency
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtscript-${PV}
+ ~dev-qt/qtsql-${PV}
+ ~dev-qt/qtwidgets-${PV}
+ designer? (
+ ~dev-qt/designer-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ )
+ opengl? (
+ ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtopengl-${PV}
+ )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
+ xml? ( ~dev-qt/qtxmlpatterns-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod opengl opengl \
+ src/imports/imports.pro \
+ tools/qml/qml.pri
+
+ qt_use_disable_mod webkit webkitwidgets \
+ src/imports/imports.pro
+
+ qt_use_disable_mod xml xmlpatterns \
+ src/declarative/declarative.pro \
+ src/declarative/util/util.pri
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
new file mode 100644
index 000..19597f5
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="designer gles2 opengl webkit xml"
+
+# see bug 542698 for pinned dev-qt/designer dependency
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtscript-${PV}
+ ~dev-qt/qtsql-${PV}
+ ~dev-qt/qtwidgets-${PV}
+ designer? (
+ ~dev-qt/designer-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ )
+ opengl? (
+ ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtopengl-${PV}
+ )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
+ xml? ( ~dev-qt/qtxmlpatterns-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod opengl opengl \
+ src/imports/imports.pro \
+ tools/qml/qml.pri
+
+ qt_use_disable_mod webkit webkitwidgets \
+ src/imports/imports.pro
+
+ qt_use_disable_mod xml xmlpatterns \
+ src/declarative/declarative.pro \
+ src/declarative/util/util.pri
+
+ qt5-build_src_prepare
+}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 1d462ee9f3a4cd2c20971d9fb1b5699a8ad0e0cd Author: Davide Pesavento gentoo org> AuthorDate: Wed Feb 10 15:20:22 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Feb 10 15:20:22 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1d462ee9 dev-qt/qtquick1: migrate ebuilds to EAPI 6, and metadata to GLEP 67 Package-Manager: portage-2.2.27 dev-qt/qtquick1/metadata.xml | 5 - dev-qt/qtquick1/qtquick1-5.6..ebuild | 4 ++-- dev-qt/qtquick1/qtquick1-5..ebuild | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml index c4dea83..3366518 100644 --- a/dev-qt/qtquick1/metadata.xml +++ b/dev-qt/qtquick1/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - qt + + q...@gentoo.org + Gentoo Qt Project + Build plugin for dev-qt/designer Use GLES 2.0 or later instead of full OpenGL diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild b/dev-qt/qtquick1/qtquick1-5.6..ebuild index 19597f5..569ba62 100644 --- a/dev-qt/qtquick1/qtquick1-5.6..ebuild +++ b/dev-qt/qtquick1/qtquick1-5.6..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit qt5-build DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)" diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild b/dev-qt/qtquick1/qtquick1-5..ebuild index 19597f5..569ba62 100644 --- a/dev-qt/qtquick1/qtquick1-5..ebuild +++ b/dev-qt/qtquick1/qtquick1-5..ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit qt5-build DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 080a3c8c0b5aeb382d16ebf162f1db1b5e6dd83b
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jan 6 13:57:00 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jan 6 13:58:29 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=080a3c8c
dev-qt/qtquick1: remove package
No further releases are expected.
dev-qt/qtquick1/metadata.xml | 15 -
dev-qt/qtquick1/qtquick1-5.6..ebuild | 53
dev-qt/qtquick1/qtquick1-5..ebuild | 53
3 files changed, 121 deletions(-)
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
deleted file mode 100644
index c4dea83..000
--- a/dev-qt/qtquick1/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
- qt
-
- Build plugin for
dev-qt/designer
- Use GLES 2.0 or later instead of full
OpenGL
- Build the WebView import for QtQuick1
(requires QtWebKit)
- Build the XmlListModel import for QtQuick1
(requires QtXmlPatterns)
-
-
- https://bugreports.qt.io/
- http://doc.qt.io/
-
-
diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild
b/dev-qt/qtquick1/qtquick1-5.6..ebuild
deleted file mode 100644
index 19597f5..000
--- a/dev-qt/qtquick1/qtquick1-5.6..ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt5-build
-
-DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="designer gles2 opengl webkit xml"
-
-# see bug 542698 for pinned dev-qt/designer dependency
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtscript-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- designer? (
- ~dev-qt/designer-${PV}
- ~dev-qt/qtdeclarative-${PV}
- )
- opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
- )
- webkit? ( ~dev-qt/qtwebkit-${PV} )
- xml? ( ~dev-qt/qtxmlpatterns-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_mod designer designer \
- src/plugins/plugins.pro
-
- qt_use_disable_mod opengl opengl \
- src/imports/imports.pro \
- tools/qml/qml.pri
-
- qt_use_disable_mod webkit webkitwidgets \
- src/imports/imports.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/declarative/declarative.pro \
- src/declarative/util/util.pri
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
deleted file mode 100644
index 19597f5..000
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt5-build
-
-DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="designer gles2 opengl webkit xml"
-
-# see bug 542698 for pinned dev-qt/designer dependency
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtscript-${PV}
- ~dev-qt/qtsql-${PV}
- ~dev-qt/qtwidgets-${PV}
- designer? (
- ~dev-qt/designer-${PV}
- ~dev-qt/qtdeclarative-${PV}
- )
- opengl? (
- ~dev-qt/qtgui-${PV}[gles2=]
- ~dev-qt/qtopengl-${PV}
- )
- webkit? ( ~dev-qt/qtwebkit-${PV} )
- xml? ( ~dev-qt/qtxmlpatterns-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_mod designer designer \
- src/plugins/plugins.pro
-
- qt_use_disable_mod opengl opengl \
- src/imports/imports.pro \
- tools/qml/qml.pri
-
- qt_use_disable_mod webkit webkitwidgets \
- src/imports/imports.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/declarative/declarative.pro \
- src/declarative/util/util.pri
-
- qt5-build_src_prepare
-}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 5819750fc983386edd11d90680082626675dc948
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 16 17:52:53 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 16 17:53:41 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5819750f
dev-qt/qtquick1: introduce gles2 USE flag
opengl/gles2 selection in libqmlshadersplugin.so happens automagically based
on how qtgui is built.
Package-Manager: portage-2.2.20.1
dev-qt/qtquick1/metadata.xml | 1 +
dev-qt/qtquick1/qtquick1-5.5.0.ebuild| 7 +--
dev-qt/qtquick1/qtquick1-5.5.1.ebuild| 7 +--
dev-qt/qtquick1/qtquick1-5.5..ebuild | 7 +--
dev-qt/qtquick1/qtquick1-5.6..ebuild | 7 +--
dev-qt/qtquick1/qtquick1-5..ebuild | 7 +--
6 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index ff6648b..c4dea83 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -4,6 +4,7 @@
qt
Build plugin for
dev-qt/designer
+ Use GLES 2.0 or later instead of full
OpenGL
Build the WebView import for QtQuick1
(requires QtWebKit)
Build the XmlListModel import for QtQuick1
(requires QtXmlPatterns)
diff --git a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
~dev-qt/designer-${PV}
>=dev-qt/qtdeclarative-${PV}:5
)
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ opengl? (
+ >=dev-qt/qtgui-${PV}:5[gles2=]
+ >=dev-qt/qtopengl-${PV}:5
+ )
webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
"
diff --git a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
~dev-qt/designer-${PV}
>=dev-qt/qtdeclarative-${PV}:5
)
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ opengl? (
+ >=dev-qt/qtgui-${PV}:5[gles2=]
+ >=dev-qt/qtopengl-${PV}:5
+ )
webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
"
diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
~dev-qt/designer-${PV}
>=dev-qt/qtdeclarative-${PV}:5
)
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ opengl? (
+ >=dev-qt/qtgui-${PV}:5[gles2=]
+ >=dev-qt/qtopengl-${PV}:5
+ )
webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
"
diff --git a/dev-qt/qtquick1/qtquick1-5.6..ebuild
b/dev-qt/qtquick1/qtquick1-5.6..ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.6..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.6..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
~dev-qt/designer-${PV}
>=dev-qt/qtdeclarative-${PV}:5
)
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+ opengl? (
+ >=dev-qt/qtgui-${PV}:5[gles2=]
+ >=dev-qt/qtopengl-${PV}:5
+ )
webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
"
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: e1bfa995cc9577c5eb0f2191d03ae027efb9b5ae
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Jul 13 01:35:05 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Jul 13 01:35:05 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1bfa995
[dev-qt/qtquick1] No reason to enable opengl by default.
Package-Manager: portage-2.2.20
dev-qt/qtquick1/qtquick1-5.5.0.ebuild| 2 +-
dev-qt/qtquick1/qtquick1-5.5..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
index 0232db2..5b77c37 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
fi
-IUSE=designer +opengl webkit xml
+IUSE=designer opengl webkit xml
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index 0232db2..5b77c37 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
fi
-IUSE=designer +opengl webkit xml
+IUSE=designer opengl webkit xml
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index 0232db2..5b77c37 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
fi
-IUSE=designer +opengl webkit xml
+IUSE=designer opengl webkit xml
# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: d219df1ed2b1e0e33b65e00fbad9cc9e947f5ab7
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Tue Mar 17 17:14:22 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Tue Mar 17 17:14:22 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d219df1e
[dev-qt/qtquick1] Sync.
Package-Manager: portage-2.2.18
dev-qt/qtquick1/qtquick1-5.4..ebuild | 4 ++--
dev-qt/qtquick1/qtquick1-5.5..ebuild | 4 ++--
dev-qt/qtquick1/qtquick1-5..ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtquick1/qtquick1-5.4..ebuild
b/dev-qt/qtquick1/qtquick1-5.4..ebuild
index fa66e75..0cfe64b 100644
--- a/dev-qt/qtquick1/qtquick1-5.4..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4..ebuild
@@ -16,7 +16,7 @@ fi
IUSE=designer +opengl webkit xml
-# bug 542698 for pinned designer dependency
+# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- ~dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index fa66e75..0cfe64b 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -16,7 +16,7 @@ fi
IUSE=designer +opengl webkit xml
-# bug 542698 for pinned designer dependency
+# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- ~dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index fa66e75..0cfe64b 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -16,7 +16,7 @@ fi
IUSE=designer +opengl webkit xml
-# bug 542698 for pinned designer dependency
+# see bug 542698 for pinned dev-qt/designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- ~dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: ad4394318f5538658f46ea99cc13c7738cd67ec4
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Mar 17 14:48:28 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Mar 17 14:48:28 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ad439431
[dev-qt/qtquick1] Add bug reference for
c23384467ccb1541f1bb4e7f55bb98ea62d6.
Package-Manager: portage-2.2.17
dev-qt/qtquick1/qtquick1-5.4..ebuild | 1 +
dev-qt/qtquick1/qtquick1-5.5..ebuild | 1 +
dev-qt/qtquick1/qtquick1-5..ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtquick1/qtquick1-5.4..ebuild
b/dev-qt/qtquick1/qtquick1-5.4..ebuild
index a444109..4d662f5 100644
--- a/dev-qt/qtquick1/qtquick1-5.4..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4..ebuild
@@ -16,6 +16,7 @@ fi
IUSE=designer +opengl webkit xml
+# bug 542698 for pinned designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index a444109..4d662f5 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -16,6 +16,7 @@ fi
IUSE=designer +opengl webkit xml
+# bug 542698 for pinned designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index a444109..4d662f5 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -16,6 +16,7 @@ fi
IUSE=designer +opengl webkit xml
+# bug 542698 for pinned designer dependency
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: c23384467ccb1541f1bb4e7f55bb98ea62d6
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Mon Mar 16 16:02:54 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Mon Mar 16 16:02:54 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2338446
[dev-qt/qtquick1] Pin dev-qt/designer dependency avoid a crash wrt bug #542698.
Package-Manager: portage-2.2.17
dev-qt/qtquick1/qtquick1-5.4..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.5..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtquick1/qtquick1-5.4..ebuild
b/dev-qt/qtquick1/qtquick1-5.4..ebuild
index 72a3958..a444109 100644
--- a/dev-qt/qtquick1/qtquick1-5.4..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4..ebuild
@@ -24,7 +24,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- =dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}:5[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index 72a3958..a444109 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -24,7 +24,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- =dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}:5[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index 72a3958..a444109 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -24,7 +24,7 @@ DEPEND=
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
designer? (
- =dev-qt/designer-${PV}:5[debug=]
+ ~dev-qt/designer-${PV}:5[debug=]
=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/, dev-qt/qtdiag/, dev-qt/qtdeclarative/, dev-qt/qtsvg/, ...
commit: ccb06ab2c52996583f1fe10aa68b0b0e2e4ab3ef
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat Nov 29 01:34:35 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Nov 29 01:34:35 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ccb06ab2
[Qt5] Bump to 5.4.0_rc
---
dev-qt/assistant/Manifest | 2 +-
.../{assistant-5.4.0_beta.ebuild = assistant-5.4.0_rc.ebuild} | 0
dev-qt/designer/Manifest| 2 +-
.../designer/{designer-5.4.0_beta.ebuild = designer-5.4.0_rc.ebuild} | 0
dev-qt/linguist-tools/Manifest | 2 +-
...{linguist-tools-5.4.0_beta.ebuild = linguist-tools-5.4.0_rc.ebuild} | 0
dev-qt/linguist/Manifest| 2 +-
.../linguist/{linguist-5.4.0_beta.ebuild = linguist-5.4.0_rc.ebuild} | 0
dev-qt/pixeltool/Manifest | 2 +-
.../{pixeltool-5.4.0_beta.ebuild = pixeltool-5.4.0_rc.ebuild} | 0
dev-qt/qdbus/Manifest | 2 +-
dev-qt/qdbus/{qdbus-5.4.0_beta.ebuild = qdbus-5.4.0_rc.ebuild} | 0
dev-qt/qdbusviewer/Manifest | 2 +-
.../{qdbusviewer-5.4.0_beta.ebuild = qdbusviewer-5.4.0_rc.ebuild} | 0
dev-qt/qdoc/Manifest| 2 +-
dev-qt/qdoc/{qdoc-5.4.0_beta.ebuild = qdoc-5.4.0_rc.ebuild}| 0
dev-qt/qtconcurrent/Manifest| 2 +-
.../{qtconcurrent-5.4.0_beta.ebuild = qtconcurrent-5.4.0_rc.ebuild}| 0
dev-qt/qtcore/Manifest | 2 +-
dev-qt/qtcore/{qtcore-5.4.0_beta.ebuild = qtcore-5.4.0_rc.ebuild} | 0
dev-qt/qtdbus/Manifest | 2 +-
dev-qt/qtdbus/{qtdbus-5.4.0_beta.ebuild = qtdbus-5.4.0_rc.ebuild} | 0
dev-qt/qtdeclarative/Manifest | 2 +-
.../{qtdeclarative-5.4.0_beta.ebuild = qtdeclarative-5.4.0_rc.ebuild} | 0
dev-qt/qtdiag/Manifest | 2 +-
dev-qt/qtdiag/{qtdiag-5.4.0_beta.ebuild = qtdiag-5.4.0_rc.ebuild} | 0
dev-qt/qtgraphicaleffects/Manifest | 2 +-
...icaleffects-5.4.0_beta.ebuild = qtgraphicaleffects-5.4.0_rc.ebuild} | 0
dev-qt/qtgui/Manifest | 2 +-
dev-qt/qtgui/{qtgui-5.4.0_beta.ebuild = qtgui-5.4.0_rc.ebuild} | 0
dev-qt/qthelp/Manifest | 2 +-
dev-qt/qthelp/{qthelp-5.4.0_beta.ebuild = qthelp-5.4.0_rc.ebuild} | 0
dev-qt/qtimageformats/Manifest | 2 +-
...{qtimageformats-5.4.0_beta.ebuild = qtimageformats-5.4.0_rc.ebuild} | 0
dev-qt/qtmultimedia/Manifest| 2 +-
.../{qtmultimedia-5.4.0_beta.ebuild = qtmultimedia-5.4.0_rc.ebuild}| 0
dev-qt/qtnetwork/Manifest | 2 +-
.../{qtnetwork-5.4.0_beta.ebuild = qtnetwork-5.4.0_rc.ebuild} | 0
dev-qt/qtopengl/Manifest| 2 +-
.../qtopengl/{qtopengl-5.4.0_beta.ebuild = qtopengl-5.4.0_rc.ebuild} | 0
dev-qt/qtpaths/Manifest | 2 +-
dev-qt/qtpaths/{qtpaths-5.4.0_beta.ebuild = qtpaths-5.4.0_rc.ebuild} | 0
dev-qt/qtpositioning/Manifest | 2 +-
.../{qtpositioning-5.4.0_beta.ebuild = qtpositioning-5.4.0_rc.ebuild} | 0
dev-qt/qtprintsupport/Manifest | 2 +-
...{qtprintsupport-5.4.0_beta.ebuild = qtprintsupport-5.4.0_rc.ebuild} | 0
dev-qt/qtquick1/Manifest| 2 +-
.../qtquick1/{qtquick1-5.4.0_beta.ebuild = qtquick1-5.4.0_rc.ebuild} | 0
dev-qt/qtquickcontrols/Manifest | 2 +-
...tquickcontrols-5.4.0_beta.ebuild = qtquickcontrols-5.4.0_rc.ebuild} | 0
dev-qt/qtscript/Manifest| 2 +-
.../qtscript/{qtscript-5.4.0_beta.ebuild = qtscript-5.4.0_rc.ebuild} | 0
dev-qt/qtsensors/Manifest | 2 +-
.../{qtsensors-5.4.0_beta.ebuild = qtsensors-5.4.0_rc.ebuild} | 0
dev-qt/qtserialport/Manifest| 2 +-
.../{qtserialport-5.4.0_beta.ebuild = qtserialport-5.4.0_rc.ebuild}| 0
dev-qt/qtsql/Manifest | 2 +-
dev-qt/qtsql/{qtsql-5.4.0_beta.ebuild = qtsql-5.4.0_rc.ebuild} | 0
dev-qt/qtsvg/Manifest | 2 +-
dev-qt/qtsvg/{qtsvg-5.4.0_beta.ebuild =
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/, dev-qt/designer/, dev-qt/assistant/, dev-qt/qtwebkit/
commit: 89f342721be920c796ac7323454746fd4f661c8f
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Sep 24 08:05:47 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Sep 24 08:05:47 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=89f34272
[dev-qt/qtwebkit] Remove widgets USE flag wrt bug #448178.
It can cause build failure and it's not currently possible to easily make
it properly optional.
---
dev-qt/assistant/assistant-5.3..ebuild| 2 +-
dev-qt/assistant/assistant-5.4.0_alpha.ebuild | 2 +-
dev-qt/assistant/assistant-5.4..ebuild| 2 +-
dev-qt/assistant/assistant-5..ebuild | 2 +-
dev-qt/designer/designer-5.3..ebuild | 2 +-
dev-qt/designer/designer-5.4.0_alpha.ebuild | 2 +-
dev-qt/designer/designer-5.4..ebuild | 2 +-
dev-qt/designer/designer-5..ebuild| 2 +-
dev-qt/qtquick1/qtquick1-5.3..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5..ebuild| 2 +-
dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 6 ++
dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild | 6 ++
dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 6 ++
dev-qt/qtwebkit/qtwebkit-5..ebuild| 6 ++
16 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.3..ebuild
b/dev-qt/assistant/assistant-5.3..ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.3..ebuild
+++ b/dev-qt/assistant/assistant-5.3..ebuild
@@ -26,7 +26,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
+++ b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
@@ -26,7 +26,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/assistant/assistant-5.4..ebuild
b/dev-qt/assistant/assistant-5.4..ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.4..ebuild
+++ b/dev-qt/assistant/assistant-5.4..ebuild
@@ -26,7 +26,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/assistant/assistant-5..ebuild
b/dev-qt/assistant/assistant-5..ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -26,7 +26,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/designer/designer-5.3..ebuild
b/dev-qt/designer/designer-5.3..ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.3..ebuild
+++ b/dev-qt/designer/designer-5.3..ebuild
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild
b/dev-qt/designer/designer-5.4.0_alpha.ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.4.0_alpha.ebuild
+++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=] )
RDEPEND=${DEPEND}
diff --git a/dev-qt/designer/designer-5.4..ebuild
b/dev-qt/designer/designer-5.4..ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.4..ebuild
+++ b/dev-qt/designer/designer-5.4..ebuild
@@ -25,7 +25,7 @@ DEPEND=
=dev-qt/qtprintsupport-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
=dev-qt/qtxml-${PV}:5[debug=]
- webkit? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/, dev-qt/qtmultimedia/, dev-qt/qtdeclarative/
commit: f26d082a1d9cbb0d0cbef84a046c6b7eecb1f047
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat Aug 16 12:02:30 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Aug 16 12:02:30 2014 +
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..ebuild | 3 ++-
dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild | 3 ++-
dev-qt/qtdeclarative/qtdeclarative-5..ebuild | 3 ++-
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.3.1.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.3..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4..ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5..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..ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.3..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3..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..ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4..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..ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5..ebuild
index c40af5a..be8fb9a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5..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..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..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..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
index d1e424f..0ab538d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4..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..ebuild
[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
commit: 71886358e60f88587443660751a154531db208c3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Jun 27 17:41:57 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun 27 17:41:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=71886358
[dev-qt/qtquick1] Add designer USE flag.
Package-Manager: portage-2.2.10
---
dev-qt/qtquick1/metadata.xml | 5 +++--
dev-qt/qtquick1/qtquick1-5.3.1.ebuild| 11 ---
dev-qt/qtquick1/qtquick1-5.3..ebuild | 11 ---
dev-qt/qtquick1/qtquick1-5..ebuild | 11 ---
4 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index 81b3a08..5bd6127 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -3,8 +3,9 @@
pkgmetadata
herdqt/herd
use
- flag name=webkitBuild the WebView import for QtQuick1 (requires
QtWebKit)/flag
- flag name=xmlBuild the XmlListModel import for QtQuick1 (requires
QtXmlPatterns)/flag
+ flag name=designerBuild plugin for
pkgdev-qt/designer/pkg/flag
+ flag name=webkitBuild the WebView import for QtQuick1
(requires QtWebKit)/flag
+ flag name=xmlBuild the XmlListModel import for QtQuick1
(requires QtXmlPatterns)/flag
/use
upstream
bugs-tohttps://bugreports.qt-project.org//bugs-to
diff --git a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
index c0bd8e1..83115ee 100644
--- a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
@@ -14,9 +14,7 @@ else
KEYWORDS=~amd64 ~x86
fi
-# FIXME: qdeclarativeview designer plugin is automagic
-
-IUSE=+opengl webkit +xml
+IUSE=designer +opengl webkit +xml
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +23,10 @@ DEPEND=
=dev-qt/qtscript-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
+ designer? (
+ =dev-qt/designer-${PV}:5[debug=]
+ =dev-qt/qtdeclarative-${PV}:5[debug=]
+ )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
xml? ( =dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -32,6 +34,9 @@ DEPEND=
RDEPEND=${DEPEND}
src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
qt_use_disable_mod opengl opengl \
src/imports/imports.pro \
tools/qml/qml.pri
diff --git a/dev-qt/qtquick1/qtquick1-5.3..ebuild
b/dev-qt/qtquick1/qtquick1-5.3..ebuild
index c0bd8e1..83115ee 100644
--- a/dev-qt/qtquick1/qtquick1-5.3..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.3..ebuild
@@ -14,9 +14,7 @@ else
KEYWORDS=~amd64 ~x86
fi
-# FIXME: qdeclarativeview designer plugin is automagic
-
-IUSE=+opengl webkit +xml
+IUSE=designer +opengl webkit +xml
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +23,10 @@ DEPEND=
=dev-qt/qtscript-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
+ designer? (
+ =dev-qt/designer-${PV}:5[debug=]
+ =dev-qt/qtdeclarative-${PV}:5[debug=]
+ )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
xml? ( =dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -32,6 +34,9 @@ DEPEND=
RDEPEND=${DEPEND}
src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
qt_use_disable_mod opengl opengl \
src/imports/imports.pro \
tools/qml/qml.pri
diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild
b/dev-qt/qtquick1/qtquick1-5..ebuild
index c0bd8e1..83115ee 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -14,9 +14,7 @@ else
KEYWORDS=~amd64 ~x86
fi
-# FIXME: qdeclarativeview designer plugin is automagic
-
-IUSE=+opengl webkit +xml
+IUSE=designer +opengl webkit +xml
DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +23,10 @@ DEPEND=
=dev-qt/qtscript-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=]
=dev-qt/qtwidgets-${PV}:5[debug=]
+ designer? (
+ =dev-qt/designer-${PV}:5[debug=]
+ =dev-qt/qtdeclarative-${PV}:5[debug=]
+ )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
xml? ( =dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -32,6 +34,9 @@ DEPEND=
RDEPEND=${DEPEND}
src_prepare() {
+ qt_use_disable_mod designer designer \
+ src/plugins/plugins.pro
+
qt_use_disable_mod opengl opengl \
src/imports/imports.pro \
tools/qml/qml.pri
