Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/
Date: Sat, 05 Nov 2022 16:39:20
Message-Id: 1667639246.2e6fbf1f68927adf5712b9e4c71b7e6144312ddb.asturm@gentoo
1 commit: 2e6fbf1f68927adf5712b9e4c71b7e6144312ddb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 5 09:07:26 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 5 09:07:26 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2e6fbf1f
7
8 dev-qt/qtbase: drop 6.4.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-qt/qtbase/Manifest | 1 -
13 dev-qt/qtbase/qtbase-6.4.0.ebuild | 185 --------------------------------------
14 2 files changed, 186 deletions(-)
15
16 diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
17 deleted file mode 100644
18 index c57d973a..00000000
19 --- a/dev-qt/qtbase/Manifest
20 +++ /dev/null
21 @@ -1 +0,0 @@
22 -DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3
23
24 diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild
25 deleted file mode 100644
26 index 7139d94a..00000000
27 --- a/dev-qt/qtbase/qtbase-6.4.0.ebuild
28 +++ /dev/null
29 @@ -1,185 +0,0 @@
30 -# Copyright 2021-2022 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=8
34 -
35 -inherit qt6-build
36 -
37 -DESCRIPTION="Cross-platform application development framework"
38 -
39 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
40 - KEYWORDS="~amd64"
41 -fi
42 -
43 -# Qt Modules
44 -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
45 -REQUIRED_USE="
46 - opengl? ( gui )
47 - widgets? ( gui )
48 - X? ( || ( evdev libinput ) )
49 -"
50 -
51 -QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
52 -QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
53 -QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
54 -IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
55 -# QtPrintSupport = QtGui + QtWidgets enabled.
56 -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
57 -REQUIRED_USE+="
58 - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
59 - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
60 - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
61 - accessibility? ( dbus X )
62 - cups? ( gui widgets )
63 - eglfs? ( egl )
64 - gtk? ( widgets )
65 - gui? ( || ( eglfs X ) || ( libinput X ) )
66 - libinput? ( udev )
67 - sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
68 - vnc? ( gui )
69 - X? ( gles2-only? ( egl ) )
70 -"
71 -
72 -# TODO:
73 -# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
74 -# qtnetwork: connman, networkmanager
75 -DEPEND="
76 - app-crypt/libb2
77 - dev-libs/double-conversion:=
78 - dev-libs/glib:2
79 - dev-libs/libpcre2:=[pcre16,unicode]
80 - dev-util/gtk-update-icon-cache
81 - media-libs/fontconfig
82 - >=media-libs/freetype-2.6.1:2
83 - >=media-libs/harfbuzz-1.6.0:=
84 - media-libs/tiff:0
85 - >=sys-apps/dbus-1.4.20
86 - sys-libs/zlib:=
87 - brotli? ( app-arch/brotli:= )
88 - evdev? ( sys-libs/mtdev )
89 - freetds? ( dev-db/freetds )
90 - gles2-only? ( media-libs/libglvnd )
91 - !gles2-only? ( media-libs/libglvnd[X] )
92 - gssapi? ( virtual/krb5 )
93 - gtk? (
94 - x11-libs/gtk+:3
95 - x11-libs/libX11
96 - x11-libs/pango
97 - )
98 - gui? ( media-libs/libpng:0= )
99 - icu? ( dev-libs/icu:= )
100 - !icu? ( virtual/libiconv )
101 - jpeg? ( media-libs/libjpeg-turbo:= )
102 - libinput? (
103 - dev-libs/libinput:=
104 - >=x11-libs/libxkbcommon-0.5.0
105 - )
106 - libproxy? ( net-libs/libproxy )
107 - mysql? ( dev-db/mysql-connector-c:= )
108 - oci8? ( dev-db/oracle-instantclient:=[sdk] )
109 - odbc? ( dev-db/unixODBC )
110 - postgres? ( dev-db/postgresql:* )
111 - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
112 - sqlite? ( dev-db/sqlite:3 )
113 - ssl? ( dev-libs/openssl:= )
114 - systemd? ( sys-apps/systemd:= )
115 - tslib? ( >=x11-libs/tslib-1.21 )
116 - udev? ( virtual/libudev:= )
117 - vulkan? ( dev-util/vulkan-headers )
118 - X? (
119 - x11-libs/libdrm
120 - x11-libs/libICE
121 - x11-libs/libSM
122 - x11-libs/libX11
123 - >=x11-libs/libxcb-1.12:=
124 - >=x11-libs/libxkbcommon-0.5.0[X]
125 - x11-libs/xcb-util-image
126 - x11-libs/xcb-util-keysyms
127 - x11-libs/xcb-util-renderutil
128 - x11-libs/xcb-util-wm
129 - )
130 - zstd? ( app-arch/zstd:= )
131 -"
132 -RDEPEND="${DEPEND}"
133 -
134 -src_configure() {
135 - local mycmakeargs=(
136 - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
137 - -DINSTALL_BINDIR=${QT6_BINDIR}
138 - -DINSTALL_DATADIR=${QT6_DATADIR}
139 - -DINSTALL_DOCDIR=${QT6_DOCDIR}
140 - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
141 - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
142 - -DINSTALL_LIBDIR=${QT6_LIBDIR}
143 - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
144 - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
145 - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
146 - -DINSTALL_QMLDIR=${QT6_QMLDIR}
147 - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
148 - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
149 - -DQT_FEATURE_androiddeployqt=OFF
150 - $(qt_feature concurrent)
151 - $(qt_feature dbus)
152 - $(qt_feature gui)
153 - $(qt_feature gui testlib)
154 - $(qt_feature icu)
155 - $(qt_feature network)
156 - $(qt_feature sql)
157 - $(qt_feature systemd journald)
158 - $(qt_feature udev libudev)
159 - $(qt_feature xml)
160 - $(qt_feature zstd)
161 - )
162 - use gui && mycmakeargs+=(
163 - $(qt_feature accessibility accessibility_atspi_bridge)
164 - $(qt_feature egl)
165 - $(qt_feature eglfs eglfs_egldevice)
166 - $(qt_feature eglfs eglfs_gbm)
167 - $(qt_feature evdev)
168 - $(qt_feature evdev mtdev)
169 - -DQT_FEATURE_gif=ON
170 - $(qt_feature jpeg)
171 - $(qt_feature opengl)
172 - $(qt_feature gles2-only opengles2)
173 - $(qt_feature libinput)
174 - $(qt_feature tslib)
175 - $(qt_feature tuio tuiotouch)
176 - $(qt_feature vulkan)
177 - $(qt_feature widgets)
178 - $(qt_feature X xcb)
179 - $(qt_feature X xcb_xlib)
180 - )
181 - use widgets && mycmakeargs+=(
182 - $(qt_feature cups)
183 - $(qt_feature gtk gtk3)
184 - )
185 - if use libinput || use X; then
186 - mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
187 - fi
188 - use network && mycmakeargs+=(
189 - $(qt_feature brotli)
190 - $(qt_feature gssapi)
191 - $(qt_feature libproxy)
192 - $(qt_feature sctp)
193 - $(qt_feature ssl openssl)
194 - $(qt_feature vnc)
195 - )
196 - use sql && mycmakeargs+=(
197 - $(qt_feature freetds sql_tds)
198 - $(qt_feature mysql sql_mysql)
199 - $(qt_feature oci8 sql_oci)
200 - $(qt_feature odbc sql_odbc)
201 - $(qt_feature postgres sql_psql)
202 - $(qt_feature sqlite sql_sqlite)
203 - $(qt_feature sqlite system_sqlite)
204 - )
205 -
206 - qt6-build_src_configure
207 -}
208 -
209 -src_install() {
210 - qt6-build_src_install
211 -
212 - # https://bugs.gentoo.org/863395
213 - dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
214 -}