From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A73A015808B for ; Thu, 3 Oct 2024 03:45:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAC01E29BA; Thu, 3 Oct 2024 03:45:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CF34E29BA for ; Thu, 3 Oct 2024 03:45:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0732234131D for ; Thu, 3 Oct 2024 03:45:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B49EBE7 for ; Thu, 3 Oct 2024 03:45:01 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1727927083.398ed013b2696972380ff682624ab1828bd68f0e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtdeclarative/qtdeclarative-6.7.3-r1.ebuild dev-qt/qtdeclarative/qtdeclarative-6.7.3.ebuild dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 398ed013b2696972380ff682624ab1828bd68f0e X-VCS-Branch: master Date: Thu, 3 Oct 2024 03:45:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9a104963-c08d-4373-9a4b-2ee88b12f0a2 X-Archives-Hash: b174b32ae84fcfde3acca8347c7f48dd commit: 398ed013b2696972380ff682624ab1828bd68f0e Author: Ionen Wolkens gentoo org> AuthorDate: Thu Oct 3 03:12:10 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Oct 3 03:44:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398ed013 dev-qt/qtdeclarative: guard against incomplete installs (qt6) The guard can be tested by doing: emerge -C qtshadertools:6 emerge -O qtdeclarative:6 Then qtdeclarative will ignore the missing dep and try to install without QtQuickControls2 (for one), and guard should stop it. Bit wasteful, but revbump to ensure everyone has a working copy. fwiw skipping 6.7.2 given afaik issue only happen on upgrades and 6.7.2 is old and kind of a well established install by now. Bug: https://bugs.gentoo.org/940675 Signed-off-by: Ionen Wolkens gentoo.org> ...larative-6.7.3.ebuild => qtdeclarative-6.7.3-r1.ebuild} | 14 ++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild | 14 ++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-6.8.9999.ebuild | 14 ++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 14 ++++++++++++++ 4 files changed, 56 insertions(+) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r1.ebuild similarity index 67% rename from dev-qt/qtdeclarative/qtdeclarative-6.7.3.ebuild rename to 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 +}