mail-filter/rspamd: version bump to 1.5.1

4 files changed, 4 insertions, 79 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 57f6ee31aeac..5a576292ef28 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-1.4.2.tar.xz 1777596 SHA256 d106f98a632ffc5cbc5e7482067d568db7687a2ffb078f97f528f9202f90a5a1 SHA512 7a2c9c736d6612088eb8d48e313feec310c740263aa3a5e30b1ae88937ecf088de533589a8ef783e238fe3dc5e579592220bd86ea0e45672bd3fc06c52f96782 WHIRLPOOL b39e81a6ddbc7f639db9373116f48ca30c031f76c888945f30d5578289d62270f649b29004ffa937549b9d529973f52ad802bd23f42130cd67fb6949e296a57f
-DIST rspamd-1.4.3.tar.xz 1780104 SHA256 144cddc25ce8d8519b289d2c00d34b37c931f3c7293e2b0d16c408680021a1bf SHA512 bae86953d881be446f049384cc8bf8451b04619b461a7e2d571407d5af5f2547af8bc9db578e84190e8c55d01f9e32ea1d29e998daa2bbb2fac431ed50df27ca WHIRLPOOL 82e3d7254e1def62fc503f0b9ead0274cc26ecd973b114210c9dd37556c08bfd3922ece4d2063c1158bad151619c323814db216ff39009b40f7e27e3d6375898
 DIST rspamd-1.4.4.tar.xz 1780816 SHA256 51342639dd1e50b235ae7fb2e877dee1d5b90c8102ce7ff817545fa0fb6ebc6d SHA512 df2260de6585699a5b6692aa210647270b7132372ae6a2437f8532265018fe4db8270a8989ce0c0664cad17cbc281ae92f935c4f0974dc2f8da309e54c234b14 WHIRLPOOL 1f5f19b57c571fe07a843ae738f5cc60411040dbabb965163e6ed25668cd590f0da99256f83165d6cd14a1715914a16a6cd5a99125093a294fbfa2bc89ce155c
+DIST rspamd-1.5.1.tar.xz 1846668 SHA256 18e0f15d0121c3971cd11e7db1e15c0634289b1493b88656088fed0db92bc220 SHA512 f786693d2333c6ef074926cc148e7654637d23673271c264f594da9f69734cf97f68938880ab92a76c4beb2ba80697ff5d134110ae05faf53195f10145a2bd6c WHIRLPOOL 1d9252a4befc6228a30717439963d97d2ea016d677e32ade14a484d0106482a8a3e4aeb993c729a9d52b20de1fae01997150dcafd04961b012a9bcc4932d1a66
diff --git a/mail-filter/rspamd/rspamd-1.4.2.ebuild b/mail-filter/rspamd/rspamd-1.4.2.ebuild
deleted file mode 100644
index 9d95e6809a6f..000000000000
--- a/mail-filter/rspamd/rspamd-1.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils pax-utils user systemd
-
-DESCRIPTION="Rapid spam filtering system"
-SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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=] )
-	jit? ( dev-lang/luajit:2 )
-	jemalloc? ( dev-libs/jemalloc )
-	dev-libs/libevent
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gmime
-	dev-util/ragel
-	sys-apps/file
-	virtual/libiconv"
-DEPEND="dev-util/ragel
-	${RDEPEND}"
-
-QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
-
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_LUAJIT=$(usex jit ON OFF)
-		-DENABLE_FANN=$(usex fann ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init-r2" rspamd
-
-	# Remove mprotect for JIT support
-	if use jit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
-	fi
-
-	dodir /var/lib/rspamd
-	dodir /var/log/rspamd
-
-	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/rspamd.logrotate" rspamd
-
-	systemd_newunit rspamd.service rspamd.service
-}
diff --git a/mail-filter/rspamd/rspamd-1.4.3.ebuild b/mail-filter/rspamd/rspamd-1.5.1.ebuild
index 5529ba7a66ed..cdfe5d6635cb 100644
--- a/mail-filter/rspamd/rspamd-1.4.3.ebuild
+++ b/mail-filter/rspamd/rspamd-1.5.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/vstakhov/rspamd"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fann jemalloc +jit libressl pcre2"
+IUSE="fann +gd jemalloc +jit libressl pcre2"
 
 RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
@@ -24,10 +24,10 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	dev-libs/libevent
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/gmime
 	<dev-util/ragel-7.0
 	sys-apps/file
-	virtual/libiconv"
+	gd? ( media-libs/gd[jpeg] )
+	dev-libs/icu"
 DEPEND="dev-util/ragel
 	${RDEPEND}"
 
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index e13cf2f26c54..6c3a653743ec 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -26,7 +26,6 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	dev-libs/glib:2
 	dev-util/ragel
 	sys-apps/file
-	virtual/libiconv
 	gd? ( media-libs/gd[jpeg] )
 	dev-libs/icu"
 DEPEND="dev-util/ragel