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/qtgui/
Date: Thu, 20 Jan 2022 13:26:49
Message-Id: 1642685060.81965801a524212c886ad010409e569376c84b27.asturm@gentoo
1 commit: 81965801a524212c886ad010409e569376c84b27
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 12:17:32 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 13:24:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81965801
7
8 dev-qt/qtgui: Drop 5.15.2-r15
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtgui/Manifest | 1 -
14 dev-qt/qtgui/qtgui-5.15.2-r15.ebuild | 184 -----------------------------------
15 2 files changed, 185 deletions(-)
16
17 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
18 index 4f0dd80dbe1f..a795b7ed2784 100644
19 --- a/dev-qt/qtgui/Manifest
20 +++ b/dev-qt/qtgui/Manifest
21 @@ -1,2 +1 @@
22 DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
23 -DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
24
25 diff --git a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
26 deleted file mode 100644
27 index 5b9c23c319a7..000000000000
28 --- a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
29 +++ /dev/null
30 @@ -1,184 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=8
35 -
36 -KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
37 -QT5_MODULE="qtbase"
38 -inherit qt5-build
39 -
40 -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
41 -SLOT=5/${QT5_PV} # bug 707658
42 -
43 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
44 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
45 -fi
46 -
47 -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
48 - +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
49 -REQUIRED_USE="
50 - || ( eglfs linuxfb vnc X )
51 - accessibility? ( dbus X )
52 - eglfs? ( egl )
53 - ibus? ( dbus )
54 - libinput? ( udev )
55 - X? ( gles2-only? ( egl ) )
56 -"
57 -
58 -RDEPEND="
59 - dev-libs/glib:2
60 - =dev-qt/qtcore-${QT5_PV}*:5=
61 - dev-util/gtk-update-icon-cache
62 - media-libs/fontconfig
63 - media-libs/freetype:2
64 - media-libs/harfbuzz:=
65 - sys-libs/zlib:=
66 - dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
67 - eglfs? (
68 - media-libs/mesa[gbm(+)]
69 - x11-libs/libdrm
70 - )
71 - evdev? ( sys-libs/mtdev )
72 - jpeg? ( virtual/jpeg )
73 - gles2-only? ( media-libs/libglvnd )
74 - !gles2-only? ( media-libs/libglvnd[X] )
75 - libinput? (
76 - dev-libs/libinput:=
77 - x11-libs/libxkbcommon
78 - )
79 - png? ( media-libs/libpng:= )
80 - tslib? ( >=x11-libs/tslib-1.21 )
81 - tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
82 - udev? ( virtual/libudev:= )
83 - vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
84 - vulkan? ( dev-util/vulkan-headers )
85 - X? (
86 - x11-libs/libICE
87 - x11-libs/libSM
88 - x11-libs/libX11
89 - x11-libs/libxcb:=[xkb]
90 - x11-libs/libxkbcommon[X]
91 - x11-libs/xcb-util-image
92 - x11-libs/xcb-util-keysyms
93 - x11-libs/xcb-util-renderutil
94 - x11-libs/xcb-util-wm
95 - )
96 -"
97 -DEPEND="${RDEPEND}
98 - evdev? ( sys-kernel/linux-headers )
99 - linuxfb? ( sys-kernel/linux-headers )
100 - udev? ( sys-kernel/linux-headers )
101 -"
102 -PDEPEND="
103 - ibus? ( app-i18n/ibus )
104 - wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
105 -"
106 -
107 -QT5_TARGET_SUBDIRS=(
108 - src/tools/qvkgen
109 - src/gui
110 - src/openglextensions
111 - src/platformheaders
112 - src/platformsupport
113 - src/plugins/generic
114 - src/plugins/imageformats
115 - src/plugins/platforms
116 - src/plugins/platforminputcontexts
117 -)
118 -
119 -QT5_GENTOO_CONFIG=(
120 - accessibility:accessibility-atspi-bridge
121 - egl:egl:
122 - eglfs:eglfs:
123 - eglfs:eglfs_egldevice:
124 - eglfs:eglfs_gbm:
125 - evdev:evdev:
126 - evdev:mtdev:
127 - :fontconfig:
128 - :system-freetype:FREETYPE
129 - !:no-freetype:
130 - !gif:no-gif:
131 - gles2-only::OPENGL_ES
132 - gles2-only:opengles2:OPENGL_ES_2
133 - !:no-gui:
134 - :system-harfbuzz:
135 - !:no-harfbuzz:
136 - jpeg:system-jpeg:IMAGEFORMAT_JPEG
137 - !jpeg:no-jpeg:
138 - libinput
139 - libinput:xkbcommon:
140 - :opengl
141 - png:png:
142 - png:system-png:IMAGEFORMAT_PNG
143 - !png:no-png:
144 - tslib:tslib:
145 - udev:libudev:
146 - vulkan:vulkan:
147 - X:xcb:
148 - X:xcb-glx:
149 - X:xcb-plugin:
150 - X:xcb-render:
151 - X:xcb-sm:
152 - X:xcb-xlib:
153 - X:xcb-xinput:
154 -)
155 -
156 -QT5_GENTOO_PRIVATE_CONFIG=(
157 - :gui
158 -)
159 -
160 -PATCHES=(
161 - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
162 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
163 -)
164 -
165 -src_prepare() {
166 - # don't add -O3 to CXXFLAGS, bug 549140
167 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
168 -
169 - # egl_x11 is activated when both egl and X are enabled
170 - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
171 -
172 - qt_use_disable_config dbus dbus \
173 - src/platformsupport/themes/genericunix/genericunix.pri
174 -
175 - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
176 -
177 - qt_use_disable_mod ibus dbus \
178 - src/plugins/platforminputcontexts/platforminputcontexts.pro
179 -
180 - use vnc || sed -i -e '/SUBDIRS += vnc/d' \
181 - src/plugins/platforms/platforms.pro || die
182 -
183 - qt5-build_src_prepare
184 -}
185 -
186 -src_configure() {
187 - local myconf=(
188 - $(usev dbus -dbus-linked)
189 - $(qt_use egl)
190 - $(qt_use eglfs)
191 - $(usev eglfs '-gbm -kms')
192 - $(qt_use evdev)
193 - $(qt_use evdev mtdev)
194 - -fontconfig
195 - -system-freetype
196 - $(usev !gif -no-gif)
197 - -gui
198 - -system-harfbuzz
199 - $(qt_use jpeg libjpeg system)
200 - $(qt_use libinput)
201 - $(qt_use linuxfb)
202 - -opengl $(usex gles2-only es2 desktop)
203 - $(qt_use png libpng system)
204 - $(qt_use tslib)
205 - $(qt_use udev libudev)
206 - $(qt_use vulkan)
207 - $(qt_use X xcb)
208 - $(usev X '-xcb-xlib')
209 - )
210 - if use libinput || use X; then
211 - myconf+=( -xkbcommon )
212 - fi
213 - qt5-build_src_configure
214 -}