From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1345026-garchives=archives.gentoo.org@lists.gentoo.org>
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 4C22F158086
for <garchives@archives.gentoo.org>; Wed, 1 Dec 2021 20:02:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 972DE2BC0A3;
Wed, 1 Dec 2021 20:02:38 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7D83E2BC0A3
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 20:02:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7A5193430A8
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 20:02:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E90CB8E
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 20:02:35 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1638388938.45c18da33fe7f9ec1d9eb61d8c60406a867c63bb.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/rspamd/rspamd-3.1.ebuild mail-filter/rspamd/rspamd-9999.ebuild
X-VCS-Directories: mail-filter/rspamd/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 45c18da33fe7f9ec1d9eb61d8c60406a867c63bb
X-VCS-Branch: master
Date: Wed, 1 Dec 2021 20:02:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f114d169-cabd-488f-910e-e6083252a8f6
X-Archives-Hash: 8fe1827ed6c8e05641833e6511d45b95
commit: 45c18da33fe7f9ec1d9eb61d8c60406a867c63bb
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Nov 29 18:37:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 20:02:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c18da3
mail-filter/rspamd: respect user compiler flags choice
The Toolset.cmake file seems to be unnecessary, it tries to control
flags which in Gentoo should be controlled by user. This applies a
change suggested in [1].
[1] https://bugs.gentoo.org/827550#c1
Closes: https://bugs.gentoo.org/827550
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/23127
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-filter/rspamd/rspamd-3.1.ebuild | 2 ++
mail-filter/rspamd/rspamd-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die