From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA5AC138334 for ; Sat, 16 Mar 2019 19:09:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A783E08EF; Sat, 16 Mar 2019 19:09:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBF43E08C3 for ; Sat, 16 Mar 2019 19:09:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51A93335C9F for ; Sat, 16 Mar 2019 19:09:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2E4E559 for ; Sat, 16 Mar 2019 19:09:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1552761273.57d05b694964d6919fc9bf8dc236271b49608087.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdeclarative/metadata.xml dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 57d05b694964d6919fc9bf8dc236271b49608087 X-VCS-Branch: master Date: Sat, 16 Mar 2019 19:09:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54d3cf01-6681-45b9-8703-5c43cf306d38 X-Archives-Hash: 66abe047f7c1585a5f6253765eab027c commit: 57d05b694964d6919fc9bf8dc236271b49608087 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 12 00:03:43 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 16 18:34:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=57d05b69 dev-qt/qtdeclarative: Drop USE xml xmllistmodel was moved to qtdeclarative in upstream commit 0477a057fd02050fd330760bf046f5e0e91a9331. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtdeclarative/metadata.xml | 1 - dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild | 13 ++----------- dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild | 11 +---------- dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 13 ++----------- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 6333b589..cffb0c60 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -9,7 +9,6 @@ Use GLES 2.0 or later instead of full OpenGL Build the LocalStorage import for QtQuick (requires QtSql) Enable QtWidgets support - Build the XmlListModel import for QtQuick (requires QtXmlPatterns) https://bugreports.qt.io/ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild index 8876b08e..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} @@ -47,11 +43,6 @@ src_prepare() { tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild index 31657b80..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} @@ -47,11 +43,6 @@ src_prepare() { tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index 8876b08e..b3c3411f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" fi -IUSE="gles2 +jit localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets" # qtgui[gles2=] is needed because of bug 504322 COMMON_DEPEND=" @@ -21,10 +21,6 @@ COMMON_DEPEND=" ~dev-qt/qttest-${PV} localstorage? ( ~dev-qt/qtsql-${PV} ) widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} @@ -47,11 +43,6 @@ src_prepare() { tools/qmlscene/qmlscene.pro \ tools/qml/qml.pro - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - qt5-build_src_prepare }