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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DD6E13835A for ; Tue, 13 Apr 2021 15:59:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9403E0CCE; Tue, 13 Apr 2021 15:59:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0547E0CCE for ; Tue, 13 Apr 2021 15:59:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4961D335DB8 for ; Tue, 13 Apr 2021 15:59:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D3EC4D2 for ; Tue, 13 Apr 2021 15:59:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618329529.3325b59726a4c506370d927d7938a6d0317be178.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/spamassassin/spamassassin-3.4.5.ebuild mail-filter/spamassassin/spamassassin-3.4.6.ebuild X-VCS-Directories: mail-filter/spamassassin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3325b59726a4c506370d927d7938a6d0317be178 X-VCS-Branch: master Date: Tue, 13 Apr 2021 15:59:05 +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: 46ee73df-2882-4678-82c4-a2e88b743010 X-Archives-Hash: 4e252ffb01a9094b780b867d246e0402 commit: 3325b59726a4c506370d927d7938a6d0317be178 Author: Sam James gentoo org> AuthorDate: Tue Apr 13 15:51:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 13 15:58:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3325b597 mail-filter/spamassassin: drop test which needs dev-perl/DBD conditionally t/sql_based_whitelist.t needs dev-perl/DBD which is only pulled in with USE=sqlite/mysql/postgres. Rather than add REQUIRED_USE which harms automation for arch testing, we conditionally delete the test for now. (We could alternatively add a bunch of stuff as test-dependencies only, but I wanted a minimal change to the ebuild for now.) Signed-off-by: Sam James gentoo.org> mail-filter/spamassassin/spamassassin-3.4.5.ebuild | 7 +++++++ mail-filter/spamassassin/spamassassin-3.4.6.ebuild | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild index 562694ddd4c..732579b8757 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild @@ -107,6 +107,13 @@ src_prepare() { # workaround. perl_rm_files t/spamc_*.t + # Some tests need extra dependencies + # e.g. t/sql_based_whitelist.t needs DBD + # This is kinder than REQUIRED_USE for tests which hurts automation + if ! use mysql && ! use postgres && ! use sqlite ; then + perl_rm_files t/sql_based_whitelist.t + fi + # Disable plugin by default sed -i -e 's/^loadplugin/\#loadplugin/g' \ "rules/init.pre" \ diff --git a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild index 562694ddd4c..732579b8757 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild @@ -107,6 +107,13 @@ src_prepare() { # workaround. perl_rm_files t/spamc_*.t + # Some tests need extra dependencies + # e.g. t/sql_based_whitelist.t needs DBD + # This is kinder than REQUIRED_USE for tests which hurts automation + if ! use mysql && ! use postgres && ! use sqlite ; then + perl_rm_files t/sql_based_whitelist.t + fi + # Disable plugin by default sed -i -e 's/^loadplugin/\#loadplugin/g' \ "rules/init.pre" \