commit:     6b46fd5ee377e177f08e789578d299cfeba0e9bb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 07:45:12 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 08:45:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b46fd5e

dev-qt/qtbase: delete test objects in the ebuild rather than eclass

No longer deleting *all* objects-* files in the eclass,
so delete only what we want to here.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.8.2-r2.ebuild | 1 +
 dev-qt/qtbase/qtbase-6.8.9999.ebuild | 1 +
 dev-qt/qtbase/qtbase-6.9.9999.ebuild | 1 +
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild 
b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
index f0f9a8a30e5e..08f1610075ec 100644
--- a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild
@@ -372,6 +372,7 @@ src_install() {
                )
                local delete=( # sigh
                        "${D}${QT6_BINDIR}"/test*
+                       "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
                        "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
                )
                # using -f given not tracking which tests may be skipped or not

diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 7e7d1bd57609..6eeb224df3dd 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -370,6 +370,7 @@ src_install() {
                )
                local delete=( # sigh
                        "${D}${QT6_BINDIR}"/test*
+                       "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
                        "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
                )
                # using -f given not tracking which tests may be skipped or not

diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
index aa4ef84e0c8c..b27a756c0106 100644
--- a/dev-qt/qtbase/qtbase-6.9.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild
@@ -370,6 +370,7 @@ src_install() {
                )
                local delete=( # sigh
                        "${D}${QT6_BINDIR}"/test*
+                       "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
                        "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
                )
                # using -f given not tracking which tests may be skipped or not

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index aa4ef84e0c8c..b27a756c0106 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -370,6 +370,7 @@ src_install() {
                )
                local delete=( # sigh
                        "${D}${QT6_BINDIR}"/test*
+                       "${D}${QT6_LIBDIR}/objects-${CMAKE_BUILD_TYPE}"/*test*
                        "${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
                )
                # using -f given not tracking which tests may be skipped or not

Reply via email to