mail-filter/rspamd: clean old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/15198
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bf68858b2d91935e1a429404ffa99ad6658af015..c1caf263ac803087ad49b5b524c9fe64cbce070b 100644 (file)
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,3 @@
-DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
-DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
 DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
 DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca SHA512 47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08
 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540

diff --git a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
deleted file mode 100644 (file)
index 578d3da..0000000
--- a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake
-index 3dd774511..b8f83a3bb 100644
---- a/cmake/Hyperscan.cmake
-+++ b/cmake/Hyperscan.cmake
-@@ -1,8 +1,8 @@
- option (ENABLE_HYPERSCAN    "Enable hyperscan for fast regexp processing [default: OFF]" OFF)
- 
- if (ENABLE_HYPERSCAN MATCHES "ON")
--    if (NOT "${ARCH}" STREQUAL "x86_64")
--        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64 architecture")
-+    if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
-+        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386 architectures")
-     endif ()
-     ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
-             hs include/hs

diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild
deleted file mode 100644 (file)
index b5ff98b..0000000
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-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 libressl pcre2"
-
-RDEPEND="
-       acct-group/rspamd
-       acct-user/rspamd
-       dev-db/sqlite:3
-       dev-libs/glib:2
-       dev-libs/icu:=
-       dev-libs/libev
-       net-libs/libnsl
-       sys-apps/file
-       dev-util/ragel
-       dev-libs/libsodium
-       blas? ( sci-libs/openblas )
-       cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( dev-lang/luajit:2 )
-       !jit? ( dev-lang/lua:* )
-       !libressl? ( dev-libs/openssl:0=[-bindist] )
-       libressl? ( dev-libs/libressl:0= )
-       pcre2? ( dev-libs/libpcre2[jit=] )
-       !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
-               || die "sed CMakeLists.txt failed"
-       sed -i -e 's/User=_rspamd/User=rspamd/g' \
-               rspamd.service \
-               || die
-}
-
-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_PCRE2=$(usex pcre2 ON OFF)
-               -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-               -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-       )
-       cmake-utils_src_configure
-}
-
-src_test() {
-       cmake-utils_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       newconfd "${FILESDIR}"/rspamd.conf rspamd
-       newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-       systemd_newunit rspamd.service rspamd.service
-
-       newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-       # Remove mprotect for JIT support
-       if use jit; then
-               pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-       diropts -o rspamd -g rspamd
-       keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-       tmpfiles_process "${PN}.conf"
-}

diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild
deleted file mode 100644 (file)
index ffab3a9..0000000
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-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 libressl pcre2"
-
-RDEPEND="
-       acct-group/rspamd
-       acct-user/rspamd
-       dev-db/sqlite:3
-       dev-libs/glib:2
-       dev-libs/icu:=
-       dev-libs/libev
-       dev-libs/libsodium
-       dev-util/ragel
-       net-libs/libnsl
-       sys-apps/file
-       blas? ( sci-libs/openblas )
-       cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( dev-lang/luajit:2 )
-       !jit? ( dev-lang/lua:* )
-       !libressl? ( dev-libs/openssl:0=[-bindist] )
-       libressl? ( dev-libs/libressl:0= )
-       pcre2? ( dev-libs/libpcre2[jit=] )
-       !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-i386-hyperscan.patch" )
-
-src_prepare() {
-       cmake_src_prepare
-
-       sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
-               || die "sed CMakeLists.txt failed"
-       sed -i -e 's/User=_rspamd/User=rspamd/g' \
-               rspamd.service \
-               || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCONFDIR=/etc/rspamd
-               -DRUNDIR=/var/run/rspamd
-               -DDBDIR=/var/lib/rspamd
-               -DLOGDIR=/var/log/rspamd
-               -DENABLE_BLAS=$(usex blas ON OFF)
-               -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-               -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-               -DENABLE_LUAJIT=$(usex jit ON OFF)
-               -DENABLE_PCRE2=$(usex pcre2 ON OFF)
-       )
-       cmake_src_configure
-}
-
-src_test() {
-       cmake_src_test
-}
-
-src_install() {
-       cmake_src_install
-
-       newconfd "${FILESDIR}"/rspamd.conf rspamd
-       newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-       systemd_newunit rspamd.service rspamd.service
-
-       newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-       # Remove mprotect for JIT support
-       if use jit; then
-               pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-       diropts -o rspamd -g rspamd
-       keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-       tmpfiles_process "${PN}.conf"
-}