6 files changed, 60 insertions, 4 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 1995c0b0cada..e7d50de886ba 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index e9f2a485ac0e..f9ff38b92bf4 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,9 +6,9 @@ DIST qtdeclarative-everywhere-src-6.7.3.tar.xz 35663596 BLAKE2B b9dc18b4a459c283
 DIST qtdeclarative-everywhere-src-6.8.0-rc.tar.xz 37028956 BLAKE2B 6847f597744ccadc04e0cbb68c93aa84ed4315fce60e17bc4b7268d223845c009ec9c9b7bd3a276c4334583dfb72f54308456ae3bdee1ea23b5230e62fbffc73 SHA512 148b8ef1f9edd7e0b11f7b0b2e8741e4daab688431869f3e7d3152179659b18a4a66547f360595e6172becb728c81ecbe8844d1a38b01c95d8572f037c0ada8b
 EBUILD qtdeclarative-5.15.14.ebuild 1537 BLAKE2B c2f7b010977ed65abbe16d8b2df6ed8c29407685e014778f4f3da5b2853b6dfa6d5ce2a0d5037852d8d11894c1a33323090bd18659f7c85d8cdf56f8bf41ae79 SHA512 fd6e5bb4709174b8746d520a6fd0109e2d6b2de19d6a679fdbdcf4cf074dc778854afc2b364f7d692e6c60e0d3e3580c19e98b36368258f6e76b3a5ef2cff0c4
 EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358b664cc70013f269af95e72b353cfc0103d3953fa308532dfbd00ce0f703c33e341e8a829c1a6bb62a09c07ec8cb7910 SHA512 48af79fdeff33c7d2da696364e1dc1a6694d9a6428a8aae11c5bd2ad2046f7a82bb780824da9a1aef1741322680534cd0d261a50acf235ae3b4fb0f8346d7dc7
-EBUILD qtdeclarative-6.7.3.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
-EBUILD qtdeclarative-6.7.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
+EBUILD qtdeclarative-6.7.3-r1.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
+EBUILD qtdeclarative-6.7.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 EBUILD qtdeclarative-6.8.0_rc.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
-EBUILD qtdeclarative-6.8.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
-EBUILD qtdeclarative-6.9999.ebuild 1181 BLAKE2B c4bc298049c05c12f5d32f2ed71a6f2de406c09a76bf1f57b39b5b2d7fc4534b3233c80c8662aa93ed3fcac9f5fb06b0af97edb5f68005b28af4a71676fdc2ba SHA512 7f4073b2ca77daebcc41e9e72cb3a1b2a54e67160df86543904b3d35c90eb8477e4b8c364233815d084d855565ebaada290930855f0bf2ce5ae632f9b5bd6f90
+EBUILD qtdeclarative-6.8.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
+EBUILD qtdeclarative-6.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r1.ebuild
index 347c469cee90..724f992b0453 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r1.ebuild
@@ -45,3 +45,17 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
+		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
+		eerror "install was aborted to protect the system. Possibly(?) due"
+		eerror "to a rare portage ordering bug. If using portage, try:"
+		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
+		eerror "If that did not resolve the issue, please provide build.log"
+		eerror "on https://bugs.gentoo.org/940675"
+		die "aborting due to incomplete/broken build (see above)"
+	fi
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
index 347c469cee90..724f992b0453 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
@@ -45,3 +45,17 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
+		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
+		eerror "install was aborted to protect the system. Possibly(?) due"
+		eerror "to a rare portage ordering bug. If using portage, try:"
+		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
+		eerror "If that did not resolve the issue, please provide build.log"
+		eerror "on https://bugs.gentoo.org/940675"
+		die "aborting due to incomplete/broken build (see above)"
+	fi
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild
index 347c469cee90..724f992b0453 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild
@@ -45,3 +45,17 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
+		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
+		eerror "install was aborted to protect the system. Possibly(?) due"
+		eerror "to a rare portage ordering bug. If using portage, try:"
+		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
+		eerror "If that did not resolve the issue, please provide build.log"
+		eerror "on https://bugs.gentoo.org/940675"
+		die "aborting due to incomplete/broken build (see above)"
+	fi
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
index 347c469cee90..724f992b0453 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
@@ -45,3 +45,17 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
+		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
+		eerror "install was aborted to protect the system. Possibly(?) due"
+		eerror "to a rare portage ordering bug. If using portage, try:"
+		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
+		eerror "If that did not resolve the issue, please provide build.log"
+		eerror "on https://bugs.gentoo.org/940675"
+		die "aborting due to incomplete/broken build (see above)"
+	fi
+}