[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     4944890e6cf0c6cb506a355028c115b7b167f6db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 21:48:13 2020 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 06:08:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4944890e

dev-qt/qtbase: Add initial Qt6 dev branch ebuild

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/metadata.xml         |  39 +++++++
 dev-qt/qtbase/qtbase-6.9999.ebuild | 224 +++++++++++++++++++++++++++++++++++++
 2 files changed, 263 insertions(+)

diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
new file mode 100644
index 00000000..b33a37e9
--- /dev/null
+++ b/dev-qt/qtbase/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="concurrent">Build Qt6Concurrent module</flag>
+		<flag name="dbus">Build Qt6DBus module</flag>
+		<flag name="egl">Enable EGL integration</flag>
+		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
+		<flag name="evdev">Enable support for input devices via evdev</flag>
+		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
+		<flag name="gtk">Build the GTK platform theme plugin</flag>
+		<flag name="gui">Build Qt6Gui module</flag>
+		<flag name="ico">Enable ico image support</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag>
+		<flag name="network">Build Qt6Network module</flag>
+		<flag name="sql">Build Qt6Sql module</flag>
+		<flag name="systemd">Enable native journald logging support</flag>
+		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
+		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
+		<flag name="widgets">Build Qt6Widgets module</flag>
+		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
+		<flag name="xml">Build Qt6Xml module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
new file mode 100644
index 00000000..c4784145
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="dev"
+	EGIT_REPO_URI=( "https://code.qt.io/qt/${PN}.git" )
+	inherit git-r3
+else
+	MY_P=everywhere-src-${PV/_/-}
+	SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/${MY_P}
+fi
+
+inherit cmake
+
+DESCRIPTION="Cross-platform application development framework"
+HOMEPAGE="https://www.qt.io/"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=6/$(ver_cut 1-2)
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+REQUIRED_USE="opengl? ( gui ) widgets? ( gui )"
+
+QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+# moved vnc logically to QtNetwork as that is upstream condition for it
+REQUIRED_USE+="
+	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+	accessibility? ( dbus X )
+	cups? ( gui widgets )
+	eglfs? ( egl )
+	gtk? ( widgets )
+	gui? ( || ( eglfs X ) || ( libinput X ) )
+	libinput? ( udev )
+	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	app-arch/zstd:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	>=dev-util/cmake-3.17.0
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	media-libs/tiff:0
+	>=sys-apps/dbus-1.4.20
+	sys-libs/zlib:=
+	virtual/opengl
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	freetds? ( dev-db/freetds )
+	gssapi? ( virtual/krb5 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	gui? ( media-libs/libpng:0= )
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	libproxy? ( net-libs/libproxy )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	udev? ( virtual/libudev:= )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
+
+# @FUNCTION: qt_feature
+# @USAGE: <flag> [feature]
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+qt_feature() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+	echo "-DQT_FEATURE_${2:-$1}=$(usex $1 ON OFF)"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# TODO: fails without QtGui
+	sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \
+		-i src/tools/CMakeLists.txt || die
+}
+
+src_configure() {
+	QT6_PREFIX=${EPREFIX}/usr
+	QT6_HEADERDIR=${QT6_PREFIX}/include/qt6
+	QT6_LIBDIR=${QT6_PREFIX}/$(get_libdir)
+	QT6_ARCHDATADIR=${QT6_PREFIX}/$(get_libdir)/qt6
+	QT6_BINDIR=${QT6_ARCHDATADIR}/bin
+	QT6_PLUGINDIR=${QT6_ARCHDATADIR}/plugins
+	QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec
+	QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports
+	QT6_QMLDIR=${QT6_ARCHDATADIR}/qml
+	QT6_DATADIR=${QT6_PREFIX}/share/qt6
+	QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc
+	QT6_TRANSLATIONDIR=${QT6_DATADIR}/translations
+	QT6_EXAMPLESDIR=${QT6_DATADIR}/examples
+	QT6_TESTSDIR=${QT6_DATADIR}/tests
+	QT6_SYSCONFDIR=${EPREFIX}/etc/xdg
+
+	local mycmakeargs=(
+		-DINSTALL_BINDIR=${QT6_BINDIR}
+# 		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+# TODO: breaks cmake macro:
+# CMake Error at cmake/QtBuild.cmake:1997 (file):
+#   file STRINGS file
+#   "${WORKDIR}/qtbase-6.9999_build/include/qt6/QtOpenGLWidgets/headers.pri"
+#   cannot be read.
+# Call Stack (most recent call first):
+#   cmake/QtBuild.cmake:2503 (qt_read_headers_pri)
+#   src/openglwidgets/CMakeLists.txt:7 (qt_add_module)
+		-DINSTALL_LIBDIR=${QT6_LIBDIR}
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_QMLDIR=${QT6_QMLDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DQT_FEATURE_zstd=ON
+		$(qt_feature concurrent)
+		$(qt_feature dbus)
+		$(qt_feature gui)
+		$(qt_feature icu)
+		$(qt_feature network)
+		$(qt_feature sql)
+		$(qt_feature systemd journald)
+		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
+		$(qt_feature udev libudev)
+		$(qt_feature xml)
+	)
+	use icu || mycmakeargs+=( -DQT_FEATURE_iconv=ON )
+	use gui && mycmakeargs+=(
+		$(qt_feature accessibility accessibility_atspi_bridge)
+		$(qt_feature egl)
+		$(qt_feature eglfs eglfs_egldevice)
+		$(qt_feature eglfs eglfs_gbm)
+		$(qt_feature evdev)
+		$(qt_feature evdev mtdev)
+		$(qt_feature gif)
+		$(qt_feature jpeg)
+		$(qt_feature opengl)
+		$(qt_feature gles2-only opengles2)
+		$(qt_feature libinput)
+		$(qt_feature tslib)
+		$(qt_feature tuio tuiotouch)
+		$(qt_feature vulkan)
+		$(qt_feature widgets)
+		$(qt_feature X xcb)
+		$(qt_feature X xcb_xlib)
+	)
+	use widgets && mycmakeargs+=(
+		$(qt_feature cups)
+		$(qt_feature gtk gtk3)
+	)
+	if use libinput || use X; then
+		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+	fi
+	use network && mycmakeargs+=(
+		$(qt_feature gssapi)
+		$(qt_feature libproxy)
+		$(qt_feature sctp)
+		$(qt_feature ssl openssl)
+		$(qt_feature vnc)
+	)
+	use sql && mycmakeargs+=(
+		$(qt_feature freetds sql_tds)
+		$(qt_feature mysql sql_mysql)
+		$(qt_feature oci8 sql_oci)
+		$(qt_feature odbc sql_odbc)
+		$(qt_feature postgres sql_psql)
+		$(qt_feature sqlite sql_sqlite)
+		$(qt_feature sqlite system_sqlite)
+	)
+	cmake_src_configure
+}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     a849f9164fa03c5dbc6be5bf04d95cf189f522a0
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 21:10:56 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 06:08:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a849f916

dev-qt/qtbase: update EAPI and remove things already in the eclass

Also update dependencies a little.

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.9999.ebuild | 86 ++++++++++----------------------------
 1 file changed, 23 insertions(+), 63 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c4784145..c0867b42 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -1,31 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="dev"
-	EGIT_REPO_URI=( "https://code.qt.io/qt/${PN}.git" )
-	inherit git-r3
-else
-	MY_P=everywhere-src-${PV/_/-}
-	SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit cmake
+inherit qt6-build
 
 DESCRIPTION="Cross-platform application development framework"
-HOMEPAGE="https://www.qt.io/"
 
-LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=6/$(ver_cut 1-2)
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
 # Qt Modules
 IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
-REQUIRED_USE="opengl? ( gui ) widgets? ( gui )"
+REQUIRED_USE="
+	opengl? ( gui ) widgets? ( gui )
+	X? ( || ( evdev libinput ) )
+"
 
-QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg libinput tslib tuio vulkan +X"
+QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
 QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
 QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
@@ -49,13 +42,14 @@ REQUIRED_USE+="
 # TODO:
 # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
 # qtnetwork: connman, networkmanager
-BDEPEND="virtual/pkgconfig"
 DEPEND="
+	app-arch/brotli:=
+	app-arch/libarchive[zstd]
 	app-arch/zstd:=
+	app-crypt/libb2
 	dev-libs/double-conversion:=
 	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	>=dev-util/cmake-3.17.0
+	dev-libs/libpcre2:=[pcre16,unicode]
 	dev-util/gtk-update-icon-cache
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
@@ -65,8 +59,9 @@ DEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
+	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
+	gles2-only? ( media-libs/mesa[gles2] )
 	gssapi? ( virtual/krb5 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -94,6 +89,7 @@ DEPEND="
 	udev? ( virtual/libudev:= )
 	vulkan? ( dev-util/vulkan-headers )
 	X? (
+		x11-libs/libdrm
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -105,21 +101,10 @@ DEPEND="
 		x11-libs/xcb-util-wm
 	)
 "
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-# @FUNCTION: qt_feature
-# @USAGE: <flag> [feature]
-# @DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-qt_feature() {
-	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
-	echo "-DQT_FEATURE_${2:-$1}=$(usex $1 ON OFF)"
-}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake_src_prepare
+	qt6-build_src_prepare
 
 	# TODO: fails without QtGui
 	sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \
@@ -127,33 +112,9 @@ src_prepare() {
 }
 
 src_configure() {
-	QT6_PREFIX=${EPREFIX}/usr
-	QT6_HEADERDIR=${QT6_PREFIX}/include/qt6
-	QT6_LIBDIR=${QT6_PREFIX}/$(get_libdir)
-	QT6_ARCHDATADIR=${QT6_PREFIX}/$(get_libdir)/qt6
-	QT6_BINDIR=${QT6_ARCHDATADIR}/bin
-	QT6_PLUGINDIR=${QT6_ARCHDATADIR}/plugins
-	QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec
-	QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports
-	QT6_QMLDIR=${QT6_ARCHDATADIR}/qml
-	QT6_DATADIR=${QT6_PREFIX}/share/qt6
-	QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc
-	QT6_TRANSLATIONDIR=${QT6_DATADIR}/translations
-	QT6_EXAMPLESDIR=${QT6_DATADIR}/examples
-	QT6_TESTSDIR=${QT6_DATADIR}/tests
-	QT6_SYSCONFDIR=${EPREFIX}/etc/xdg
-
 	local mycmakeargs=(
 		-DINSTALL_BINDIR=${QT6_BINDIR}
-# 		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
-# TODO: breaks cmake macro:
-# CMake Error at cmake/QtBuild.cmake:1997 (file):
-#   file STRINGS file
-#   "${WORKDIR}/qtbase-6.9999_build/include/qt6/QtOpenGLWidgets/headers.pri"
-#   cannot be read.
-# Call Stack (most recent call first):
-#   cmake/QtBuild.cmake:2503 (qt_read_headers_pri)
-#   src/openglwidgets/CMakeLists.txt:7 (qt_add_module)
+		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
 		-DINSTALL_LIBDIR=${QT6_LIBDIR}
 		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
 		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
@@ -177,7 +138,6 @@ src_configure() {
 		$(qt_feature udev libudev)
 		$(qt_feature xml)
 	)
-	use icu || mycmakeargs+=( -DQT_FEATURE_iconv=ON )
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
 		$(qt_feature egl)
@@ -220,5 +180,5 @@ src_configure() {
 		$(qt_feature sqlite sql_sqlite)
 		$(qt_feature sqlite system_sqlite)
 	)
-	cmake_src_configure
+	qt6-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     07d2091e4df014f600972c225d8aebc149657855
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 14:33:51 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 14:34:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=07d2091e

dev-qt/qtbase: remove disable androiddeployqt from src_prepare()

There's a switch for it now, and this currently breaks configure.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.9999.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c0867b42..d6907aa7 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -103,14 +103,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	qt6-build_src_prepare
-
-	# TODO: fails without QtGui
-	sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \
-		-i src/tools/CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_BINDIR=${QT6_BINDIR}
@@ -126,6 +118,7 @@ src_configure() {
 		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
 		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
 		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DQT_FEATURE_androiddeployqt=OFF
 		-DQT_FEATURE_zstd=ON
 		$(qt_feature concurrent)
 		$(qt_feature dbus)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     82ee335fd0fd43239d94c1f7e3d63ce1f195bdd9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 16:33:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 17:15:58 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=82ee335f

dev-qt/qtbase: Gentoo's GL impl. switched to media-libs/libglvnd

media-libs/libglvnd provides both libGL.so and opengl.pc as well
as libEGL.so and egl.pc, libGLESv2.so and glesv2.pc.

Follow-up to 02cb6e27f322666f6b466a5c8f070a2e1afae0fa and
eb80f984b8509d49b6f18ea1b97038bd442a4b8c but for Qt6.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.2.2.ebuild  | 4 ++--
 dev-qt/qtbase/qtbase-6.9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.2.2.ebuild b/dev-qt/qtbase/qtbase-6.2.2.ebuild
index c0867b42..5841c484 100644
--- a/dev-qt/qtbase/qtbase-6.2.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.2.2.ebuild
@@ -58,10 +58,10 @@ DEPEND="
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
 	virtual/opengl
-	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/mesa[gles2] )
+	gles2-only? ( media-libs/libglvnd )
+	!gles2-only? ( media-libs/libglvnd[X] )
 	gssapi? ( virtual/krb5 )
 	gtk? (
 		x11-libs/gtk+:3

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index d6907aa7..3cd3f532 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -58,10 +58,10 @@ DEPEND="
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
 	virtual/opengl
-	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/mesa[gles2] )
+	gles2-only? ( media-libs/libglvnd )
+	!gles2-only? ( media-libs/libglvnd[X] )
 	gssapi? ( virtual/krb5 )
 	gtk? (
 		x11-libs/gtk+:3

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     5e0a186d76d06800b6df7eb59b3dc3b30167bb56
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 13:39:46 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun May  8 13:49:02 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5e0a186d

dev-qt/qtbase: update jpeg dependency

The virtual has been declared deprecated.

0. https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607a79943672

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.0.ebuild    | 2 +-
 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 4 ++--
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild b/dev-qt/qtbase/qtbase-6.3.0.ebuild
index 704ab262..485c0d24 100644
--- a/dev-qt/qtbase/qtbase-6.3.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild
@@ -71,7 +71,7 @@ DEPEND="
 	gui? ( media-libs/libpng:0= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	libinput? (
 		dev-libs/libinput:=
 		>=x11-libs/libxkbcommon-0.5.0

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
index 3cd3f532..485c0d24 100644
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -71,7 +71,7 @@ DEPEND="
 	gui? ( media-libs/libpng:0= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	libinput? (
 		dev-libs/libinput:=
 		>=x11-libs/libxkbcommon-0.5.0

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 3cd3f532..485c0d24 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -71,7 +71,7 @@ DEPEND="
 	gui? ( media-libs/libpng:0= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	libinput? (
 		dev-libs/libinput:=
 		>=x11-libs/libxkbcommon-0.5.0

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     11be163d9a5024c49ab92ab3fe9baeab35221009
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 09:03:28 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed May 25 16:20:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=11be163d

dev-qt/qtbase: remove USE="xml" from 6.3.*

Configure fails with USE="-xml" without additional changes, though
it looks like it has been removed from bootstrap in the upstream
dev branch (6.9999), so perhaps it will make a comeback very soon
(or we can backport the required changes + what ever else is needed).

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.0.ebuild    | 4 ++--
 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild b/dev-qt/qtbase/qtbase-6.3.0.ebuild
index 485c0d24..65c14f48 100644
--- a/dev-qt/qtbase/qtbase-6.3.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild
@@ -12,7 +12,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 # Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
 REQUIRED_USE="
 	opengl? ( gui ) widgets? ( gui )
 	X? ( || ( evdev libinput ) )
@@ -129,7 +130,6 @@ src_configure() {
 		$(qt_feature systemd journald)
 		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
 		$(qt_feature udev libudev)
-		$(qt_feature xml)
 	)
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
index 485c0d24..65c14f48 100644
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
@@ -12,7 +12,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 # Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
 REQUIRED_USE="
 	opengl? ( gui ) widgets? ( gui )
 	X? ( || ( evdev libinput ) )
@@ -129,7 +130,6 @@ src_configure() {
 		$(qt_feature systemd journald)
 		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
 		$(qt_feature udev libudev)
-		$(qt_feature xml)
 	)
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     d7f1589d6ed6ac7f02af7268df53ac5d9654a71e
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 14:17:21 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:02:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d7f1589d

dev-qt/qtbase: depend on USE="gui" if USE="vnc"

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.0.ebuild    | 3 ++-
 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 3 ++-
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild b/dev-qt/qtbase/qtbase-6.3.0.ebuild
index a8e1f084..36931e0e 100644
--- a/dev-qt/qtbase/qtbase-6.3.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild
@@ -26,7 +26,6 @@ QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
 # ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-# moved vnc logically to QtNetwork as that is upstream condition for it
 REQUIRED_USE+="
 	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
 	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
@@ -38,6 +37,7 @@ REQUIRED_USE+="
 	gui? ( || ( eglfs X ) || ( libinput X ) )
 	libinput? ( udev )
 	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	vnc? ( gui )
 	X? ( gles2-only? ( egl ) )
 "
 
@@ -173,5 +173,6 @@ src_configure() {
 		$(qt_feature sqlite sql_sqlite)
 		$(qt_feature sqlite system_sqlite)
 	)
+
 	qt6-build_src_configure
 }

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
index a8e1f084..36931e0e 100644
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
@@ -26,7 +26,6 @@ QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
 # ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-# moved vnc logically to QtNetwork as that is upstream condition for it
 REQUIRED_USE+="
 	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
 	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
@@ -38,6 +37,7 @@ REQUIRED_USE+="
 	gui? ( || ( eglfs X ) || ( libinput X ) )
 	libinput? ( udev )
 	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	vnc? ( gui )
 	X? ( gles2-only? ( egl ) )
 "
 
@@ -173,5 +173,6 @@ src_configure() {
 		$(qt_feature sqlite sql_sqlite)
 		$(qt_feature sqlite system_sqlite)
 	)
+
 	qt6-build_src_configure
 }

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index a7b3797a..39f291d5 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -25,7 +25,6 @@ QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
 # ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-# moved vnc logically to QtNetwork as that is upstream condition for it
 REQUIRED_USE+="
 	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
 	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
@@ -37,6 +36,7 @@ REQUIRED_USE+="
 	gui? ( || ( eglfs X ) || ( libinput X ) )
 	libinput? ( udev )
 	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	vnc? ( gui )
 	X? ( gles2-only? ( egl ) )
 "
 
@@ -173,5 +173,6 @@ src_configure() {
 		$(qt_feature sqlite sql_sqlite)
 		$(qt_feature sqlite system_sqlite)
 	)
+
 	qt6-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     e4ba36795cc108de6ef439c315c3198c15764139
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 12:51:22 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:02:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4ba3679

dev-qt/qtbase: miscellaneous qt6 adjustments per review

- add USE="brotli"
- add USE="zstd"
- adjust openssl dependency
- always build with gif and ico support
- fix formatting
- flip 'testlib' with USE="gui" due to a quick dependency
- remove 'virtual/opengl' dependency

As requested at: https://github.com/gentoo/gentoo/pull/25635

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/metadata.xml           |  2 +-
 dev-qt/qtbase/qtbase-6.3.0.ebuild    | 24 ++++++++++++------------
 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 24 ++++++++++++------------
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 24 ++++++++++++------------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index b33a37e9..1dd79121 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="brotli">Enable support for Brotli decompression</flag>
 		<flag name="concurrent">Build Qt6Concurrent module</flag>
 		<flag name="dbus">Build Qt6DBus module</flag>
 		<flag name="egl">Enable EGL integration</flag>
@@ -14,7 +15,6 @@
 		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
 		<flag name="gtk">Build the GTK platform theme plugin</flag>
 		<flag name="gui">Build Qt6Gui module</flag>
-		<flag name="ico">Enable ico image support</flag>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag>
 		<flag name="network">Build Qt6Network module</flag>

diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild b/dev-qt/qtbase/qtbase-6.3.0.ebuild
index 65c14f48..a8e1f084 100644
--- a/dev-qt/qtbase/qtbase-6.3.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild
@@ -13,14 +13,15 @@ fi
 
 # Qt Modules
 # TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
 REQUIRED_USE="
-	opengl? ( gui ) widgets? ( gui )
+	opengl? ( gui )
+	widgets? ( gui )
 	X? ( || ( evdev libinput ) )
 "
 
-QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
 QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
@@ -44,9 +45,6 @@ REQUIRED_USE+="
 # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
 # qtnetwork: connman, networkmanager
 DEPEND="
-	app-arch/brotli:=
-	app-arch/libarchive[zstd]
-	app-arch/zstd:=
 	app-crypt/libb2
 	dev-libs/double-conversion:=
 	dev-libs/glib:2
@@ -58,7 +56,7 @@ DEPEND="
 	media-libs/tiff:0
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
-	virtual/opengl
+	brotli? ( app-arch/brotli:= )
 	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
 	gles2-only? ( media-libs/libglvnd )
@@ -84,7 +82,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:* )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd:= )
 	tslib? ( >=x11-libs/tslib-1.21 )
 	udev? ( virtual/libudev:= )
@@ -101,6 +99,7 @@ DEPEND="
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
 	)
+	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
 
@@ -120,16 +119,16 @@ src_configure() {
 		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
 		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
-		-DQT_FEATURE_zstd=ON
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
 		$(qt_feature gui)
+		$(qt_feature gui testlib)
 		$(qt_feature icu)
 		$(qt_feature network)
 		$(qt_feature sql)
 		$(qt_feature systemd journald)
-		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
 		$(qt_feature udev libudev)
+		$(qt_feature zstd)
 	)
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
@@ -138,7 +137,7 @@ src_configure() {
 		$(qt_feature eglfs eglfs_gbm)
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
-		$(qt_feature gif)
+		-DQT_FEATURE_gif=ON
 		$(qt_feature jpeg)
 		$(qt_feature opengl)
 		$(qt_feature gles2-only opengles2)
@@ -158,6 +157,7 @@ src_configure() {
 		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
 	fi
 	use network && mycmakeargs+=(
+		$(qt_feature brotli)
 		$(qt_feature gssapi)
 		$(qt_feature libproxy)
 		$(qt_feature sctp)

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
index 65c14f48..a8e1f084 100644
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
@@ -13,14 +13,15 @@ fi
 
 # Qt Modules
 # TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
 REQUIRED_USE="
-	opengl? ( gui ) widgets? ( gui )
+	opengl? ( gui )
+	widgets? ( gui )
 	X? ( || ( evdev libinput ) )
 "
 
-QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
 QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
@@ -44,9 +45,6 @@ REQUIRED_USE+="
 # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
 # qtnetwork: connman, networkmanager
 DEPEND="
-	app-arch/brotli:=
-	app-arch/libarchive[zstd]
-	app-arch/zstd:=
 	app-crypt/libb2
 	dev-libs/double-conversion:=
 	dev-libs/glib:2
@@ -58,7 +56,7 @@ DEPEND="
 	media-libs/tiff:0
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
-	virtual/opengl
+	brotli? ( app-arch/brotli:= )
 	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
 	gles2-only? ( media-libs/libglvnd )
@@ -84,7 +82,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:* )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd:= )
 	tslib? ( >=x11-libs/tslib-1.21 )
 	udev? ( virtual/libudev:= )
@@ -101,6 +99,7 @@ DEPEND="
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
 	)
+	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
 
@@ -120,16 +119,16 @@ src_configure() {
 		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
 		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
-		-DQT_FEATURE_zstd=ON
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
 		$(qt_feature gui)
+		$(qt_feature gui testlib)
 		$(qt_feature icu)
 		$(qt_feature network)
 		$(qt_feature sql)
 		$(qt_feature systemd journald)
-		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
 		$(qt_feature udev libudev)
+		$(qt_feature zstd)
 	)
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
@@ -138,7 +137,7 @@ src_configure() {
 		$(qt_feature eglfs eglfs_gbm)
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
-		$(qt_feature gif)
+		-DQT_FEATURE_gif=ON
 		$(qt_feature jpeg)
 		$(qt_feature opengl)
 		$(qt_feature gles2-only opengles2)
@@ -158,6 +157,7 @@ src_configure() {
 		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
 	fi
 	use network && mycmakeargs+=(
+		$(qt_feature brotli)
 		$(qt_feature gssapi)
 		$(qt_feature libproxy)
 		$(qt_feature sctp)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 485c0d24..a7b3797a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -12,14 +12,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 # Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
 REQUIRED_USE="
-	opengl? ( gui ) widgets? ( gui )
+	opengl? ( gui )
+	widgets? ( gui )
 	X? ( || ( evdev libinput ) )
 "
 
-QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
 QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
 IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
 # QtPrintSupport = QtGui + QtWidgets enabled.
@@ -43,9 +44,6 @@ REQUIRED_USE+="
 # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
 # qtnetwork: connman, networkmanager
 DEPEND="
-	app-arch/brotli:=
-	app-arch/libarchive[zstd]
-	app-arch/zstd:=
 	app-crypt/libb2
 	dev-libs/double-conversion:=
 	dev-libs/glib:2
@@ -57,7 +55,7 @@ DEPEND="
 	media-libs/tiff:0
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
-	virtual/opengl
+	brotli? ( app-arch/brotli:= )
 	evdev? ( sys-libs/mtdev )
 	freetds? ( dev-db/freetds )
 	gles2-only? ( media-libs/libglvnd )
@@ -83,7 +81,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:* )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd:= )
 	tslib? ( >=x11-libs/tslib-1.21 )
 	udev? ( virtual/libudev:= )
@@ -100,6 +98,7 @@ DEPEND="
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
 	)
+	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
 
@@ -119,17 +118,17 @@ src_configure() {
 		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
 		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
-		-DQT_FEATURE_zstd=ON
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
 		$(qt_feature gui)
+		$(qt_feature gui testlib)
 		$(qt_feature icu)
 		$(qt_feature network)
 		$(qt_feature sql)
 		$(qt_feature systemd journald)
-		-DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
 		$(qt_feature udev libudev)
 		$(qt_feature xml)
+		$(qt_feature zstd)
 	)
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
@@ -138,7 +137,7 @@ src_configure() {
 		$(qt_feature eglfs eglfs_gbm)
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
-		$(qt_feature gif)
+		-DQT_FEATURE_gif=ON
 		$(qt_feature jpeg)
 		$(qt_feature opengl)
 		$(qt_feature gles2-only opengles2)
@@ -158,6 +157,7 @@ src_configure() {
 		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
 	fi
 	use network && mycmakeargs+=(
+		$(qt_feature brotli)
 		$(qt_feature gssapi)
 		$(qt_feature libproxy)
 		$(qt_feature sctp)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     ab6a3e3cd53448676180c686d91ababd208b3c7f
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 18:39:03 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:39:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab6a3e3c

dev-qt/qtbase: sync with other versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtbase/qtbase-6.3.1.ebuild b/dev-qt/qtbase/qtbase-6.3.1.ebuild
index 99b3ac96..36931e0e 100644
--- a/dev-qt/qtbase/qtbase-6.3.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.1.ebuild
@@ -173,5 +173,6 @@ src_configure() {
 		$(qt_feature sqlite sql_sqlite)
 		$(qt_feature sqlite system_sqlite)
 	)
+
 	qt6-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     ca377479386b985d33a609d305593fc1cb5e4a37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:41:53 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 14:41:53 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca377479

dev-qt/qtbase: drop 6.3.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/Manifest            |   1 -
 dev-qt/qtbase/qtbase-6.3.2.ebuild | 178 --------------------------------------
 2 files changed, 179 deletions(-)

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
deleted file mode 100644
index 469b7132..00000000
--- a/dev-qt/qtbase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtbase-everywhere-src-6.3.2.tar.xz 47507396 BLAKE2B 9f5a1af7abb914af58c32bfdd2f54fdd2d496972606bfa68425e5997be74249d0314a4978fc8359c5a6ccad3f6ef6920bf3e7c9450b256f39d830abf7e778051 SHA512 e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822

diff --git a/dev-qt/qtbase/qtbase-6.3.2.ebuild b/dev-qt/qtbase/qtbase-6.3.2.ebuild
deleted file mode 100644
index 36931e0e..00000000
--- a/dev-qt/qtbase/qtbase-6.3.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
-REQUIRED_USE="
-	opengl? ( gui )
-	widgets? ( gui )
-	X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
-	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
-	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
-	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
-	accessibility? ( dbus X )
-	cups? ( gui widgets )
-	eglfs? ( egl )
-	gtk? ( widgets )
-	gui? ( || ( eglfs X ) || ( libinput X ) )
-	libinput? ( udev )
-	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
-	vnc? ( gui )
-	X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode]
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
-	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib:=
-	brotli? ( app-arch/brotli:= )
-	evdev? ( sys-libs/mtdev )
-	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	gssapi? ( virtual/krb5 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	gui? ( media-libs/libpng:0= )
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	libproxy? ( net-libs/libproxy )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	udev? ( virtual/libudev:= )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_BINDIR=${QT6_BINDIR}
-		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
-		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
-		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
-		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
-		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
-		-DQT_FEATURE_androiddeployqt=OFF
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature gui testlib)
-		$(qt_feature icu)
-		$(qt_feature network)
-		$(qt_feature sql)
-		$(qt_feature systemd journald)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-	)
-	use gui && mycmakeargs+=(
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature egl)
-		$(qt_feature eglfs eglfs_egldevice)
-		$(qt_feature eglfs eglfs_gbm)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		-DQT_FEATURE_gif=ON
-		$(qt_feature jpeg)
-		$(qt_feature opengl)
-		$(qt_feature gles2-only opengles2)
-		$(qt_feature libinput)
-		$(qt_feature tslib)
-		$(qt_feature tuio tuiotouch)
-		$(qt_feature vulkan)
-		$(qt_feature widgets)
-		$(qt_feature X xcb)
-		$(qt_feature X xcb_xlib)
-	)
-	use widgets && mycmakeargs+=(
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-	if use libinput || use X; then
-		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
-	fi
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(qt_feature ssl openssl)
-		$(qt_feature vnc)
-	)
-	use sql && mycmakeargs+=(
-		$(qt_feature freetds sql_tds)
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     b5bb3642bf6a84876565654aaf3ef22d2e9ce952
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 20:24:56 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 20:24:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b5bb3642

dev-qt/qtbase: drop 6.3.9999

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 178 -----------------------------------
 1 file changed, 178 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
deleted file mode 100644
index 36931e0e..00000000
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
-REQUIRED_USE="
-	opengl? ( gui )
-	widgets? ( gui )
-	X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
-	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
-	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
-	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
-	accessibility? ( dbus X )
-	cups? ( gui widgets )
-	eglfs? ( egl )
-	gtk? ( widgets )
-	gui? ( || ( eglfs X ) || ( libinput X ) )
-	libinput? ( udev )
-	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
-	vnc? ( gui )
-	X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode]
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
-	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib:=
-	brotli? ( app-arch/brotli:= )
-	evdev? ( sys-libs/mtdev )
-	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	gssapi? ( virtual/krb5 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	gui? ( media-libs/libpng:0= )
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	libproxy? ( net-libs/libproxy )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	udev? ( virtual/libudev:= )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_BINDIR=${QT6_BINDIR}
-		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
-		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
-		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
-		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
-		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
-		-DQT_FEATURE_androiddeployqt=OFF
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature gui testlib)
-		$(qt_feature icu)
-		$(qt_feature network)
-		$(qt_feature sql)
-		$(qt_feature systemd journald)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-	)
-	use gui && mycmakeargs+=(
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature egl)
-		$(qt_feature eglfs eglfs_egldevice)
-		$(qt_feature eglfs eglfs_gbm)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		-DQT_FEATURE_gif=ON
-		$(qt_feature jpeg)
-		$(qt_feature opengl)
-		$(qt_feature gles2-only opengles2)
-		$(qt_feature libinput)
-		$(qt_feature tslib)
-		$(qt_feature tuio tuiotouch)
-		$(qt_feature vulkan)
-		$(qt_feature widgets)
-		$(qt_feature X xcb)
-		$(qt_feature X xcb_xlib)
-	)
-	use widgets && mycmakeargs+=(
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-	if use libinput || use X; then
-		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
-	fi
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(qt_feature ssl openssl)
-		$(qt_feature vnc)
-	)
-	use sql && mycmakeargs+=(
-		$(qt_feature freetds sql_tds)
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     90ce0b11d5c37f8e7b055b5f19bbc127e707a029
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 10:18:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 10:18:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=90ce0b11

dev-qt/qtbase: Drop obsolete x11-libs/libxcb[xkb] USEdep

Closes: https://bugs.gentoo.org/875956
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.4.0.ebuild    | 2 +-
 dev-qt/qtbase/qtbase-6.4.9999.ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild
index 39f291d5..b8c13642 100644
--- a/dev-qt/qtbase/qtbase-6.4.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.0.ebuild
@@ -91,7 +91,7 @@ DEPEND="
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxcb-1.12:=
 		>=x11-libs/libxkbcommon-0.5.0[X]
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms

diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index 39f291d5..b8c13642 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -91,7 +91,7 @@ DEPEND="
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxcb-1.12:=
 		>=x11-libs/libxkbcommon-0.5.0[X]
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 39f291d5..b8c13642 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -91,7 +91,7 @@ DEPEND="
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxcb-1.12:=
 		>=x11-libs/libxkbcommon-0.5.0[X]
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     598ef1e2bb0fb3c13c58dfa4abff3869ff7534b9
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 13:23:40 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 13:35:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=598ef1e2

dev-qt/qtbase: add 'dosym' for 'qmake'

Also sort some of the configure variables.

Bug: https://bugs.gentoo.org/863395
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.4.0.ebuild    | 21 ++++++++++++++-------
 dev-qt/qtbase/qtbase-6.4.9999.ebuild | 21 ++++++++++++++-------
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 21 ++++++++++++++-------
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild
index b8c13642..7139d94a 100644
--- a/dev-qt/qtbase/qtbase-6.4.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.0.ebuild
@@ -104,19 +104,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
 		-DINSTALL_BINDIR=${QT6_BINDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
 		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
@@ -176,3 +176,10 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	# https://bugs.gentoo.org/863395
+	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+}

diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index b8c13642..7139d94a 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -104,19 +104,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
 		-DINSTALL_BINDIR=${QT6_BINDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
 		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
@@ -176,3 +176,10 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	# https://bugs.gentoo.org/863395
+	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+}

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b8c13642..7139d94a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -104,19 +104,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
 		-DINSTALL_BINDIR=${QT6_BINDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
 		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
 		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
 		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
 		-DQT_FEATURE_androiddeployqt=OFF
 		$(qt_feature concurrent)
 		$(qt_feature dbus)
@@ -176,3 +176,10 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	# https://bugs.gentoo.org/863395
+	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     2e6fbf1f68927adf5712b9e4c71b7e6144312ddb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 09:07:26 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 09:07:26 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2e6fbf1f

dev-qt/qtbase: drop 6.4.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/Manifest            |   1 -
 dev-qt/qtbase/qtbase-6.4.0.ebuild | 185 --------------------------------------
 2 files changed, 186 deletions(-)

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
deleted file mode 100644
index c57d973a..00000000
--- a/dev-qt/qtbase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3

diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild
deleted file mode 100644
index 7139d94a..00000000
--- a/dev-qt/qtbase/qtbase-6.4.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-# Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
-REQUIRED_USE="
-	opengl? ( gui )
-	widgets? ( gui )
-	X? ( || ( evdev libinput ) )
-"
-
-QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
-QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
-QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
-IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
-# QtPrintSupport = QtGui + QtWidgets enabled.
-# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
-REQUIRED_USE+="
-	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
-	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
-	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
-	accessibility? ( dbus X )
-	cups? ( gui widgets )
-	eglfs? ( egl )
-	gtk? ( widgets )
-	gui? ( || ( eglfs X ) || ( libinput X ) )
-	libinput? ( udev )
-	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
-	vnc? ( gui )
-	X? ( gles2-only? ( egl ) )
-"
-
-# TODO:
-# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
-# qtnetwork: connman, networkmanager
-DEPEND="
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode]
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
-	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib:=
-	brotli? ( app-arch/brotli:= )
-	evdev? ( sys-libs/mtdev )
-	freetds? ( dev-db/freetds )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	gssapi? ( virtual/krb5 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	gui? ( media-libs/libpng:0= )
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	libproxy? ( net-libs/libproxy )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	udev? ( virtual/libudev:= )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
-		-DINSTALL_BINDIR=${QT6_BINDIR}
-		-DINSTALL_DATADIR=${QT6_DATADIR}
-		-DINSTALL_DOCDIR=${QT6_DOCDIR}
-		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
-		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
-		-DINSTALL_LIBDIR=${QT6_LIBDIR}
-		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
-		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
-		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
-		-DINSTALL_QMLDIR=${QT6_QMLDIR}
-		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
-		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
-		-DQT_FEATURE_androiddeployqt=OFF
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature gui testlib)
-		$(qt_feature icu)
-		$(qt_feature network)
-		$(qt_feature sql)
-		$(qt_feature systemd journald)
-		$(qt_feature udev libudev)
-		$(qt_feature xml)
-		$(qt_feature zstd)
-	)
-	use gui && mycmakeargs+=(
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature egl)
-		$(qt_feature eglfs eglfs_egldevice)
-		$(qt_feature eglfs eglfs_gbm)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		-DQT_FEATURE_gif=ON
-		$(qt_feature jpeg)
-		$(qt_feature opengl)
-		$(qt_feature gles2-only opengles2)
-		$(qt_feature libinput)
-		$(qt_feature tslib)
-		$(qt_feature tuio tuiotouch)
-		$(qt_feature vulkan)
-		$(qt_feature widgets)
-		$(qt_feature X xcb)
-		$(qt_feature X xcb_xlib)
-	)
-	use widgets && mycmakeargs+=(
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-	if use libinput || use X; then
-		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
-	fi
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(qt_feature ssl openssl)
-		$(qt_feature vnc)
-	)
-	use sql && mycmakeargs+=(
-		$(qt_feature freetds sql_tds)
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	# https://bugs.gentoo.org/863395
-	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Andreas Sturmlechner]

commit:     f2220d8ea80279de381ed005d6d8467b46007a83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:22:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 19:35:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f2220d8e

dev-qt/qtbase: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.4.9999.ebuild | 4 ++--
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index 7139d94a..8398b9b5 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
+	media-libs/tiff:=
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
 	brotli? ( app-arch/brotli:= )
@@ -66,7 +66,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	gui? ( media-libs/libpng:0= )
+	gui? ( media-libs/libpng:= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
 	jpeg? ( media-libs/libjpeg-turbo:= )

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 7139d94a..8398b9b5 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
+	media-libs/tiff:=
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
 	brotli? ( app-arch/brotli:= )
@@ -66,7 +66,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	gui? ( media-libs/libpng:0= )
+	gui? ( media-libs/libpng:= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
 	jpeg? ( media-libs/libjpeg-turbo:= )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     397a3c317b56e215cf60ee3ed41fc194b2c0d1dc
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 22:01:04 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 22:01:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=397a3c31

dev-qt/qtbase: fix 6.5.* build with USE="-egl"

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.5.9999.ebuild | 1 +
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 7139d94a..289aee78 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -133,6 +133,7 @@ src_configure() {
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
 		$(qt_feature egl)
+		$(qt_feature egl xcb_egl_plugin)
 		$(qt_feature eglfs eglfs_egldevice)
 		$(qt_feature eglfs eglfs_gbm)
 		$(qt_feature evdev)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 8398b9b5..ed5fe710 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -133,6 +133,7 @@ src_configure() {
 	use gui && mycmakeargs+=(
 		$(qt_feature accessibility accessibility_atspi_bridge)
 		$(qt_feature egl)
+		$(qt_feature egl xcb_egl_plugin)
 		$(qt_feature eglfs eglfs_egldevice)
 		$(qt_feature eglfs eglfs_gbm)
 		$(qt_feature evdev)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     2de8771c7e6d8c52f5f7f31bd9c6fa3dba1d4fd4
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 17:29:59 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 17:29:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2de8771c

dev-qt/qtbase: use qt6_symlink_binary_to_path for dosym

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.4.9999.ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.5.9999.ebuild | 2 +-
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
index 8398b9b5..c5af22d6 100644
--- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild
@@ -181,5 +181,5 @@ src_install() {
 	qt6-build_src_install
 
 	# https://bugs.gentoo.org/863395
-	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+	qt6_symlink_binary_to_path qmake 6
 }

diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 289aee78..50f5261f 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -182,5 +182,5 @@ src_install() {
 	qt6-build_src_install
 
 	# https://bugs.gentoo.org/863395
-	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+	qt6_symlink_binary_to_path qmake 6
 }

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index ed5fe710..0b1d7d0a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -182,5 +182,5 @@ src_install() {
 	qt6-build_src_install
 
 	# https://bugs.gentoo.org/863395
-	dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6
+	qt6_symlink_binary_to_path qmake 6
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/

[Jimi Huotari]

commit:     f8ecb93d71724a5c8a026f20ac18693f384663f1
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 15:04:14 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 15:04:14 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f8ecb93d

dev-qt/qtbase: sync subslots for 6.5.9999

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 50f5261f..0b1d7d0a 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
-	media-libs/tiff:0
+	media-libs/tiff:=
 	>=sys-apps/dbus-1.4.20
 	sys-libs/zlib:=
 	brotli? ( app-arch/brotli:= )
@@ -66,7 +66,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	gui? ( media-libs/libpng:0= )
+	gui? ( media-libs/libpng:= )
 	icu? ( dev-libs/icu:= )
 	!icu? ( virtual/libiconv )
 	jpeg? ( media-libs/libjpeg-turbo:= )