gentoo resync : 22.04.2018

11 files changed, 71 insertions, 30 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index b8d5364bf924..6a7fac3b101b 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 02cd0f72665a..9a331972e88f 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -8,13 +8,13 @@ AUX clamav-0.99.3-VMSF_DELTA-fix-CVE-2012-6706.patch 7631 BLAKE2B eb5ecde76d6cf7
 AUX clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch 3554 BLAKE2B 36ce8580da5abc310caa29ae87478b811f2db9403cb79b01efb9394b3d19ced2be3dbf66a1ad2ea06c660156a03879ba3dbca4329569e349d7a70c12f034d237 SHA512 e0dfecff8adb1e30f4c7a20271fd8731ebbb20449a532d70977f7491d8539fc8ed74f851f6903f6265a2e660f9471341e68cc0651e5f94356179ff1f328ada0c
 AUX clamav-0.99.4-fix-newer-zlib.patch 1721 BLAKE2B 5595696cb0fe1efbcf85d64fa2b9f9bd760ab38467a3d3c2996272d2e533b633d9a4d176096786a4ce666638902698be239d25762a61dec956100f6e33b3f9de SHA512 0b87152c6ecbdafabdb6fdef0e53c12c7651c8c47baa3c46497e19a7a220f4e1f9c1a79c99fb15399848d264ede38b3cddd3a369797a761069b370f367aa723d
 AUX clamav-0.99.4-pcre2-compile-erroffset.patch 510 BLAKE2B 888f5c0cf1205b5ca22ff5f445f194c9e62dd511fcf8a784be6592f700e0db6f7a36b00c88b73c5484cad2075822eb5c1e0c0f62c8ee12d6bac2d1b845a9aca5 SHA512 f03962fc47b10d729437f22374c17b773ee0f519cf537b1d7885ec6dbc1efd36d00372314faaabdf5400b85e781ab5b14e69b929c844b34520801e064d383dc2
-AUX clamav-milter.README.gentoo 1124 BLAKE2B 41713f9ddd22b39748e812a03d5746d48b44f0506bd6e46886fd64233aedad0a7c4b2f8f7a3b0b1d14f831521c423ed5909eb9d9bc419540684fba065c3b9927 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a
+AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee
 AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540
 AUX clamav.logrotate 391 BLAKE2B 9beb9e2918d7fbd30a9aeb479130086b620ab7a2e9e480cd4c4bd039929f3ac5bfd98f933731c974fc2797236a34847d8af7073436cf3d42bb2cdfb7959da0b0 SHA512 ef54facfa0ad830ea6eef499b92a1ffb37e719940385621dacd17062e556aa0d1f24104b3130a9a263f23621ab53f39283c10870a355ed6d505cc0e511b57224
 AUX clamd.conf 234 BLAKE2B 90d64dcdce96767ff34da1537d25bf2b508e038bde66a7e991f49b0fde7b5ceb2028d7e7a1a7b4f2fbdc4efcfb2cdfe3e68552570d15d87eb7d9c30c7e013998 SHA512 ec069cf7aaf10b42a701938b57e1fde1ee15afd1d4af928edfa7e5d505ba8b3edaaceac449da0f4ac6beea09a3fb73453526ba0cd3a04e13259c1a2720f42f78
 AUX clamd.conf-r1 129 BLAKE2B 3a6b0adc07df276054cda4d9b879b30e81fed06cee7562bc350d43e866f825c85788d3a7f45745111bf6a294e8cc20cc221433ad7bb291fbbc26b4e9107e580e SHA512 b85fd99c80242fb66380dfdef34387a2eff9326a1cb726940ab4bc450308e4942e57d1eb1cad979348f8aac685b53e2fa722cef0dab1f2ea2c958f2a5f818918
-AUX clamd.initd-r6 3253 BLAKE2B beab58b5d7dbf2d5a27e1e068495e54c8c159d7d3617afa278b9143580ce7f351d16b50c21e2ccbe421618b4120f06ca4ea9cd22251596a5b68fe05bc794f301 SHA512 cf2bda1e12af495d1a3d05fb4b92da4e2ccf0369f1b33382cc6cc21f31c68fa74a1f95ff098bdc6ebfb994aad1e72173437a80bd0e0e7c3223add26a824d9b6b
+AUX clamd.initd-r6 3253 BLAKE2B 3d675b3ab2b0832abcb2206e0373e37ff19000fd125ca9240942edefab9ed54e12be4bce4112118710e44de5f4f66da61e1cc8e01d725021da629d05089b9412 SHA512 0a76233e67bc25ef4bdf02218c2b3771569c4f9b2b1ae8ca2da22fcf4c1fc0ea17013523c2e2b048ce3db5c793a568fb59b40f4be78186d3adc0f774c3442a79
 AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff5821e9b179b31efd7d5f217fb968efa17e77f6e0739f0258c4c49656283177a0f5b3d572490259bcd SHA512 799d3f33ca69841882f86f6853dd0dc6d8af73db8cfa5ce6dd6c873c5e7bc07d29bfe0f85cfb77edf2b0d8c05de73988d06148b993996ce639c5d0eeac908647
 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
 AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
@@ -23,11 +23,11 @@ DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0
 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
 DIST clamav-0.99.3.tar.gz 16082645 BLAKE2B 3be06e563f17a07e4c7e95eb3efbb61e80858bcb3dffc584f13ec30dc2ef9c5257aec78605f1c03e183b4b7ed5b08343a25b579b2b12e54458694eff624aa01e SHA512 0d3c75d571ed4aa4937ef2b743a39a9a144f5adfd6f56f71046e5a8387b8ed7c3c4d9a4196aa85750f9ec4dc545720fdd659289d0cce086ab13a7cc505a0ab3e
 DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
-EBUILD clamav-0.100.0.ebuild 5276 BLAKE2B e050a0a705704a2443183b9ba256fe322ceaaf7482af7ef067a24ba1a1dd4df3b784970b3241fea42f4bacff87a5519dca822b0fc36af152e6a6fafa972a0778 SHA512 6c8c7fdddf631c24d584d3dbdb0d3b2172ef3e7b509807238503297e8d102a265e01bcc33d149d0e0f052890d03b4bea52b1f9f56909e9a45f0876150a96bd90
-EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6a08cf1480f0622a2632d470f9b44cda9a4f68919f356c5a8b95b81b87912e1c64d3b6e3c66fa9e1b122b2863b06e SHA512 96b2ff17e272cef6a23bfa4357b7a84a509a6e6e105439e70cc8db99b75a61a5732f7257cf494a19d48998c4d84c2d19213d48bf6104cf372eb77c41c5506908
-EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
-EBUILD clamav-0.99.3-r1.ebuild 5238 BLAKE2B 21836637c6f099309f59ef7bc317d14d11dcb5396a5c426fbc026f51a792a87560230101cd81ae23ba51e6e869532229cbcbc830fe4bca65fd7ba54be15d34c5 SHA512 df1fd4de0d11ba5db5de7d010ebf220c8c00aabb86c196ae5f7da0111ba605be17745afe15b1bcba1b9b795463efb4e61d62502332fc0365e6e1eff823d3da6b
-EBUILD clamav-0.99.3-r2.ebuild 5306 BLAKE2B 0eee180fc83ef2de04d9bf02992c1a804049f363b69c98476bc9280fd0d1ae54fde61b025fc2c41f5d9b0820106df917199417394e444fc4c3bc3963e8fc31fe SHA512 2481be4ee556d68a8dd930df5e3942badb65baa2e0097b1f15c7bbc666cd30d880ea8b9fbf16c6318c67ebbc77bc29860d4d7aefe92e23fdb41c85155f0b4fac
-EBUILD clamav-0.99.4-r1.ebuild 5167 BLAKE2B 44dba2a2ee7f06394510749c143f36e5968d6f7d085add6b77faacec3f753e09c1c8df782dab34c3693390d212535a1cee34c0c40683360e9d2c1bfd4060a7bc SHA512 c2293bfe1cbe1b8f1ad973f08b74be7cf29de7f9fbe601b0a247b972bed72aab90424a9d575e2446f58864d25cc39334dfd709d832907aa0bd087dba761c0c8d
-EBUILD clamav-0.99.4.ebuild 5062 BLAKE2B 35e77bc4f949b867cac5838cc8050c9bcc3724c7ce7240949a298ac15bed397d6732823028b6e67b228cc502c28e4f970aab9c42f4fde20c2b2fdfe2b54763ff SHA512 7cfced7ba233b4f3d62a38094d4af7de17c80776fe2d73e99994449faf1a1486270307cd90e2165840aa4d92685d8dacfb2224e2af27604422007f6372d55e09
+EBUILD clamav-0.100.0.ebuild 5278 BLAKE2B ae52d1981c0b716e0cab0efcf3527249e22804eda15a6152265ff77b38b208858e2e0779ec4885c565094d80081a33a6b1737c77460bbcd7be45aebf44f89064 SHA512 e38d842ecdd9a130627b6788409502ebc1bc9fe3edd0b2595f1ee9e249f4246b6dd08e86db4efa9e823d2df6b89396e572ef48871eb9b6c67d2a1741dc958da2
+EBUILD clamav-0.99.2-r1.ebuild 5127 BLAKE2B 2080e66c0ca3c55535d4faee04228169df1b6e8aa87db55b79172fd626e5a078ad3344c44d77a1134da13588bfbbf576091648141d9cd05b97a9d7bc44601e90 SHA512 2ea3c877a47c1fceed4661fc6ea5e037e4e78fffe8241444e39ab30a2268aac3b21c1922836f449550c55f315b2649169efe6aa4a8446068762c9120dcf12ba0
+EBUILD clamav-0.99.2-r3.ebuild 5184 BLAKE2B 0d4ba1b9b8267fa8ef1727c3bc79a8c5ac3c76ae4ee14e10468a117314c1f01d50cc145f2e39509108ea89dd6c1b96ff11eb55fa2f69cd2a5819415c2ee3fe3a SHA512 6d38505706417b50aa6f654cf32eb963bdbf4b76f2a1858ea72431aec884fceaec3a2e098bbf1f6d3a4a36f066d1cdc8a3ef8acf8ce98d3e9cbb934bf1f65ee0
+EBUILD clamav-0.99.3-r1.ebuild 5240 BLAKE2B acf2728a1698b609396e35ccd4521d1c11fdb9121dd1961e932c5b28431bb1064fcc27c1da7050ea47bea7c464ecc4f3bb6b564581246f062e613544fda99c19 SHA512 3957d4890ad9198104b83dda84f3cab117b051d699d2f69773f7d380fb62e32ac916b11d02fffba93fef791cf03092300807a57c9a4528f4e5dc034e0eb275e2
+EBUILD clamav-0.99.3-r2.ebuild 5308 BLAKE2B 1cae0424c1f22be7e50afebb0f67d76d08a9b9a4b82a490da6bb33011916517f376d850da9751471b6cbc233283e50f823fbb42ba3331fdd79b5db587596db4f SHA512 0b394b27a3261a71a6220ef608d4eef9093c337b6ec3025454f93fb307be77716d4bd4315d9a6f956b2860719ffbf7f30609e1a288dc5b0611a748d4dd375cce
+EBUILD clamav-0.99.4-r1.ebuild 5169 BLAKE2B fc8c9bee8af109c0b6fb8359816adce7fef287d8b7784e26574c0c86c557a292f078062abded35127744cd9aeb15a0b3aa5d6f582db7f9ec40b6d8a47396488a SHA512 79358f4cbcd694e59130a3bbf3192f769fbece37a2dcf9af9e6f48d9b5320813371b9e65e80a4f539835c49928eaab557b2d351646b805ee0be5cca7e6dc529a
+EBUILD clamav-0.99.4.ebuild 5064 BLAKE2B 71a3469c4a9d332af2a992e6678d86a812fd4900737967e0017bd37525fc54201b4313b6d21c35fe60f1b67cf6ddf3ffcaefd97163346a8b24fb807a589ebee9 SHA512 686e984a9e949cc1a16cbab25098bdff84f296a8aa553bd29056692939ad29d46e628cb7aff56f5369c6695fd4f85970de4c5bf92426dae65e5418f72d52d99b
 MISC metadata.xml 822 BLAKE2B fc73a9b45c1a80d590d4ce93f4c704ce2df3ec270cb292ad5552b2452e737cff45ceb2cf14d7c061f9a2ad2104081cacf36d4c19ccbddadd40579236da5b5939 SHA512 3cf072b3463e721584f5b608ced29f528f56119f17fa6879de3f0950ca4678ffdd32527a317d8740f4c288af440940fe35d876b3b9b1224cf804ce3808ef3add
diff --git a/app-antivirus/clamav/clamav-0.100.0.ebuild b/app-antivirus/clamav/clamav-0.100.0.ebuild
index 7b2040491faa..436001842571 100644
--- a/app-antivirus/clamav/clamav-0.100.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -29,7 +29,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/check )"
diff --git a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
index c0eb37e298b7..6f2079c18eb5 100644
--- a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/app-antivirus/clamav/clamav-0.99.2-r3.ebuild b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
index a4419b7542f5..c5980d53cd4a 100644
--- a/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
index cf59991c335c..fdd1c903ae13 100644
--- a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/app-antivirus/clamav/clamav-0.99.3-r2.ebuild b/app-antivirus/clamav/clamav-0.99.3-r2.ebuild
index c12de1919352..2a03bb2ce1c9 100644
--- a/app-antivirus/clamav/clamav-0.99.3-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
index 87ed749d4b70..96d8df964cdb 100644
--- a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/check )"
diff --git a/app-antivirus/clamav/clamav-0.99.4.ebuild b/app-antivirus/clamav/clamav-0.99.4.ebuild
index 4839a5bdc557..1e031d13e8ff 100644
--- a/app-antivirus/clamav/clamav-0.99.4.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic user systemd
 
 DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
+HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	!!<app-antivirus/clamav-0.99"
 # hard block clamav < 0.99 due to linking problems Bug #567680
 # openssl is now *required* see this link as to why
-# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/app-antivirus/clamav/files/clamav-milter.README.gentoo b/app-antivirus/clamav/files/clamav-milter.README.gentoo
index 17e9ba628ea5..f526bd35a926 100644
--- a/app-antivirus/clamav/files/clamav-milter.README.gentoo
+++ b/app-antivirus/clamav/files/clamav-milter.README.gentoo
@@ -19,7 +19,10 @@ Step 2 - Tell the init script to start clamd as well as freshclam and the
 	START_FRESHCLAM=yes
 	START_MILTER=yes
 
-Step 3 - Edit sendmail.mc
+Step 3 - Inform your MTA about the new milter.
+
+            SENDMAIL
+        Step 3.a.1 - Edit sendmail.mc
 
 	Add these lines to sendmail.mc before any any other 
 	INPUT_MAIL_FILTER lines and before MAILER(local)
@@ -30,15 +33,53 @@ Step 3 - Edit sendmail.mc
 	INPUT_MAIL_FILTER(`clmilter',`S=local:/var/run/clamav/clmilter.sock, F=, T=S:4m;R:4m')dnl
 	define(`confINPUT_MAIL_FILTERS', `clmilter')dnl
 
-Step 4 - Rebuild sendmail.cf
+	Step 3.a.2 - Rebuild sendmail.cf
 
 	cd /etc/mail
 	m4 sendmail.mc > sendmail.cf
 
-Step 5 - Start clamad
+
+	
+	    POSTFIX
+	Step 3.b - Edit main.cf.
+
+	Add unix:/var/run/clamav/clamav-milter.sock to your 
+	smtpd_milters line.  If the line doesn't exist, just
+	stick it at the bottom of main.cf on a new line.
+	
+	If you're appending, this is a space separated list.
+	If virus scanning is your most intensive test, you 
+	may wish to put it on the end of the list so earlier,
+	easiser tests may punt the message before you go through the
+	trouble of virus scanning it.
+
+	Only one milter example:
+
+	# milters to run on network received mail.
+	smtpd_milters=unix:/var/run/clamav/clamav-milter.suck
+
+	Multiple milters example:
+
+	# milters to run on network received mail.
+	smtpd_milters=unix:/var/run/dkim-filter/dkim-filter.sock unix:/var/run/clamav/clamav-milter.sock
+
+
+Step 5 - Adjust permissions for clamav-milter socket
+
+	Edit /etc/clamav-milter.conf and check/change MilterSocketGroup and MilterSocketMode
+	e.g. for postfix it would be this (sendmail,.. should be similar):
+	MiltersocketGroup postfix
+	MilterSocketMode 660
+
+Step 6 - Start clamad
 
 	/etc/init.d/clamd start
 
-Step 6 - Restart sendmail
+Step 7 - Restart your MTA
 
+	    SENDMAIL
 	/etc/init.d/sendmail restart
+
+	    POSTFIX
+	/etc/init.d/postfix restart
+
diff --git a/app-antivirus/clamav/files/clamd.initd-r6 b/app-antivirus/clamav/files/clamd.initd-r6
index 7b50af640727..8cf8dd0a4bac 100644
--- a/app-antivirus/clamav/files/clamd.initd-r6
+++ b/app-antivirus/clamav/files/clamd.initd-r6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 daemon_clamd="/usr/sbin/clamd"