gentoo resync : 29.05.2018

11 files changed, 7 insertions, 302 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e0e1161f7ef2..c35eb222d5d0 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index d1317b296400..9b0b6525dc6a 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,10 +4,8 @@ AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b7
 AUX dcc.initd 3013 BLAKE2B b1ab4903350233bc79113ca3ab9c28f04d6a4f76755d53b583c0111553c1a6964a4e634bc442769f53779cf8d22b94648f6b95f2839ebbfb8f9ffd1af954175a SHA512 67127b752526edda0ef036d4874b73b6dc3d1c13fbcb29f301acccc4cee1dc2dafc32af1f61003cbb2f874b2853aec1075d04e730f90083ae452ad7c5525396c
 AUX dcc.initd-1.3.140 2693 BLAKE2B 4d39ab7127de001308f7c9c4e96fd3d78bc4bb8561e05e2eac349df596765762ba4670904c28dbd926ede065faca54c1e1dde46ecd33e64dd7b7fcd67c8d770b SHA512 70a012699b6a66dfe085a6a77497cc9c2b88b32dee51b1a691a8ed70cb467bb7308bb9ea9594f5582adb23199638401e6454e8760bb293019cd81ab538daf20a
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
-DIST dcc-1.3.140.tar.Z 1681539 BLAKE2B 5e248f59e66d5c55c49655228d740bcb8ec468ba74a1c6bfb78e133d66e32bc4944275139d8fd7c1530b1131d020e3785e8445e33ab522055bc6a55300d78897 SHA512 1c36bb32ae36480ded8306ca6a460a3070758397075cd6a4cee9c01a0e306ad371336037adf7759c8ef96f46b36c408699b7ec43b01268ac8e7c289d1e31d2e1
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
-EBUILD dcc-1.3.140-r1.ebuild 4450 BLAKE2B a7e8d531230170fa40cc7782929e53d01b1d29aabe750ab9d6b920416d5f09047e65eae84cb9d7417e8a51f16acb4609acaaf52b551c0aa027f5eb652f608747 SHA512 6a7dbf51021db45042ffabf96f4082af7cf16541607b5d6780f4bd66c4bd9b860316a84ca69a885a6de2aa05e48f12e2f47080a88c85c0471bb1ca7a8875f804
 EBUILD dcc-1.3.154.ebuild 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
 EBUILD dcc-1.3.158.ebuild 4355 BLAKE2B db260571a46aed8ade1ffcc14ccf3ab77eb729eef6bdac34c92005087e26052793ad53ff355279ef7c7841b4d9d4dfe7124a155a4845828d5abcd64845b487ca SHA512 e74657b3ac0746564ac784de51f21306ec6765408a0ae4c04a09e5c027efad0d80e03430c991f87f03ca91a6fa8e5dbdedb51b32f82dd1e8325e832d62f672e7
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.140-r1.ebuild b/mail-filter/dcc/dcc-1.3.140-r1.ebuild
deleted file mode 100644
index 3f01b15a4b18..000000000000
--- a/mail-filter/dcc/dcc-1.3.140-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Distributed Checksum Clearinghouse"
-HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
-SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
-
-LICENSE="DCC"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="cgi ipv6 rrdtool milter"
-
-RDEPEND="dev-lang/perl
-	rrdtool? ( net-analyzer/rrdtool )
-	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )"
-DEPEND="sys-apps/sed
-	sys-devel/gcc
-	${RDEPEND}"
-
-dcc_cgibin=/var/www/localhost/cgi-bin/dcc
-dcc_homedir=/var/dcc
-dcc_libexec=/usr/sbin
-dcc_man=/usr/share/man
-dcc_rundir=/var/run/dcc
-
-src_prepare() {
-	epatch "${FILESDIR}"/dcc-1.3.140-configure-fix.patch
-}
-
-src_configure() {
-	local myconf
-	myconf="${myconf} --homedir=${dcc_homedir}"
-	myconf="${myconf} --bindir=/usr/bin"
-	myconf="${myconf} --libexecdir=${dcc_libexec}"
-	myconf="${myconf} --mandir=/usr/share/man"
-	myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
-	myconf="${myconf} --with-installroot=${D}"
-	# sigh.  should be DCC-MD5 but see line 486 in the shipped configure script
-	myconf="${myconf} --with-DDC-MD5"
-	myconf="${myconf} --with-uid=root"
-	myconf="${myconf} --enable-server"
-	myconf="${myconf} --enable-dccifd"
-	myconf="${myconf} --with-rundir=${dcc_rundir}"
-	myconf="${myconf} --with-db-memory=64"
-	myconf="${myconf} --with-max-db-mem=128"
-	myconf="${myconf} --with-max-log-size=0"
-	myconf="${myconf} $(use_enable ipv6 IPv6)"
-
-	if use milter ; then
-		myconf="${myconf} --enable-dccm"
-		myconf="${myconf} --with-sendmail="
-	else
-		myconf="${myconf} --disable-dccm"
-	fi
-
-	if use cgi ; then
-		myconf="${myconf} --with-cgibin=${dcc_cgibin}"
-	else
-		myconf="${myconf} --without-cgibin"
-	fi
-
-	einfo "Using config: ${myconf}"
-
-	# This is NOT a normal configure script.
-	./configure ${myconf} || die "configure failed!"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed!"
-}
-
-moveconf() {
-	local into=/etc/dcc/
-	for i in $@; do
-		mv "${D}${dcc_homedir}/${i}" "${D}${into}"
-		dosym "${into}${i}" "${dcc_homedir}/${i}"
-	done
-}
-
-src_install() {
-	# stolen from the RPM .spec and modified for gentoo
-	MANOWN=root MANGRP=root export MANOWN MANGRP
-	BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP
-	DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR
-	DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR
-	DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP
-
-	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
-	if use cgi ; then
-		dodir "${dcc_cgibin}"
-	fi
-	keepdir /var/log/dcc
-
-	# This package now takes "${D}" at compile-time!
-	# make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
-	emake install || die "emake install failed"
-
-	# branding and setting reasonable defaults
-	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
-		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
-		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
-		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
-		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
-		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
-		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
-		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
-		-i "${D}${dcc_homedir}/dcc_conf"
-
-	if use milter ; then
-		# enable milter
-		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
-			"${D}${dcc_homedir}"/dcc_conf
-	fi
-
-	# provide cronjob
-	mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed"
-
-	# clean up
-	mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed"
-
-	statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
-	if ! use rrdtool; then
-		# remove rrdtool interface scripts
-		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
-	fi
-
-	# clean up
-	rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
-
-	# place configuration files into /etc instead of /var/dcc
-	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
-
-	newinitd "${FILESDIR}"/dcc.initd-1.3.140 dcc
-	newconfd "${FILESDIR}"/dcc.confd dcc
-
-	rmdir "${D}"/var/dcc/log/
-
-	dodoc CHANGES RESTRICTIONS
-	dohtml *.html
-	doman *.{0,8}
-}
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 5dffc66e6b07..455ce9b1387c 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,11 +1,6 @@
-AUX 0.8.2-gcc44.patch 709 BLAKE2B 277ee8bd914fa34714a54c37c8f49e8f197234e14df4a57d5c27fe5225b70f9faeb9497549c71b82ad7e46c120dcf76bcdb4a87977dd4ba363d4886f8985f635 SHA512 fa205c8aed42a41adaf7f034f3ebb99e0e0fe10a6b1135cff8c8f8fcf678ababbf5fb7b65ee8f2865404d9b717420f1f23b13c2794f038813d91b3ef7b6c1da9
-AUX 0.8.2-gcc46.patch 530 BLAKE2B f9b35c7aff37be269f54859a9a9adebb9b37710cd1f4b941b38ebc466a6c6c1f42634e65921b962c4227fc97c04c080475cf0f1e7e5ecb7a023fe9de7a73eed6 SHA512 f468f02aa73b6e7262dfbdf52aeb4fb9f14af8198d73b116a9d44d173373e3fc54aa567f0d8c9c38e3a13991a2e0e1fda286e853424cea2388c983773b5671cc
-AUX 0.8.2-openssl-1.patch 297 BLAKE2B 6f025728a77bed4fb5bd7cefb84b61600a152cd115bd1a53f7bf2b3140f76c56e4c4b73d7543499ce42f9266c8b3fecb7f01f636def4356c56be5dfee5e8df09 SHA512 bc3c76861044a50912d26458d026684b21476a94d5b851a587b998bc5cec0a0f89b63f02e2e4ee3fe830e50340ae5eedf8b6b3d719e2555d1f11813417e0fd44
 AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d61c6f859ea66b9300fcb1f889d687d773f368750b87fdaa3e097bc1c66110cbc198534a720f57fc55f47d0b34d600b7bf SHA512 f947dfc76c7bc1213492d1b17574cb6bab56b5210a184c9a8137189402c607d0145ef85041f65d07dd83729913144d7729b11f8ff9d0939159cb419ca0a70aff
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
-DIST mailfilter-0.8.2.tar.gz 382966 BLAKE2B 83051f2b692dfe91865e2c5975a491882f8d167cd038a86e9481ff149be82616fd8be69ed171e8393fc0fff7f602802b0dddd0462a00c0b8cd7c0a3c91ffc2e7 SHA512 fc988fe8e36204e4041ce10d6a87f06c8fd48c311aee0d838c2eec08c0d26c13c082fb44a63e7d9c0610d8be52dbf69e340247241f3c76a209319391969ec387
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
-EBUILD mailfilter-0.8.2.ebuild 755 BLAKE2B 6dbed812f71083d23b5cb6dd6e9bc97fbb1220ebf686b19e992d4d44956163d0e6c1e5e3be4d5efe25579d3742824501ff78b52112226fe2432f4d9a688f630a SHA512 ad758e9c232779001819bf6939b78bb689f4c243aa2a9bbeedefa3dc9ef78bf58de3565489be2c704a97a2830bf478158cc10cec5dd786311c5e0b34fe6232e4
-EBUILD mailfilter-0.8.4.ebuild 627 BLAKE2B 15f1493f92ea5bf063ef6f39088fd94adb20e043d066449a94205be4f7f7efb2a2134ee6a941a1b90d3977150969ee56c8e6d5e90e85524a9a1a99a26609f21f SHA512 a8c53efa4c546c86aad764ed797b0b57c94f77e0a62680bd2c9b9ef1995dcd57c0581cdf21778e21aad76a22facaf899223d507a9261a73c7c8808d2e9a13ab8
+EBUILD mailfilter-0.8.4.ebuild 692 BLAKE2B fb757a9720845de24cace35bcd73c0091ec91bfe849231ca4267941f3e12576da8547f9758acc017b50fe8958fac9c9573af13acfe555128da0d86b5bad348dd SHA512 00e959c7887b7895c9c257ac9c7933b6d20bee71b48ec8072768137f8517ba50c709bbd044ecfa0bbf980027866d0b37edd086dedb1af2dec5fafbbea49d9c1c
 MISC metadata.xml 324 BLAKE2B 53d152511faa79f82e7644c5c191b702f516275c592c6e632577b208c0afab09b1965d2ced2a59a94855990615fa84362ecc8006f1a047fdb2040f3fb3358200 SHA512 3a74aa24b93ab3fc97e9f721991170234e3b04646f1c44fc417083da656473af97bbe13d0fc8a80742a08aba0b798e1666141952cf4fe2d00e43de1a9788dbab
diff --git a/mail-filter/mailfilter/files/0.8.2-gcc44.patch b/mail-filter/mailfilter/files/0.8.2-gcc44.patch
deleted file mode 100644
index f1545d5b9118..000000000000
--- a/mail-filter/mailfilter/files/0.8.2-gcc44.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur mailfilter-0.8.2_orig/src/header.cc mailfilter-0.8.2/src/header.cc
---- mailfilter-0.8.2_orig/src/header.cc	2009-06-07 03:49:57.000000000 +0200
-+++ mailfilter-0.8.2/src/header.cc	2009-08-15 13:05:05.968397778 +0200
-@@ -63,7 +63,6 @@
-    * domain-literal = "[" *(dtext / quoted-pair) "]"
-    */
- 
--  char* dom;
-   unsigned int l, i;
- 
-   if (!msgid || !*msgid)
-@@ -74,12 +73,12 @@
-     return -1;
-   if (msgid[0] != '<' || msgid[l-1] != '>')
-     return -1;
--  if (!(dom = strrchr (msgid, '@')))
-+  if (!(strrchr (msgid, '@')))
-     return -1;
- 
-   /* TODO: complete parser */
-   for (i = 0; i < l; i++)
--    if (msgid[i] > 127)
-+    if ((unsigned char)msgid[i] > 127)
-       return -1;
- 
-   return 0;
diff --git a/mail-filter/mailfilter/files/0.8.2-gcc46.patch b/mail-filter/mailfilter/files/0.8.2-gcc46.patch
deleted file mode 100644
index ef1ebe45ebac..000000000000
--- a/mail-filter/mailfilter/files/0.8.2-gcc46.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix building with gcc-4.6
-
-https://bugs.gentoo.org/show_bug.cgi?id=366191
-
-Part of debian patch by Ricardo Mones <mones@debian.org>
-Fix invalid conversion and addded Ubuntu patch (thanks Ilya Barygin <barygin@gmail.com>)
-
---- a/src/preferences.cc
-+++ b/src/preferences.cc
-@@ -82,8 +82,8 @@
- 
- void Preferences :: init (void)
- {
--  ((Size_score)(Preferences :: size_score)).score = 0;
--  ((Size_score)(Preferences :: size_score)).size  = 0;
-+  size_score.score = 0;
-+  size_score.size  = 0;
- }
-   
- void Preferences :: kill (void)
diff --git a/mail-filter/mailfilter/files/0.8.2-openssl-1.patch b/mail-filter/mailfilter/files/0.8.2-openssl-1.patch
deleted file mode 100644
index ad58bbb561f8..000000000000
--- a/mail-filter/mailfilter/files/0.8.2-openssl-1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/330717
-
---- src/socket.cc
-+++ src/socket.cc
-@@ -64,7 +64,11 @@
- #ifdef USE_SSL
-   SSL*        ssl;
-   BIO*        sbio;
-+  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+  const SSL_METHOD* ssl_meth;
-+  #else
-   SSL_METHOD* ssl_meth;
-+  #endif
-   SSL_CTX*    ssl_ctx;
- #endif
- 
diff --git a/mail-filter/mailfilter/mailfilter-0.8.2.ebuild b/mail-filter/mailfilter/mailfilter-0.8.2.ebuild
deleted file mode 100644
index cc215d4cc7ed..000000000000
--- a/mail-filter/mailfilter/mailfilter-0.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-HOMEPAGE="http://mailfilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-devel/flex"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.8.2-gcc44.patch \
-		"${FILESDIR}"/0.8.2-openssl-1.patch \
-		"${FILESDIR}"/${PV}-gcc46.patch
-}
-
-src_compile() {
-	emake -j1 || die #281069
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc INSTALL doc/FAQ "${FILESDIR}"/rcfile.example{1,2} \
-		README THANKS ChangeLog AUTHORS NEWS || die
-}
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index 966916901d05..5a6a30d45f7d 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -10,10 +10,14 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="+ssl"
+IUSE="libressl +ssl"
 
 DEPEND="sys-devel/flex
-	ssl? ( dev-libs/openssl:* )"
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+)"
+
 RDEPEND=""
 
 PATCHES=( "${FILESDIR}"/0.8.4-fix-parallel-build.patch )
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 6a40fb88f0f9..9d574632ef11 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,4 @@
 AUX 1.6.6-dont-send-reject-message-after-set-reply.patch 3437 BLAKE2B ff628f61ed78de3cada4aa0e5b85d33eedda3c40e932aa6dd07970949f92e3dede78ec8592e57658dbb99b28422c4eaf60d4c4443470f721664fc0fbbb156e1c SHA512 4a66760909633601bb1ec91881cb6a3cde9fc66ffbaa31692d6847d088d661053f3294e3597c2a44bddb8b0a2f38175dba03ab1510ff420f3395087114a28486
-AUX rspamd.init-r2 1030 BLAKE2B 5383f805b73aec7501c1d9d152d336a2f55de87968929b736b787847f4251734fb35d59c4c77861e5f0235d99a97595a4fba694780ceb2a897eef2cb1eb7212c SHA512 6419e21253ee98aa0a5ee44e750f9473b8688d79e460866b23a153a76949e20fee114f1b58dbce90b46dc758636af8591e2bae6abe0c513c889025564582351f
 AUX rspamd.init-r5 993 BLAKE2B bce51947c56f4f61aeb24365b37fcbf89b3cf919fa355c6055691684420458bce4e7ab1c30012b849e0be50785be54785b5984fe46104c3312cf6421cbc46659 SHA512 a51e13e344a67436ba377ed5b5f5516895f7b0a87571dd1d8391fbc4db5794e98e609672f103f997d6c13aded81595ac4e0c4f315e7c23a79408d0dc680930a5
 AUX rspamd.logrotate 258 BLAKE2B 14a006d8768adc90b0b186e652c5516f4a983149fa10722545c8376d93f8333825a072906ac964b9f4c25c9165c001e1daf493c8a7e19cfe97ce5b8a6afcba85 SHA512 159e048552cc86b9e15b7dc826ee772a1d9be5cfe588b2025ffee7a8944e5f1af63f6512379efd9f0cca450a48f536babd6845812733060d087801ee5fd75770
 DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbfe90dbb0cbf34c5ad6c42c80d6ea142f11c7632763d7f9e4155a4521274f2d5a26a77dfbdab9f585bb1e3fff5f SHA512 789abc994cf96a0d88662e14f0e77f95f5c7c7bd1f808ffd64af21cf73cef643b5aee4c1f066d81d04e79d6bb7f72f12095ff08d8515a40bcca23153715fc9f1
diff --git a/mail-filter/rspamd/files/rspamd.init-r2 b/mail-filter/rspamd/files/rspamd.init-r2
deleted file mode 100644
index bf6f9ca8bcfe..000000000000
--- a/mail-filter/rspamd/files/rspamd.init-r2
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-RUNDIR=/var/run/rspamd
-PIDFILE=$RUNDIR/rspamd.pid
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
-		|| return 1
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-
-	mkdir -m0750 -p $RUNDIR
-	chown rspamd:rspamd $RUNDIR
-	chmod g+s $RUNDIR
-	rm -f $RUNDIR/$SVCNAME.sock
-
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE
-	eend $?
-}