Fix unit files to not use forking and stop relying in /etc/conf.d files

(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

1 files changed, 10 insertions, 11 deletions

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 8b6485f87aa3..2cd6b1b23e36 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -9,14 +9,17 @@ AUX ntp-4.2.4_p7-CVE-2009-3563.patch 1752 SHA256 4a6eb328ccfe3be771dc0932d6f6ee8
 AUX ntp-4.2.4_p7-nano.patch 393 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4 SHA512 b8531f8b33a4d062ae5910e5775edc5e52a5df971b6fbcc7efdc55fa34681a38bc8881ab6164acfa692e4105bc1ae6d3e20fa06592cb04b7bd935dfd0abd9746 WHIRLPOOL 66dcf8cf79468c8f58e87cceeefea35ccbc930329eee18ed2b0b1c749aa645486207ebb413fe962c9b6824ffc00ed64636622194f8a3e4cf611d3b7ff822325f
 AUX ntp-client.confd 623 SHA256 e8d5883461f4297c052e3b39814b663965ed3a756c4234675f4a9b62349eca13 SHA512 19b1a9ca78fd2a873f2cc5b026f2ff48b81edf7bbdc95d8269115820e23863b5c922205de17a60f095556e9e27c254093539b6804bbc5d099bb96281abae3b9f WHIRLPOOL b0889194c1284929a2dae045259491b126a30e76825c1c9542bf51f9e9981c2704b3a8cd02dd1d0ed839ed68eb9f9697134e5db08792fbac5adb88d7773a7dca
 AUX ntp-client.rc 834 SHA256 bdd70612cf0654460aa4cfa59bcaaf6d636d240a3fead8b243c86e5cbe640ab9 SHA512 e7c9cccb5529704c5e4673ccd36e544f2ae43ea6b8a0224c0f4cfade566bfa3973c215d8cb40b83d8af68d03ec3d34dc73f2647adb613860fef5015179e54957 WHIRLPOOL e5c1034e2a48493f24e15eb4bc3a4e0771ee6809edd1c88984226dd0b315d18dd40ed5d4ba9d25b64fbd0e675d5ef5db96865dca921939d27a5500740d484bd8
-AUX ntp-client.service 287 SHA256 53217bc8893340888d910a2667a2523ee8e57a46c3f9e31cec7f5ef1a4f93804 SHA512 4362da31b97cb725c6b92cef911b71037584e68412b51024c3e6f32ea70826295eec964f0b3186ada22c1202b04d5049a93c5295825998cb07eb8f5015db1c15 WHIRLPOOL 9ff1e93bfe82e9938557a195496de15314cd99640c3804a6e7583fc6acc9229db67f38e542a35b27cef88cdb9c8a1da62ca0d2ebdceb36c1cccb081e8fea45c8
 AUX ntp.conf 1517 SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9 SHA512 4973c1fce84b9096b421b7314ef1d45f22ee6a0734c122685f9fb3368c4e09336258fa8a1c9aba58593536b099549af607ed10256979c23e8bf25f90526923c5 WHIRLPOOL 13f13fcdb92941488d96f8a273839360bc1cda6713d0e5c7d292a341dd65d9f88088f380504b29bd65cd78501ece94a2ae490b9ab3ed875b4a8db930dabef989
 AUX ntpd.confd 189 SHA256 a3bc17ee0f7d41102d6c33e4281e22d312a42cc2ffd8848b08e9cd78d63f2d05 SHA512 9e41fdac3fa299b62b3b13c2f52264781d1b9849a0e5664296dbb5d3ed3b69161371a276c295c2cb8e61c6c18bee357c92eebbb343b756129d50cfc7ce97d9ef WHIRLPOOL a62245f70e440201c0ac0980f6c95d15ee3afc8e9ecb2ca8e21ead9eda8cb20b117786ecf91865e0842fcab8aaf09d692e17ce7aa2675198af581fe25a389f4e
 AUX ntpd.rc 819 SHA256 f7c58e8f8e91ee0c1b947e9684b0a9e9e27220e0c97a8b06ee4e3bc5578a88b2 SHA512 b32a4f5ed6b12a6a0254951e530ffcd006ec8719847c6b146bced7d29e482d2312448802ef2c22f85d6a3fd8d6ee7f6913485fad71dd57759da112e8248fc62e WHIRLPOOL 87cb1e26d78a026a507f0e38ad611970e158d1f633aad8681843cef44aaaa999e73fbd46e5a884116fabab2af3f96db1115c8e1e161f5da67820423e422d96fb
-AUX ntpd.service 225 SHA256 5c22f183d1db89a681a28f56994875d7b124f8b9316175b75414de7b3badadc3 SHA512 34d8695341a9f7d6dfd39bf8febc5841d5f7632ab388fdd88c76988880d8d77ac839ac75ac513770b94699be897541c17696a21f9dd992eebc95918748c726be WHIRLPOOL 568c730fbbb2d7d9324084ee2349602da293a57dc74fc4e40192049c09bba544d321ea607439dcc25e5d17a92a7892049a4a91776c1a6513a999bbae0e6f2675
+AUX ntpd.service-r1 171 SHA256 19c8e956df54e37662cafd368f1f5b2123c9c93ffb935f9cea59f0ee0d3dfb08 SHA512 262018fa49e8a5019da585bdb6d340189836d7ac9fce6df82e7c9b62efbed82fe0c51596bc32d97ab5ae879196904aeb72926186a4494e3019c4d4b1bc6f355c WHIRLPOOL 9bb0163e5c6c61b877dc317172bc45f572907627ed6275b6f0623d58279f84247cdbf1fb58543f472df2111f4a295a3b0e75041a2cd9ad8e21aece9115d8d207
+AUX ntpdate.service 260 SHA256 2602a76654d46f642f35ac6381fadf64f04e3a8f7e4efa83ef95d3dddd81db99 SHA512 c46c9fc2958a15d055a18769fe3e39c37dfff2fcff62c385fb01d56b3aadeae59e58aa6e79d034f8ffa26ba44bccd0436cb833ef18b8699fbf4c175526f712ea WHIRLPOOL e8efc18127a570e1a955c9c1dfe4f1122f13b35d9f7031e8aaf366fa171055d5eba299fcc1e0883bbc1e5d91298d94f86e0907bec932c373153ed79cdaa1e048
+AUX ntpdate.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
 AUX sntp.confd 149 SHA256 97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b WHIRLPOOL 65af6af349f56b2379afdb6c53042571de19e799a079b0997dcb9f6185849a04292000a584e22e7e03af5bc9c10e0627037a72b748b8f083ee4a51a1e608e94a
 AUX sntp.rc 590 SHA256 8fbd405ad951e7ad046e4408abb98f4066077113187198767d52f28d7228bae4 SHA512 bab5c3c1737eba6898c46897afbce4d33473303470e355a3ac7eb8ce15f43fbbd3c3e3b57ca1eb85f5823f945892ed484c5cd135e8c4287e61319cadda39bbe0 WHIRLPOOL ee695f19878658df68da7a01ad77a2ca4fd4318f2bd806a226c6cd3c3155385fe202327ac2490211bfec59029b46e109fa21a21715e4f2536bcca0255ddc7a66
 AUX sntp.service 308 SHA256 f870757965093b46c1fa72477b258fe4fa35cb814646613d8cbaeb635e0c1cf3 SHA512 a39b049f16b52d5d87294bbe1fec0cbc74fc1baacb8824c171c67625bc5c5279e255497d67916bc4f7d9daa8e4d9eac775b47b496960cb93d4079d803c2b1c78 WHIRLPOOL 4db26c13a272fe5aabaa7d028bb3f087b80ffaedc97081959d87bbea60029194ed2c4f2bf9dd0b602210089711cc19115fbad43fcd926eb6a2bdd880712f2715
+AUX sntp.service-r1 275 SHA256 12451d2f9d19ee65ca044733b17ba7ca22682b3c79e1052a8990e1c0c1587ea4 SHA512 d42a87e2f06d998e2db3d9033b04fb41f8f24bdc2407c38764e24182396e09615d6e71b14bdc19499444b368d975d2b89a3bc576527d5d5fe3d6ed33d956e789 WHIRLPOOL 4be2d921efc73326fe2e64436fa66f4cefc1fb81b59543026bb6c70a0d69f5bebf6bbb4a690e472665b596f15c5bb5abc822a2d217abf8bdb84eeafbf3a00985
+AUX sntp.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
 DIST ntp-4.2.4p7-manpages.tar.bz2 49719 SHA256 cd21e29fcd9a13ee92d5f5ad492c9be49eeb2e877351865973805c12993cad3f SHA512 99ef50b22b012c99b626f742aac0a19d85a2d9d375fa5054d742d2eadd7ababf0e126ee534d76f1706330b6c06ee82ae3e134e0bed5008c3a38e314a4af7d298 WHIRLPOOL 0bc1f7626265e9329fde5cd55dcee3c0ff7930a231a80541a4b8ce199a30a61d6ecf92dcef90b9891df98b93a4536d7a61b4a475515e61814121ee161aa9f8a3
 DIST ntp-4.2.4p7.tar.gz 3382146 SHA256 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3 SHA512 d08368c9bd146461c2337f27af596d79f9a7a9294ed66f91a4b66a40c020e5e2e2f0c2d2481920d24fd89acaef110149f1e00c8cb27c93b496960b17fcf94dd3 WHIRLPOOL c706946d9cd622ca8b778dfe371263e8ee17f7a18403535a3cb63a7941381c8ca07c7c870bdf60e61037c9c878796853ccfee267e8bb1233d373c2863bf194c8
 DIST ntp-4.2.6p2-manpages.tar.bz2 47783 SHA256 22cc78432f26ea1585637cae9cf3cc213192c1542da0bdbbf318c6553d1625c9 SHA512 588cfb89242e4aff539f74e7137890b73eced474a8a34c4f5c37ceccf048542f71e7eb9e4c02c8d40d3b2d1d118ea657c444c9db634cda1747e9c128f5dae5de WHIRLPOOL 975b6f2d2b8046cf3dd93b696822ee841aa3663451b0cc502d1402b7b7b5d4afdad7af025b162eecb6b1d7813a9ed733f3806e1db36305c656b3c6525c094f25
@@ -34,18 +37,14 @@ EBUILD ntp-4.2.6_p3.ebuild 3742 SHA256 a3e399627267b88b1bf40d5838ac2b633e94f3b15
 EBUILD ntp-4.2.6_p4.ebuild 3831 SHA256 699bcf80337326262bed9eec4d17a2d5a55c242e61ff91dd6af66a6821b0b37f SHA512 2c816ccecbc9d69925806ba4a769c6669e4214c139d1e2b81fce7dae503eae671a7076f108f0125882a17ff77dc5b0647e7ebedaded1c806053e23a70aaaa7bf WHIRLPOOL 2f3e50d446b1416cd00462d76670fe301e0840b79fa94625ef48e823cbe18ccdb186a290adec06a24f8ce74153c074e4a6bbc6c46a1a6f30f49dd656a261b7b9
 EBUILD ntp-4.2.6_p5-r1.ebuild 3784 SHA256 b5f103c04700e8266e2720ccfc1fd0b7135a3fcf0cc23f40925d7ecff8918a5d SHA512 460f6a4e57f9d5196c8822eb8a69db6d58975b959cc0917c486b41acb472548ca6bb261191997c3a7103c517d11bb9f1a52b923ef8932a11cab88e1a3538f697 WHIRLPOOL 5453e6f5fa18fd541f48b79ba9be89cf4a48988ba3d122829b22a3f8b63135578059265fb279291c905ade49724461d1525fbd97649e6f7a45aff22008b196ea
 EBUILD ntp-4.2.6_p5-r2.ebuild 3869 SHA256 4c5a7f80315243b8fa9c7acf57fd9e0c84831fa1a42c2cc6c1144a8fb2a64c11 SHA512 e52b92bb66ced7e1f2771544727e5eb9cd1999cd7ab9766f1a7d30b158971c91d3882b281cac8cf27fbdbb45ca14d49ca2c3e54256f85fed62e8cb21341a7d0b WHIRLPOOL 2342083adc37e255ec8f2fe29126a6280c3a265b0fb09a8b6ff021edf3cacb1b879dc435eb0c54102f82be1315c1c53a8d4cd211ca4c8ef8832305ae1989ed26
-EBUILD ntp-4.2.6_p5-r4.ebuild 4061 SHA256 4e9c829eb7530e75ca7432fcc2ef29b7eb991dbfea5618972c3191a99e04a03d SHA512 600f8a400af4ba08d5ac85ff18d8a3f890ae42bf33c09457667e4ad202f1137e31138c285ba3b114385129e8b69a0cbddaae26aaabc5269667f72c95b3a0df1c WHIRLPOOL c5a212c7aa910fc8ab69de5b5fc5e38c36615d8abfa3219d4afb86e95a3393d67d371490e8e423633ca9468ac90de422b85fac62d025919d5ab8f02f3065af5f
+EBUILD ntp-4.2.6_p5-r5.ebuild 4229 SHA256 ed495b87304e2ea92455a69eae11f7db4bc5c5bc65059409a3ed3a654c3a8197 SHA512 75ce4f24c3abb63eb56dc4f768f0c57cc38b3f9df828c95edfa0b6354236568ecf943fc1bb0dcc7d840c60cb7fe3c6502f9ae05188afe2c5c286d90c5b87ee2e WHIRLPOOL 7f8947d77056f925a67ef5290c236a2326017aac0c596d6988e9e9cb62d90dc68f952a14c651438685eb8aa266a3019acfd43251c3ec20b7835d66bc7bcdac69
 EBUILD ntp-4.2.6_p5.ebuild 3809 SHA256 d9c4e1d7c7dbcb5b2d831e39d32b23d2ac58f09f130b8c1d67a26af0fc2a5dce SHA512 cf8b7cc652f92432fcf0b14ad37c172794ce06c81a4a560eadc3fe532aae66485fad6663cfe9bc33161412a3fa68a3c113f36d0eb8fd8f4c57ea0509dc91e763 WHIRLPOOL 459711eb1457dc77c1b2c8b2a010a4a0a11b5b2f6b03414183d7692c13b85c7a79d46f30376f90ea19726ab8f61426b0f6ddfaf38507596db9e1bf95fd5d71ed
-MISC ChangeLog 26175 SHA256 032091cb7aad8df279d50d4c68747b97ae292fdcb33e986e2571b4453d9c545d SHA512 bd0683ee808354fa47f0e079a790ad1c36031db0ea13dcdd6027af7ca68c488c42a1e26bf6507e1d3132f1826da22331f317cc899a93c5d83b47d5cd55a298c0 WHIRLPOOL a8cb037345271a759f754d490108d22301d8b892807d7bba53db4b869558a1c10b6413fed27d62b27f0aa0fa2722651712a8eb6fab0244ae1042b17e455c99c6
+MISC ChangeLog 26558 SHA256 31da6cea589a0d7c2e6e8a4fafed3e3a7a9974e4253515c7851867e4e0988c37 SHA512 4c767eff142846fff7ad7a07f09272243ce56651bb5ff273ea3960823864ac1adc1dd341a05911db344b2c6306a84abc812f03797fb872fbf4e76f32ebcfeb47 WHIRLPOOL ac0ada8afbc84fb8cb42255877071550ea5967c2884dee440d5312b2d7caed9fc87a722e67fa63096e935f0b427110117594fda488864992911fa84f3cd47b3d
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSL80pAAoJEOeBhlrCAAWGoVwH/RVlzmFSjvR6pcuUkrEyOgDZ
-q1CPItiEXQlIqgNSk3p4jIbTQeAoyzGFeeVNWbMxPDfrsvHHLC7dB+HEuFKJ08/M
-OhMsQiIvYZJdsTkanbU70HqaN9UN1n2j08txB3abP5o4qaoZX1iafIKK03UY4l8U
-JQWrTsPPOiF6T9fD5pYTZhgQDxoGyuZBKa0xFgMcm91/I3jYuDE4Cw+XD5RuVPio
-dSy6C3Ph5XM+IfZ5RnLZEOcSDBl78Eef6eX0XCBZuSv8W5k76nBhLi033ChAwZ0R
-2Tl29shJ0WKOGhbf0aVKbr4LPCBm85sunbOzE4GEVc/becnRbdK7otkw6A6xwpc=
-=ePH5
+iEYEAREIAAYFAlI2AcYACgkQCaWpQKGI+9R5yACbBHegHDPqGRx8WRFhl0xCYrhv
+OB4An0JuUmzmpg4YwR0ftkN4cmXFlAGv
+=mx+5
 -----END PGP SIGNATURE-----