From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-921969-garchives=archives.gentoo.org@lists.gentoo.org>
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 ECC57139085
for <garchives@archives.gentoo.org>; Sun, 8 Jan 2017 08:37:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1B7C1E0CB8;
Sun, 8 Jan 2017 08:37:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DF46BE0CB8
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AB190341229
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D7AA52622
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:11 +0000 (UTC)
From: "Dirkjan Ochtman" <djc@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, "Dirkjan Ochtman" <djc@gentoo.org>
Message-ID: <1483864564.6f9483bb00abf01a13bec7cf2d9c5ff69b9b7ee9.djc@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/rspamd/Manifest mail-filter/rspamd/rspamd-1.4.2.ebuild mail-filter/rspamd/rspamd-9999.ebuild
X-VCS-Directories: mail-filter/rspamd/
X-VCS-Committer: djc
X-VCS-Committer-Name: Dirkjan Ochtman
X-VCS-Revision: 6f9483bb00abf01a13bec7cf2d9c5ff69b9b7ee9
X-VCS-Branch: master
Date: Sun, 8 Jan 2017 08:37:11 +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-Archives-Salt: b33d5e97-7deb-401b-bdb2-ce89bd711375
X-Archives-Hash: 14ab9144ff9b9cb138d3b3b90fcccba3
commit: 6f9483bb00abf01a13bec7cf2d9c5ff69b9b7ee9
Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 08:34:56 2017 +0000
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 08:36:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9483bb
mail-filter/rspamd: clean up formatting some more
Package-Manager: portage-2.3.0
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-1.4.2.ebuild | 12 +++-------
mail-filter/rspamd/rspamd-9999.ebuild | 40 +++++++++++++++-------------------
3 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index ae5b36c..9a440db 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-1.3.5.tar.xz 1483044 SHA256 d4413ccfc238c3023e2b8a9441b101a6437f521f333fc9db2dd924d473fee696 SHA512 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c WHIRLPOOL 4017484d4653a23b5a987ab0bdd40a709cd5d116dea5c02a767c5cad94bd5399d6319aa8f75e726cec5d0bd7ae9e0722786cacc33963e2f9b8fbdd0fb0986729
DIST rspamd-1.4.0.tar.xz 1769860 SHA256 30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c SHA512 39bfccee070b829f3ea5019ebde0020a850abf7fe92f7e5bb5b9212088d4c98544e6f55228984d3422c09c31f356b209237da6a6eb9c18e3feb7940429de663a WHIRLPOOL 449a15148067e4af38ca7d4218dca69064679d1a064c53d0edf99e63418d6a898fd80cdfce8707f706f19da659d44efadedab3a7ea8c3dcd54c65794f695e3d0
DIST rspamd-1.4.1.tar.xz 1779492 SHA256 11e39e4b44a85feaf546696d28a72ffc32e35c01a028a251d5175ba58343eb28 SHA512 bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d WHIRLPOOL 1cbe02c664596cd467f2f955691ec79c70ccf23a89cadf8853a1881264d555af248a1503a58da1df59142c73193074af556ca768aad349b832b95314f61615d5
+DIST rspamd-1.4.2.tar.xz 1777596 SHA256 d106f98a632ffc5cbc5e7482067d568db7687a2ffb078f97f528f9202f90a5a1 SHA512 7a2c9c736d6612088eb8d48e313feec310c740263aa3a5e30b1ae88937ecf088de533589a8ef783e238fe3dc5e579592220bd86ea0e45672bd3fc06c52f96782 WHIRLPOOL b39e81a6ddbc7f639db9373116f48ca30c031f76c888945f30d5578289d62270f649b29004ffa937549b9d529973f52ad802bd23f42130cd67fb6949e296a57f
diff --git a/mail-filter/rspamd/rspamd-1.4.2.ebuild b/mail-filter/rspamd/rspamd-1.4.2.ebuild
index 9d67152..af049b0 100644
--- a/mail-filter/rspamd/rspamd-1.4.2.ebuild
+++ b/mail-filter/rspamd/rspamd-1.4.2.ebuild
@@ -18,16 +18,10 @@ IUSE="fann jemalloc +jit libressl pcre2"
RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
fann? ( sci-mathematics/fann )
- pcre2? (
- dev-libs/libpcre2[jit=]
- )
- !pcre2? (
- dev-libs/libpcre[jit=]
- )
+ pcre2? ( dev-libs/libpcre2[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )
jit? ( dev-lang/luajit:2 )
- jemalloc? (
- dev-libs/jemalloc
- )
+ jemalloc? ( dev-libs/jemalloc )
dev-libs/libevent
dev-db/sqlite:3
dev-libs/glib:2
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 379939d..fd5281e 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -13,30 +13,24 @@ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="fann +gd pcre2 +jit jemalloc libressl"
+IUSE="fann +gd jemalloc +jit libressl pcre2"
-RDEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
- libressl? ( dev-libs/libressl:0 )
- fann? ( sci-mathematics/fann )
- pcre2? (
- dev-libs/libpcre2[jit=]
- )
- !pcre2? (
- dev-libs/libpcre[jit=]
- )
- jit? ( dev-lang/luajit:2 )
- jemalloc? (
- dev-libs/jemalloc
- )
- dev-libs/libevent
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-util/ragel
- sys-apps/file
- virtual/libiconv
- gd? ( media-libs/gd[jpeg] )"
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ fann? ( sci-mathematics/fann )
+ pcre2? ( dev-libs/libpcre2[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ jit? ( dev-lang/luajit:2 )
+ jemalloc? ( dev-libs/jemalloc )
+ dev-libs/libevent
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-util/ragel
+ sys-apps/file
+ virtual/libiconv
+ gd? ( media-libs/gd[jpeg] )"
DEPEND="dev-util/ragel
- ${RDEPEND}"
+ ${RDEPEND}"
QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
@@ -53,9 +47,9 @@ src_configure() {
-DLOGDIR=/var/log/rspamd
-DENABLE_LUAJIT=$(usex jit ON OFF)
-DENABLE_FANN=$(usex fann ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+ -DENABLE_GD=$(usex gd ON OFF)
)
cmake-utils_src_configure
}