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 06C4615808B for ; Tue, 12 Apr 2022 08:20:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 080D3E07A9; Tue, 12 Apr 2022 08:20:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5BC1E07A5 for ; Tue, 12 Apr 2022 08:20:32 +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 F2EB3341B1A for ; Tue, 12 Apr 2022 08:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C87B398 for ; Tue, 12 Apr 2022 08:20:30 +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: <1649751614.a0be7a6a1a96b4df87446f3e514a4af5818e83c3.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-9999.ebuild X-VCS-Directories: mail-filter/rspamd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a0be7a6a1a96b4df87446f3e514a4af5818e83c3 X-VCS-Branch: master Date: Tue, 12 Apr 2022 08:20:30 +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: 3e18dae3-20f4-4fcb-a918-b72f436dbdb6 X-Archives-Hash: ba55b67492d342aef7c76e0944827683 commit: a0be7a6a1a96b4df87446f3e514a4af5818e83c3 Author: Petr Vaněk atlas cz> AuthorDate: Wed Apr 6 09:51:21 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 12 08:20:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0be7a6a mail-filter/rspamd: sync live Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/rspamd-9999.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index b4d4c6d23bae..f04832d56b59 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) @@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" SLOT="0" -IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test" +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test" RESTRICT="!test? ( test )" # A part of tests use ffi luajit extension @@ -29,17 +29,19 @@ REQUIRED_USE="${LUA_REQUIRED_USE} RDEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] + dev-lua/lua-argparse[${LUA_USEDEP}] ') acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 - dev-cpp/doctest dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= + dev-libs/libpcre2:=[jit=] dev-libs/libsodium:= + dev-libs/openssl:0=[-bindist(-)] dev-libs/snowball-stemmer:= sys-apps/file blas? ( @@ -48,10 +50,10 @@ RDEPEND="${LUA_DEPS} ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) - dev-libs/openssl:0=[-bindist(-)] - pcre2? ( dev-libs/libpcre2:=[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] )" -DEPEND="${RDEPEND}" +" +DEPEND="${RDEPEND} + dev-cpp/doctest +" BDEPEND=" dev-util/ragel virtual/pkgconfig @@ -59,14 +61,14 @@ BDEPEND=" PATCHES=( "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch" - "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-3.2-unbundle-lua.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" ) src_prepare() { cmake_src_prepare - rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die + rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die > cmake/Toolset.cmake || die #827550 @@ -90,7 +92,7 @@ src_configure() { -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) + -DENABLE_PCRE2=ON ) cmake_src_configure }