Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/
Date: Thu, 30 Jul 2020 10:11:28
Message-Id: 1596103858.fe23c52932a076948898c8135544392917da3d6d.asturm@gentoo
1 commit: fe23c52932a076948898c8135544392917da3d6d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 30 10:10:25 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 10:10:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe23c529
7
8 dev-qt/qtdeclarative: Drop 5.14.2-r3 and 5.15.0 (r0)
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../qtdeclarative/qtdeclarative-5.14.2-r3.ebuild | 59 ----------------------
14 dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild | 58 ---------------------
15 2 files changed, 117 deletions(-)
16
17 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
18 deleted file mode 100644
19 index e306c757443..00000000000
20 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
21 +++ /dev/null
22 @@ -1,59 +0,0 @@
23 -# Copyright 2009-2020 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=7
27 -PYTHON_COMPAT=( python3_{6,7,8} )
28 -inherit python-any-r1 qt5-build
29 -
30 -DESCRIPTION="The QML and Quick modules for the Qt5 framework"
31 -
32 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
33 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
34 -fi
35 -
36 -IUSE="gles2-only +jit localstorage vulkan +widgets"
37 -
38 -BDEPEND="${PYTHON_DEPS}"
39 -# qtgui[gles2-only=] is needed because of bug 504322
40 -DEPEND="
41 - ~dev-qt/qtcore-${PV}
42 - ~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
43 - ~dev-qt/qtnetwork-${PV}
44 - ~dev-qt/qttest-${PV}
45 - localstorage? ( ~dev-qt/qtsql-${PV} )
46 - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
47 -"
48 -RDEPEND="${DEPEND}
49 - !<dev-qt/qtquickcontrols-5.7:5
50 -"
51 -
52 -PATCHES=(
53 - "${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
54 - "${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
55 - "${FILESDIR}/${P}-QQuickMouseArea-stuck-in-pressed-state.patch" # QTBUG-74987
56 -)
57 -
58 -src_prepare() {
59 - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
60 -
61 - qt_use_disable_mod localstorage sql \
62 - src/imports/imports.pro
63 -
64 - qt_use_disable_mod widgets widgets \
65 - src/src.pro \
66 - src/qmltest/qmltest.pro \
67 - tests/auto/auto.pro \
68 - tools/tools.pro \
69 - tools/qmlscene/qmlscene.pro \
70 - tools/qml/qml.pro
71 -
72 - qt5-build_src_prepare
73 -}
74 -
75 -src_configure() {
76 - local myqmakeargs=(
77 - --
78 - -qml-debug
79 - )
80 - qt5-build_src_configure
81 -}
82
83 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild
84 deleted file mode 100644
85 index ffc90aff664..00000000000
86 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild
87 +++ /dev/null
88 @@ -1,58 +0,0 @@
89 -# Copyright 2009-2020 Gentoo Authors
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=7
93 -PYTHON_COMPAT=( python3_{6,7,8} )
94 -inherit python-any-r1 qt5-build
95 -
96 -DESCRIPTION="The QML and Quick modules for the Qt5 framework"
97 -
98 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
99 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
100 -fi
101 -
102 -IUSE="gles2-only +jit localstorage vulkan +widgets"
103 -
104 -BDEPEND="${PYTHON_DEPS}"
105 -# qtgui[gles2-only=] is needed because of bug 504322
106 -DEPEND="
107 - ~dev-qt/qtcore-${PV}
108 - ~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
109 - ~dev-qt/qtnetwork-${PV}
110 - ~dev-qt/qttest-${PV}
111 - localstorage? ( ~dev-qt/qtsql-${PV} )
112 - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
113 -"
114 -RDEPEND="${DEPEND}
115 - !<dev-qt/qtquickcontrols-5.7:5
116 -"
117 -
118 -PATCHES=(
119 - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
120 - "${FILESDIR}/${PN}-5.14.2-fix-subpixel-positioned-text.patch" # QTBUG-49646
121 -)
122 -
123 -src_prepare() {
124 - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
125 -
126 - qt_use_disable_mod localstorage sql \
127 - src/imports/imports.pro
128 -
129 - qt_use_disable_mod widgets widgets \
130 - src/src.pro \
131 - src/qmltest/qmltest.pro \
132 - tests/auto/auto.pro \
133 - tools/tools.pro \
134 - tools/qmlscene/qmlscene.pro \
135 - tools/qml/qml.pro
136 -
137 - qt5-build_src_prepare
138 -}
139 -
140 -src_configure() {
141 - local myqmakeargs=(
142 - --
143 - -qml-debug
144 - )
145 - qt5-build_src_configure
146 -}