gentoo resync : 25.05.2018

6 files changed, 119 insertions, 43 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 131221183109..e0e1161f7ef2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/policyd-weight/Manifest b/mail-filter/policyd-weight/Manifest
index f36e4761f570..cbf394edd55a 100644
--- a/mail-filter/policyd-weight/Manifest
+++ b/mail-filter/policyd-weight/Manifest
@@ -1,4 +1,3 @@
-AUX policyd-weight.init.d-r1 357 BLAKE2B 2db3418b0d16a99d523a0460960206f10ed06b8d09ba0079da07097c0941f6a0b557503f3e5fe4c2a16d3e0b7b6bea4964668359bd5b0ed70e453b93b7be645d SHA512 e419b516c914282a4ec34bedb786e88e3cc26caef028f79bd994f31786ca55a6dbf71876ac1b33d3cf4e5411dda8d02ffb61c65c3270a63ab3a0022dbfc8a977
 AUX policyd-weight.init.d-r2 390 BLAKE2B a6d42795a70f9aa75e33e777ab235762932207b51ecc08bee929a3b1aeb5703fb509dd8198becdc00f86834838c099765543f7a14277f3817b086dea05303342 SHA512 1cb3c16c791f50e360ce50af5f5529b72e7b42c4d53df160829e1053ee732ee71563634eb1c6e770d8aadac844d4ce19dc91a48fdf5e37eb0fb5fd2b5cf876e3
 AUX policyd-weight.tmpfile 37 BLAKE2B 3401fc7d784c9d61f216fa46856a6d6e462866eaf80cedb8d51c9f4db89026049833d087c106acbec4c2cd49b878e085567cc93b808fed77423f9f96efe54802 SHA512 8970d2e83191a381fc8dc1efdddcdcc1e1429d39edecc567a9c98693610db7556853f59b944774d876d4acee80acc3254a218583b792880c8985fa0f2879268a
 DIST policyd-weight-0.1.15.2-patches-1.0.tar.xz 6920 BLAKE2B 92bcf7b11dc5e07d5c8f10b9c103ac52b1d8e3449beb6e049311c2360ecb59d8751e35e20453c8dc402b286cf028f44cbdcc8bc45cf202a2af883d8954ae5e51 SHA512 a2d4ecd2ee76180cb6ebb0790a04e4fb101e9e6a73a253b83473ebb8952bc88cc903a8ea51b84743419dd8bc974a8ffc9378a187f8b8b65620268c382aaaa94e
diff --git a/mail-filter/policyd-weight/files/policyd-weight.init.d-r1 b/mail-filter/policyd-weight/files/policyd-weight.init.d-r1
deleted file mode 100644
index 366cd183f9dd..000000000000
--- a/mail-filter/policyd-weight/files/policyd-weight.init.d-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-daemon="policyd-weight"
-exec="/usr/libexec/postfix/policyd-weight"
-
-depend(){
-	before postfix
-	use net
-}
-
-start(){
-	ebegin "Starting ${daemon}"
-	${exec} start
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping ${daemon}"
-	${exec} -k stop
-	eend $?
-}
-
-reload(){
-	ebegin "Reloading ${daemon}"
-	${exec} reload
-	eend $?
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c64b048cf7fe..6a40fb88f0f9 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,9 +6,11 @@ DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbf
 DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899
 DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
 DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf
+DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4
 EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511
 EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118
 EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e
 EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207
-EBUILD rspamd-9999.ebuild 1745 BLAKE2B e433d8893ada66ed50bdf80d31183b3388866b253882f8b69906f54e353de9ffa2b2002e3f66ddbdda6dd7c6a3d48b681f10ff3c1df6fc9bade60ffdb1e12de1 SHA512 73fa228a4f998effbb7f2505e34f4b35d766dccb5335e5d8e76f6f01c6123e68f17fad5767e8d17336328939b1cdb2d9f4f11f76be006d5d0c444b2d082d8e3d
+EBUILD rspamd-1.7.5.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
+EBUILD rspamd-9999.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
 MISC metadata.xml 905 BLAKE2B 2b14bdf8077a435c70da3c7d3c259a457a2defa947674365ea9928b070efecc6e6aac2bfc3663d9125be6c4844e3dda0e79feeb8c96d7cf3495fb16605cbf39b SHA512 16d6df60d418d067d25b0ad42abdc9a0b36b4ac94ef96c3d3c48c725eab09ec59a2e9808a70065714f18eb6c7150ca8379763f0c5e14b04e3ed47c4167fb7e1e
diff --git a/mail-filter/rspamd/rspamd-1.7.5.ebuild b/mail-filter/rspamd/rspamd-1.7.5.ebuild
new file mode 100644
index 000000000000..1a20cc22321c
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.7.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+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
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-util/ragel-7.0
+	sys-apps/file
+	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/.*"
+
+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_GD=$(usex gd ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_TORCH=$(usex torch ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+	fi
+
+	keepdir /var/lib/rspamd
+	keepdir /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-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 6c3a653743ec..1a20cc22321c 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,18 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils user systemd git-r3 pax-utils
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
 
 DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
-EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="fann +gd jemalloc +jit libressl pcre2"
+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= )
@@ -24,10 +36,11 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	dev-libs/libevent
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-util/ragel
+	<dev-util/ragel-7.0
 	sys-apps/file
 	gd? ( media-libs/gd[jpeg] )
-	dev-libs/icu"
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
 DEPEND="dev-util/ragel
 	${RDEPEND}"
 
@@ -46,24 +59,26 @@ src_configure() {
 		-DLOGDIR=/var/log/rspamd
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_FANN=$(usex fann ON OFF)
+		-DENABLE_GD=$(usex gd ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_GD=$(usex gd ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_TORCH=$(usex torch ON OFF)
 	)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init-r2" rspamd
+	newinitd "${FILESDIR}/rspamd.init-r5" 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
+	keepdir /var/lib/rspamd
+	keepdir /var/log/rspamd
 
 	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd