[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/, profiles/arch/riscv/

[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/, profiles/arch/riscv/

[Marek Szuba]

commit:     3391fce2a547bfff70858e8737ccacfb0b69ab3f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 18:27:33 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 18:28:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3391fce2

net-mail/dovecot: keyword 2.3.15-r1 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-mail/dovecot/dovecot-2.3.15-r1.ebuild | 11 +++++++++--
 profiles/arch/riscv/package.use.mask      |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
index b8d050347b0..8c886e6a7a5 100644
--- a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 lua5-3 )
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
 
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
@@ -99,6 +99,13 @@ src_prepare() {
 	# bug 657108
 	#elibtoolize
 	eautoreconf
+
+	if use riscv; then
+		# Without this, src_tests dies due to failed asserts in test-backtrace.c;
+		# See https://salsa.debian.org/debian/dovecot/-/merge_requests/8 .
+		# Might in fact be needed on other arches as well.
+		append-cflags -funwind-tables
+	fi
 }
 
 src_configure() {

diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index f634b99a303..9d8e925559f 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -96,6 +96,7 @@ dev-util/strace unwind
 media-libs/gstreamer unwind
 media-libs/mesa unwind
 net-libs/zeromq unwind
+net-mail/dovecot unwind
 x11-base/xorg-server unwind
 x11-base/xwayland unwind