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

5 files changed, 77 insertions, 8 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index dcd2f03862d0..91d0e4857b3e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,5 +3,7 @@ DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef
 EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c
-EBUILD qtdeclarative-6.5.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
-MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda
+EBUILD qtdeclarative-6.5.2-r1.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
+EBUILD qtdeclarative-6.5.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
+EBUILD qtdeclarative-6.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124
+MISC metadata.xml 800 BLAKE2B ac64df7acf6a3fff34fe396b981c4babb145590b2e8d8d656ea6287d2a251c799866748f184a4b1876fe3195120a6192fe9ea7d787f49978a3c8d47159c01031 SHA512 30e9c9c8c3719791e927574a08a0a5667c327ca3d6c614df1b372ae1390074ae5ba16d0363cc81c625fa9ce585f93cb4bcba78ad9f0b36470d63c614c195c5c2
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index b1f5174a5c63..62a0a2de1bd8 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -14,6 +14,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtdeclarative</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild
index 8c9a771cc98e..90ce21a2e8ec 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild
@@ -11,13 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="opengl +sql +widgets"
+IUSE="opengl +sql vulkan +widgets"
 
-DEPEND="
-	=dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=]
-	=dev-qt/qtshadertools-${PV}*
-"
-RDEPEND="${DEPEND}"
+# behaves very badly when qtdeclarative is not already installed, also
+# other more minor issues (installs junk, sandbox/offscreen issues)
+RESTRICT="test"
+
+RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]"
+DEPEND="${RDEPEND}"
+BDEPEND="~dev-qt/qtshadertools-${PV}:6"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild
new file mode 100644
index 000000000000..90ce21a2e8ec
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Declarative (Quick 2)"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="opengl +sql vulkan +widgets"
+
+# behaves very badly when qtdeclarative is not already installed, also
+# other more minor issues (installs junk, sandbox/offscreen issues)
+RESTRICT="test"
+
+RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]"
+DEPEND="${RDEPEND}"
+BDEPEND="~dev-qt/qtshadertools-${PV}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature opengl)
+		$(qt_feature sql)
+		$(qt_feature widgets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
new file mode 100644
index 000000000000..90ce21a2e8ec
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Declarative (Quick 2)"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="opengl +sql vulkan +widgets"
+
+# behaves very badly when qtdeclarative is not already installed, also
+# other more minor issues (installs junk, sandbox/offscreen issues)
+RESTRICT="test"
+
+RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]"
+DEPEND="${RDEPEND}"
+BDEPEND="~dev-qt/qtshadertools-${PV}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature opengl)
+		$(qt_feature sql)
+		$(qt_feature widgets)
+	)
+
+	qt6-build_src_configure
+}