gentoo auto-resync : 05:09:2023 - 16:23:54

6 files changed, 119 insertions, 20 deletions

diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 39acf64cf050..b397473777d8 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,3 +1,5 @@
 DIST qt5compat-everywhere-src-6.5.2.tar.xz 14638008 BLAKE2B ab16da4c4cdbbfde615e083ebce57352bbee6e37ddd6a9a764a9f93824edb0a230324c989808c859b8142f16cec2f57cfffe33fe20fd1d7b72ec8a1967c87e99 SHA512 c646231f4bece460bfa6b654cba63a91c938c98b4fca8198e63a3fc15a2c7424ef43a765f612d6555b341a8b46f89293d4567257e489569e4669d9beaee6ed66
-EBUILD qt5compat-6.5.2.ebuild 353 BLAKE2B b57d7addff3b54eaabae28b20745dace7ecb2c01f2de0117eb83a58ddaa5a2d26c527470953249cae2797d34f81562bb60ea68b2ef05f2350d2546c81dd805eb SHA512 7f3c3a60723674ebeea149c3317d6ce689630fd638a28fb1bd937667d63fb1b20cfa760c848d3dfe54e35a73d572aa00ff7dba2436bd40709b00ff18b66f8c81
-MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
+EBUILD qt5compat-6.5.2-r1.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0
+EBUILD qt5compat-6.5.9999.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0
+EBUILD qt5compat-6.9999.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0
+MISC metadata.xml 614 BLAKE2B 0398cf879d68d52becdfe5098503b6c40b9e84f6a0d05f961d068235a0caff829fd930027c0bd736dbae76aa5b00ee3f99c6e303120fe14b6da3789ee7781e7f SHA512 ebf0f12d0a42356a915c06626046498273659cba209a0537b69cc27da2b5dc721c49cf4180d1a7137a34b89ac1ee39d95295cbebb83848c1f63b786b1eaaad7c
diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml
index ae8aa9597f20..00a322d647f6 100644
--- a/dev-qt/qt5compat/metadata.xml
+++ b/dev-qt/qt5compat/metadata.xml
@@ -5,9 +5,13 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qt5compat</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..46743a4d8f24
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="icu qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+	icu? ( dev-libs/icu:= )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}:6
+		~dev-qt/qtshadertools-${PV}:6
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# tst_qxmlinputsource sometimes hang without -j1
+	qt6-build_src_test -j1
+}
diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild
deleted file mode 100644
index 54dca83e10d2..000000000000
--- a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,network]
-	=dev-qt/qtdeclarative-${PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
new file mode 100644
index 000000000000..46743a4d8f24
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="icu qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+	icu? ( dev-libs/icu:= )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}:6
+		~dev-qt/qtshadertools-${PV}:6
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# tst_qxmlinputsource sometimes hang without -j1
+	qt6-build_src_test -j1
+}
diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
new file mode 100644
index 000000000000..46743a4d8f24
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="icu qml"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+	icu? ( dev-libs/icu:= )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}:6
+		~dev-qt/qtshadertools-${PV}:6
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
+
+src_test() {
+	# tst_qxmlinputsource sometimes hang without -j1
+	qt6-build_src_test -j1
+}