gentoo resync : 25.12.2017

5 files changed, 14 insertions, 6 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index a1fd08d8fc0a..99a4ce12f6ee 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a4544b9ad484..e55e7ae09c0d 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -10,8 +10,8 @@ AUX clamav.logrotate 391 BLAKE2B 9beb9e2918d7fbd30a9aeb479130086b620ab7a2e9e480c
 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.service 136 BLAKE2B 816447fb3a4410fbf8379e89cf3a4117563b3ad5d22ee50fe67eb43ce954ef7f10ff8e000a6b3a8fad7fe9863604dbdea1153611faf80fa3b2763216f74c388a SHA512 2080e96e84d15d1ef4c670579ddca5bc9608c8e8564cd43fcd9d464d97c253eb89ca3ebbf3a6a799b31a6c6321ea8beeb386cbefbccbe5f097dbc492900dc2aa
-AUX clamd_at.service 190 BLAKE2B 6d29a2412622a66cf2c0484934a737c0d3c5b3946d1806fa4e1f4bc63490a1acbeada0049b48532786f57e8e929231b6907905bb370d643588ff40da8fa1338b SHA512 b5121bfe761d21152356c8b1e0f0974a9c0bb9002b3d5b1af1c7940d94314250a4890388876b150b0f071c24b7261b93bbc9a6b94b896294c549fe6b572ee70a
+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
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.98.7.tar.gz 15118851 BLAKE2B 5fffd1896645b5e77f26819eb16e1d9e9cbb8a71d5627aa31ce009b37172fe5c9fff77d6646940c8065c856cf1a74737ffafc79d4e288b8d1202620fe568d1bc SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9
@@ -22,7 +22,7 @@ EBUILD clamav-0.98.7-r1.ebuild 4692 BLAKE2B ba497a63d9c5319dc3d609106170200f352b
 EBUILD clamav-0.98.7.ebuild 4624 BLAKE2B 56d6f5e232c08a2a6cbcba67b4e8b982ae70f96665fb6ce6cac52578ca5c804d69b259d988bda72e809347a2bdd7ff56e5356d83ce0d08ed9542d2332b60efec SHA512 ce11c90dc3c7524b0c4599665406906c080e122e92260e95760034bd7dba3e63f70a2a3627518e9cb475a8267a728ecc1ace1ff9c1e5bac4d4a8ae04e572366b
 EBUILD clamav-0.99.1.ebuild 4905 BLAKE2B 8cadfb5896fd143da45ea1f2d7da1fb510b08e42d9833f9aa6f4330c44f9826be17f3aaaa3f951fb7d19c19be03ddae973e573cac976a3c81201cfefa477c8b4 SHA512 8deb314ccb8635ae454de04a0295af882d172d8051954ddf1630a80e81044d7ba0d46b56fcbb0a3a4c06f7d1bb2a765184171ba58b3532a730b18913a090bbb6
 EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6a08cf1480f0622a2632d470f9b44cda9a4f68919f356c5a8b95b81b87912e1c64d3b6e3c66fa9e1b122b2863b06e SHA512 96b2ff17e272cef6a23bfa4357b7a84a509a6e6e105439e70cc8db99b75a61a5732f7257cf494a19d48998c4d84c2d19213d48bf6104cf372eb77c41c5506908
-EBUILD clamav-0.99.2-r2.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
+EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
 EBUILD clamav-0.99.2.ebuild 5011 BLAKE2B e12f2b5c816ae3d7b6e8575d8c0123cbf861ab178360fd9e29ed4e00cd1947fc4c7ed3d676d9bf8e544cf5dee3893a4fe7cfce80d59e52c132542588852ca4cb SHA512 dd2b1a6667eef55cf8200f5392b46c5fbe6534249d5c7008e9a46db8c6b2ddb09ea80a446739a257dd39c21e65a38d71682a1f436949b46128774688aa8a3df4
 EBUILD clamav-0.99.ebuild 4917 BLAKE2B a0e5db3086abd4d0c94213083341a819ce54e098f8b6457cdb065850d91e31992a0c0ee054f66e8f79a8f24297e316cd9f26b9913e24a4534bde41dc932e2e98 SHA512 867f2e5beceddfba26d5aad2016a2f244b01c90b8851b65c9d33ea968c979d1b73db9e700d48b6b1b33525ad4000e3a0e8c5b059b597c27be2d2bc15919b161c
 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832
diff --git a/app-antivirus/clamav/clamav-0.99.2-r2.ebuild b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
index a4419b7542f5..a4419b7542f5 100644
--- a/app-antivirus/clamav/clamav-0.99.2-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
diff --git a/app-antivirus/clamav/files/clamd.service b/app-antivirus/clamav/files/clamd.service
index efdab4314a22..75aa2ccb624d 100644
--- a/app-antivirus/clamav/files/clamd.service
+++ b/app-antivirus/clamav/files/clamd.service
@@ -1,7 +1,12 @@
-.include /usr/lib/systemd/system/clamd@.service
-
 [Unit]
-Description=Generic ClamAV scanner daemon
+Description=clamd scanner daemon
+After=nss-lookup.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/clamd
+Restart=on-failure
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service
index c5ad8dfa6899..9008ba7e82ed 100644
--- a/app-antivirus/clamav/files/clamd_at.service
+++ b/app-antivirus/clamav/files/clamd_at.service
@@ -7,3 +7,6 @@ Type=forking
 ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
 Restart=on-failure
 PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target