Gentoo Archives: gentoo-commits

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
Date: Mon, 22 Oct 2018 12:56:31
Message-Id: 1540212821.2a83bb6d12bebbcf671a54f65ed7f8b072dfb8ce.djc@gentoo
1 commit: 2a83bb6d12bebbcf671a54f65ed7f8b072dfb8ce
2 Author: Christian Roessner <c <AT> roessner-network-solutions <DOT> com>
3 AuthorDate: Thu Oct 18 14:13:44 2018 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 12:53:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a83bb6d
7
8 mail-filter/rspamd: Version bump to 1.8.1
9
10 Signed-off-by: Christian Roessner <c <AT> roessner-network-solutions.com>
11 Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org>
12
13 mail-filter/rspamd/Manifest | 1 +
14 .../{rspamd-9999.ebuild => rspamd-1.8.1.ebuild} | 35 ++++++++++------------
15 mail-filter/rspamd/rspamd-9999.ebuild | 35 ++++++++++------------
16 3 files changed, 33 insertions(+), 38 deletions(-)
17
18 diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
19 index 40bdb27cc26..2223d7172bb 100644
20 --- a/mail-filter/rspamd/Manifest
21 +++ b/mail-filter/rspamd/Manifest
22 @@ -6,3 +6,4 @@ DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb73427
23 DIST rspamd-1.7.7.tar.gz 4534430 BLAKE2B 83ba39b80293bf87f397e6b1b1cbec27e7c44f096a148b6d29c641d10b607b616865ec54c1a88dc55f620b17e8c69bcf8690ee509d1b9a517a923fe0afc08b70 SHA512 7436848b3fc0e2ef90dcc54b48c1c95d6a7753175f484297de2e77bd117a9858da09b2a50f8692f210e48421b604ef465311b97197b473823a87ac74337d7752
24 DIST rspamd-1.7.8.tar.gz 4542955 BLAKE2B 78fbb01c51d290f8d88f4c512df248fcbc8e28e00a820ba0d3dc22adf4bb1b54b1923aa5306fde5d4d75c81a9304f220608a6cec3f1077bbb9adfa1ea8bdc2a4 SHA512 43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea226c4fd519a26397b9e9e8c8de3951e5a9752e010eabf1b3733a0c3e3086c2
25 DIST rspamd-1.7.9.tar.gz 4557492 BLAKE2B f42775ba8157ef4815331c304e3030c522e9ae5e10ef0194da0c7dde105b40fed2ae84b063d78aed37992146311aecc1ac77f64dacdaf3ff11bb85076e8aef7c SHA512 d11d8c03668b85feae665ed491cd156c7430fbad30f42fe44103ea3c3a8bc988e5f8981e784e8f31aa35ba1ff9f7abd23605638e4ee3086a056b22fb3109563e
26 +DIST rspamd-1.8.1.tar.gz 4286637 BLAKE2B dd202a2f3dab4ef459d978e06231f8fcef3724ea5912c7455d553dc04e2744322b9144ba05a2f6f22a7eb58cd0a967f213bfc76fb273b5425036a5042975ed89 SHA512 98c2d909b7dc19f1c431d4e64444968092a10630ef238d3c8cc2825e7b2d92bee893bc7f9c431f3a6337ef2af4d2a157f0584e7b13fba0540660d7c853bc25cc
27
28 diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-1.8.1.ebuild
29 similarity index 85%
30 copy from mail-filter/rspamd/rspamd-9999.ebuild
31 copy to mail-filter/rspamd/rspamd-1.8.1.ebuild
32 index e4b16db1465..40d3b529082 100644
33 --- a/mail-filter/rspamd/rspamd-9999.ebuild
34 +++ b/mail-filter/rspamd/rspamd-1.8.1.ebuild
35 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
36 EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
37 fi
38
39 -inherit cmake-utils user systemd pax-utils ${SCM}
40 +inherit cmake-utils pax-utils systemd user ${SCM}
41
42 DESCRIPTION="Rapid spam filtering system"
43 HOMEPAGE="https://github.com/vstakhov/rspamd"
44 @@ -26,26 +26,23 @@ SLOT="0"
45 IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
46 REQUIRED_USE="torch? ( jit )"
47
48 -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
49 - libressl? ( dev-libs/libressl:0= )
50 - fann? ( sci-mathematics/fann )
51 - pcre2? ( dev-libs/libpcre2[jit=] )
52 - !pcre2? ( dev-libs/libpcre[jit=] )
53 - jit? ( dev-lang/luajit:2 )
54 - jemalloc? ( dev-libs/jemalloc )
55 - dev-libs/libevent
56 - net-libs/libnsl
57 - dev-db/sqlite:3
58 +RDEPEND="dev-db/sqlite:3
59 dev-libs/glib:2
60 - <dev-util/ragel-7.0
61 + dev-libs/icu:=
62 + dev-libs/libevent:=
63 + net-libs/libnsl
64 sys-apps/file
65 + <dev-util/ragel-7.0
66 + cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
67 + fann? ( sci-mathematics/fann )
68 gd? ( media-libs/gd[jpeg] )
69 - dev-libs/icu
70 - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
71 -DEPEND="dev-util/ragel
72 - ${RDEPEND}"
73 -
74 -QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
75 + jemalloc? ( dev-libs/jemalloc )
76 + jit? ( dev-lang/luajit:2 )
77 + !libressl? ( dev-libs/openssl:0=[-bindist] )
78 + libressl? ( dev-libs/libressl:0= )
79 + pcre2? ( dev-libs/libpcre2[jit=] )
80 + !pcre2? ( dev-libs/libpcre[jit=] )"
81 +DEPEND="${RDEPEND}"
82
83 pkg_setup() {
84 enewgroup rspamd
85 @@ -75,7 +72,7 @@ src_install() {
86
87 # Remove mprotect for JIT support
88 if use jit; then
89 - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
90 + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
91 fi
92
93 keepdir /var/lib/rspamd
94
95 diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
96 index e4b16db1465..40d3b529082 100644
97 --- a/mail-filter/rspamd/rspamd-9999.ebuild
98 +++ b/mail-filter/rspamd/rspamd-9999.ebuild
99 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
100 EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
101 fi
102
103 -inherit cmake-utils user systemd pax-utils ${SCM}
104 +inherit cmake-utils pax-utils systemd user ${SCM}
105
106 DESCRIPTION="Rapid spam filtering system"
107 HOMEPAGE="https://github.com/vstakhov/rspamd"
108 @@ -26,26 +26,23 @@ SLOT="0"
109 IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
110 REQUIRED_USE="torch? ( jit )"
111
112 -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
113 - libressl? ( dev-libs/libressl:0= )
114 - fann? ( sci-mathematics/fann )
115 - pcre2? ( dev-libs/libpcre2[jit=] )
116 - !pcre2? ( dev-libs/libpcre[jit=] )
117 - jit? ( dev-lang/luajit:2 )
118 - jemalloc? ( dev-libs/jemalloc )
119 - dev-libs/libevent
120 - net-libs/libnsl
121 - dev-db/sqlite:3
122 +RDEPEND="dev-db/sqlite:3
123 dev-libs/glib:2
124 - <dev-util/ragel-7.0
125 + dev-libs/icu:=
126 + dev-libs/libevent:=
127 + net-libs/libnsl
128 sys-apps/file
129 + <dev-util/ragel-7.0
130 + cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
131 + fann? ( sci-mathematics/fann )
132 gd? ( media-libs/gd[jpeg] )
133 - dev-libs/icu
134 - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
135 -DEPEND="dev-util/ragel
136 - ${RDEPEND}"
137 -
138 -QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
139 + jemalloc? ( dev-libs/jemalloc )
140 + jit? ( dev-lang/luajit:2 )
141 + !libressl? ( dev-libs/openssl:0=[-bindist] )
142 + libressl? ( dev-libs/libressl:0= )
143 + pcre2? ( dev-libs/libpcre2[jit=] )
144 + !pcre2? ( dev-libs/libpcre[jit=] )"
145 +DEPEND="${RDEPEND}"
146
147 pkg_setup() {
148 enewgroup rspamd
149 @@ -75,7 +72,7 @@ src_install() {
150
151 # Remove mprotect for JIT support
152 if use jit; then
153 - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
154 + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
155 fi
156
157 keepdir /var/lib/rspamd