From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1053694-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 441B0138334
	for <garchives@archives.gentoo.org>; Mon, 22 Oct 2018 12:56:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DA7E7E0819;
	Mon, 22 Oct 2018 12:56:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 A8D5AE0819
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 12:56:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 D61B6335CFD
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 12:56:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 604A13F0
	for <gentoo-commits@lists.gentoo.org>; Mon, 22 Oct 2018 12:56:25 +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: <1540212821.2a83bb6d12bebbcf671a54f65ed7f8b072dfb8ce.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.8.1.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: 2a83bb6d12bebbcf671a54f65ed7f8b072dfb8ce
X-VCS-Branch: master
Date: Mon, 22 Oct 2018 12:56:25 +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: 8d61ba9f-a416-4d0e-871e-d5d597d926ef
X-Archives-Hash: da11f8d306e2ebcbb9b25939e81a970a

commit:     2a83bb6d12bebbcf671a54f65ed7f8b072dfb8ce
Author:     Christian Roessner <c <AT> roessner-network-solutions <DOT> com>
AuthorDate: Thu Oct 18 14:13:44 2018 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 12:53:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a83bb6d

mail-filter/rspamd: Version bump to 1.8.1

Signed-off-by: Christian Roessner <c <AT> roessner-network-solutions.com>
Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org>

 mail-filter/rspamd/Manifest                        |  1 +
 .../{rspamd-9999.ebuild => rspamd-1.8.1.ebuild}    | 35 ++++++++++------------
 mail-filter/rspamd/rspamd-9999.ebuild              | 35 ++++++++++------------
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 40bdb27cc26..2223d7172bb 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,3 +6,4 @@ DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb73427
 DIST rspamd-1.7.7.tar.gz 4534430 BLAKE2B 83ba39b80293bf87f397e6b1b1cbec27e7c44f096a148b6d29c641d10b607b616865ec54c1a88dc55f620b17e8c69bcf8690ee509d1b9a517a923fe0afc08b70 SHA512 7436848b3fc0e2ef90dcc54b48c1c95d6a7753175f484297de2e77bd117a9858da09b2a50f8692f210e48421b604ef465311b97197b473823a87ac74337d7752
 DIST rspamd-1.7.8.tar.gz 4542955 BLAKE2B 78fbb01c51d290f8d88f4c512df248fcbc8e28e00a820ba0d3dc22adf4bb1b54b1923aa5306fde5d4d75c81a9304f220608a6cec3f1077bbb9adfa1ea8bdc2a4 SHA512 43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea226c4fd519a26397b9e9e8c8de3951e5a9752e010eabf1b3733a0c3e3086c2
 DIST rspamd-1.7.9.tar.gz 4557492 BLAKE2B f42775ba8157ef4815331c304e3030c522e9ae5e10ef0194da0c7dde105b40fed2ae84b063d78aed37992146311aecc1ac77f64dacdaf3ff11bb85076e8aef7c SHA512 d11d8c03668b85feae665ed491cd156c7430fbad30f42fe44103ea3c3a8bc988e5f8981e784e8f31aa35ba1ff9f7abd23605638e4ee3086a056b22fb3109563e
+DIST rspamd-1.8.1.tar.gz 4286637 BLAKE2B dd202a2f3dab4ef459d978e06231f8fcef3724ea5912c7455d553dc04e2744322b9144ba05a2f6f22a7eb58cd0a967f213bfc76fb273b5425036a5042975ed89 SHA512 98c2d909b7dc19f1c431d4e64444968092a10630ef238d3c8cc2825e7b2d92bee893bc7f9c431f3a6337ef2af4d2a157f0584e7b13fba0540660d7c853bc25cc

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-1.8.1.ebuild
similarity index 85%
copy from mail-filter/rspamd/rspamd-9999.ebuild
copy to mail-filter/rspamd/rspamd-1.8.1.ebuild
index e4b16db1465..40d3b529082 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-1.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
 fi
 
-inherit cmake-utils user systemd pax-utils ${SCM}
+inherit cmake-utils pax-utils systemd user ${SCM}
 
 DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
@@ -26,26 +26,23 @@ SLOT="0"
 IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
 REQUIRED_USE="torch? ( jit )"
 
-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
-	net-libs/libnsl
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
-	<dev-util/ragel-7.0
+	dev-libs/icu:=
+	dev-libs/libevent:=
+	net-libs/libnsl
 	sys-apps/file
+	<dev-util/ragel-7.0
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	fann? ( sci-mathematics/fann )
 	gd? ( media-libs/gd[jpeg] )
-	dev-libs/icu
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
-DEPEND="dev-util/ragel
-	${RDEPEND}"
-
-QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( dev-lang/luajit:2 )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	enewgroup rspamd
@@ -75,7 +72,7 @@ src_install() {
 
 	# Remove mprotect for JIT support
 	if use jit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
 	fi
 
 	keepdir /var/lib/rspamd

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index e4b16db1465..40d3b529082 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
 fi
 
-inherit cmake-utils user systemd pax-utils ${SCM}
+inherit cmake-utils pax-utils systemd user ${SCM}
 
 DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
@@ -26,26 +26,23 @@ SLOT="0"
 IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
 REQUIRED_USE="torch? ( jit )"
 
-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
-	net-libs/libnsl
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
-	<dev-util/ragel-7.0
+	dev-libs/icu:=
+	dev-libs/libevent:=
+	net-libs/libnsl
 	sys-apps/file
+	<dev-util/ragel-7.0
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	fann? ( sci-mathematics/fann )
 	gd? ( media-libs/gd[jpeg] )
-	dev-libs/icu
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
-DEPEND="dev-util/ragel
-	${RDEPEND}"
-
-QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( dev-lang/luajit:2 )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	enewgroup rspamd
@@ -75,7 +72,7 @@ src_install() {
 
 	# Remove mprotect for JIT support
 	if use jit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
 	fi
 
 	keepdir /var/lib/rspamd