gentoo resync : 05.04.2018

7 files changed, 38 insertions, 8 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index d633f9049a0b..4bc63db5c3b8 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 18e6d4b968f5..b1622c644f3f 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,10 +1,11 @@
 AUX amavisd-milter-1.6.0-policybank.patch 937 BLAKE2B 54cd7ffbbdc0396874a3fb8672a62974945ccbe5e18e15ddffccc7f9f83cac3ec0e92a1ce5b83b0ee94903f56831bfdeecb2f879cd495820d84b87fe973c671b SHA512 a329e9b4e0c7b7de4b2b09ec8cf9f9157f7602761843278239530831673bd70e4a15cc5b3ec91700808de6a6a29baa00ea2f96d6c40736da27c7cb4fc059af4d
 AUX amavisd-milter.confd 357 BLAKE2B 4c584ef42c9c1f135160d574dabed9882978930ddf1051161ca7a8ac64a926390ce3aa693957b786cf0f8e83a41b325574c4a19e82b638c2f96726e335ae654d SHA512 354c7e1a0224bd0f8bd40e35dca99fc5c489f9b7ecc2292d992e5594ac969800ab19e99a784957bcc76e3b06788b0623fc5019d8965f002a67c3e01681c541de
 AUX amavisd-milter.initd 678 BLAKE2B 75c31115806da7e9f7fd2746e26cd2ebff55edec6611349f2321e99eba7588a69f005ce810595aad2e70bc54576ff870184974bd6bb91af6e3924fb955387499 SHA512 017cc4e2461b524768f2c7f69a1d16b99c08ebf39d024913e79e5ffb2033a2dbd5eb64cedb3b9e370a0143256fdb17652492385f996f0dbe4baaaa96557a16c6
+AUX amavisd-milter.initd-r1 679 BLAKE2B c6d8d8a8b23c01923e2909f5b58cc8228ac693d210a6bd65d9048aa9ac40dadcfb74bb67eded81315fb4c8545bbc652c90e3db1d61f733d1687deb58795f152d SHA512 c043d41da85b206705c5e58204904b30d2076d9563ca52cac60b31eb9638f4574e5b0b771e43e74e83af1f417944ed737f10699a82933cfbee07e9d69a529695
 DIST amavisd-milter-1.5.0.tar.gz 175759 BLAKE2B c9de40eadbfca71a3a35c340372163ed7b685ff7150cdb85ab073cc78abcbc5dfb5fcaccc0b1518fa3a354d6ddcf19b6690d5a125e0f2ccb3ea190be57348b88 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037
 DIST amavisd-milter-1.6.0.tar.gz 187994 BLAKE2B 87d3d870236b50e9c8c7bf3876fc476fb28ff6ee208c8da77c2f9ab2f1ccc0b883cc551718f4f9639125484965180100088d94557f065c7bf904fc912dd2794a SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34
 EBUILD amavisd-milter-1.5.0-r1.ebuild 681 BLAKE2B fd6a954e839da2eb92d023615cdc8d65358e6ee22a7c29aed0f4adfaaa6f04cc70024818fa1005cc71c7d0e16e9841c57c62672cb73d0870f5138cf28bc0cf55 SHA512 0f9c5b732a70a3e9a9206e62c6d92115f9c998c642bdbfa7f6813b4b29865dc793d41de0c27c95a48febbf1e312ef2960efa34f79aa84c2b7a3ad9ba28a2cc92
 EBUILD amavisd-milter-1.5.0.ebuild 631 BLAKE2B b7dc7eca801539dcfc92109342095ff618f14be2121328284fd3a04dd078012060c20e168245414b2a3738e2e0469cc26ef3b51afea8c6b41c96c0f825ba1b69 SHA512 aaacbdb73059e13e11155527a085673b6d61b525b17320982894181aeef61d5d5d827b95f1d5bf1621e97385640e0a92aebf99f1d5cec83b9ccbd5a7f34511d5
-EBUILD amavisd-milter-1.6.0-r1.ebuild 727 BLAKE2B 99bbb39d87272ef483ac243daef5f427a51968c9d274a336d63debcbce1ca56d0c6e5d5e04efff207ce400e03f19cf0a9cd4d563add42b9bdbac0a9f86b30910 SHA512 45ca404978aa01b3eb54b17fc2aa224e0da5a773438aa4e42215a689890731e6c2c9c8a7d1b5e2a16f7fe3de933529bfe971eae406740b1058d692602fad54d0
-EBUILD amavisd-milter-1.6.0.ebuild 683 BLAKE2B bc578c1b8e0c240f4371ef80c1f629a25c75c04e9a008f73938ebe5916ee13ebe7e841ba9e5b7aa79a4043bc9ecb96234057190b53939ec15b692da5e683776c SHA512 9a6be369cb8f78dd6f818beac4fa70966adce4882e5aae50188e5c4df4c86669fd4609dd4bd6f9ee7497f1bd8b5ef7786b7d8c12903dbdcfcb7b5ca723e5d404
+EBUILD amavisd-milter-1.6.0-r1.ebuild 730 BLAKE2B 1a451372ba7008105209790587ee1560346a694e4752b7db09fd6b920e8e8a78c633a087baeb57f7c629b4a5e55a4827002ba1f653560877f14a04d6858b0769 SHA512 43e7ce94bea93f1b4b08966f43669715ee7545c5ab176421aa19fd1dff3741c82bcd4725fd64884fa83b25a074ccdd75be3af2dcf736a011e44b1cc8b59776b5
+EBUILD amavisd-milter-1.6.0.ebuild 686 BLAKE2B 1e8af7b0bf1352a60abd2b8e5e84161cc32e3dd8c4490207c701918c139f875a50058b205b99aba4a6aa714e067ce8589a0a138671e09cd6d99579291ad16c96 SHA512 ed938157111b4233f8463d27a54d77be39e199fd7cedace300a52d7a55eb42ca4990c14af95327e4a91507f44468cbd9bcdde0347ce910d8b7942d871008ecfa
 MISC metadata.xml 328 BLAKE2B f188deadf50fb79c2a844f3b4b277672e53196c2970c461fa0b4de33f7cd24a49efe0182b8e5693dc6274803d86de85f652d715ced97e6cdca3c0d04eb07b99a SHA512 f072948c5fa85f421861f89938558cfd7d172ebbd0568b3d8a60610d2caa501b4bb022f70103e1634a2ae27cec8eb602896b5fa8824301722c1b42df6e43a62e
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
index 157ccb629308..74a12efd464c 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,6 +28,6 @@ src_install() {
 
 	dodoc AUTHORS CHANGES INSTALL README TODO
 
-	newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
+	newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
 	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
 }
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
index d0ad1d5fa9ff..2ea91b4704b0 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,6 +27,6 @@ src_install() {
 
 	dodoc AUTHORS CHANGES INSTALL README TODO
 
-	newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
+	newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
 	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
 }
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
new file mode 100644
index 000000000000..61ae169e9bb4
--- /dev/null
+++ b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NAME="amavisd-milter"
+DAEMON="/usr/sbin/${NAME}"
+
+depend() {
+        use logger dns amavisd sendmail
+}
+
+start() {
+        ebegin "Starting ${NAME}"
+        start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
+        eend $? "Failed to start ${NAME}"
+}
+
+stop() {
+        ebegin "Stopping ${NAME}"
+        start-stop-daemon --stop --name "${NAME}"
+        eend $? "Failed to stop ${NAME}"
+}
+
+restart() {
+        svc_stop
+        # needed to avoid potential mi_stop errors
+        sleep 4
+        svc_start
+}
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 8cca0daf0955..9a163fdc0e5f 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -9,5 +9,5 @@ DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f
 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 4357 BLAKE2B 718021dd1de46304cff3278d97047222e5c24eacab2a42d61bcbecdc768fce2956d32d47117ef81df0f4f55cd1018e3bf09237c83ed0d9ad113f8489127eb74c SHA512 b658eb385ac0ca3675b6cb36eec46d3f3c8b279f5f8f180d9b334168c4bc98e59b18993489d4cf7f33c9df45e66e40b567689addef987ea2180c8a90f1637fdc
+EBUILD dcc-1.3.158.ebuild 4356 BLAKE2B b4be2bc4942f2afc4a7b6fd4c6cbb7405e734a025809ff180660c0f05884808059ecb75b0206f7c0cf340b70a7b6144a574d6e93b023bf6bee0c98cf5d4c9146 SHA512 f3e723a777344ae59fca557fd77107fa84a7524c482e19fec22a0ec853bd48cf44f72a16e95dca3261ef401a5a68f817ec17f109fcb8369bc57b9d9ddc0c3078
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 1001594e6939..76a036e0b3a0 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl