ntpdate needs network to be really connected and working (#501298 by Juergen Rose), toggle options for usage with 'caps' USE (#514660 by Matthias Maier).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 22 insertions, 6 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 2fc92ecfbbae..5276bf95d16d 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.218 2014/06/23 12:55:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.219 2014/07/01 16:54:26 pacho Exp $
+
+  01 Jul 2014; Pacho Ramos <pacho@gentoo.org> files/ntpdate.service,
+  ntp-4.2.6_p5-r10.ebuild:
+  ntpdate needs network to be really connected and working (#501298 by Juergen
+  Rose), toggle options for usage with 'caps' USE (#514660 by Matthias Maier).
 
   23 Jun 2014; Pacho Ramos <pacho@gentoo.org> ntp-4.2.6_p5-r10.ebuild:
   Old unit file was still being installed by error (#514660 by Matthias Maier)
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4cd63893e2a4..3961ca735422 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX man-pages/genmans.sh 1864 SHA256 87f46fd035c9432e6dc9f8e4273aae2e5a9616dbaa13d20909a6e01044369c1a SHA512 03a8434f1f852d3eafdd0c63a19bdb490ac0194d81fd6d2e04fac5840169a48169b8bf7b5ad56b5ed61efba51852b0ce331eb8af0c640797075a530f88a916db WHIRLPOOL ffbe1ef7279ddb867aef9620f713b00af7fed593fd95c2f5c8a2b93670b6855bca1e5b22b63e8d07eee53b91987c9f82f5e45b8ca4935d566ab3c271d2d48ce2
 AUX man-pages/ntp.conf.5.patch 503 SHA256 d26c1006d72d76591588fbd058000596b17b0b9bcbd184d4e6cedbc31c3b1027 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe WHIRLPOOL f5d8d571206478a12f1f80e483b4b7cb94707e1c0caf55c45c319e81fb5425d5e61686ad3eb13c0bb4c694621858f8a9399eb5f5b92237fb39ccb5aaba90b6cd
 AUX man-pages/ntp.xsl 5831 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd WHIRLPOOL 0376d57f0e657c9a09fa83c69485fe202f4ef6d46957d7a2680410cb08ac0d5083e4bcb4221175acc942d211fdbb7ffbbf4d9ed00a43b8087c90fbe2a4e3f808
@@ -10,7 +13,7 @@ AUX ntp.conf 1614 SHA256 1e644397a0360a997064d0704b489c66b17ae2c50b49278ba46ec04
 AUX ntpd.confd 192 SHA256 40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91 WHIRLPOOL 75ba0559326dac961a6b228d6ee58ea8b4442ace200c36ef07101bc00b8fc12dfca78bc6474870f29928c1b9cb1397a4bfc8706befdf33178abad1a5f558b372
 AUX ntpd.rc 819 SHA256 f7c58e8f8e91ee0c1b947e9684b0a9e9e27220e0c97a8b06ee4e3bc5578a88b2 SHA512 b32a4f5ed6b12a6a0254951e530ffcd006ec8719847c6b146bced7d29e482d2312448802ef2c22f85d6a3fd8d6ee7f6913485fad71dd57759da112e8248fc62e WHIRLPOOL 87cb1e26d78a026a507f0e38ad611970e158d1f633aad8681843cef44aaaa999e73fbd46e5a884116fabab2af3f96db1115c8e1e161f5da67820423e422d96fb
 AUX ntpd.service-r1 171 SHA256 302ce93a9fe6e56063aece43d2109b98602333a7155641f3a6a41a4cf687a011 SHA512 15e0b038c756f9c5195cb69ff25dcad5a86bc80bc697875d351592c18d65db6e9b74482de4997015c63bc09ad6e9fdc282b27954bf859d944032ae3594be6548 WHIRLPOOL 17a2e93d9fe266d1e39900102fd05eac62b208a8a393fcaa27bff46b29f9ae89bd05330d95027eac57c2db3e1ab15b8133855237a7b0e158ab708850ede38572
-AUX ntpdate.service 260 SHA256 2602a76654d46f642f35ac6381fadf64f04e3a8f7e4efa83ef95d3dddd81db99 SHA512 c46c9fc2958a15d055a18769fe3e39c37dfff2fcff62c385fb01d56b3aadeae59e58aa6e79d034f8ffa26ba44bccd0436cb833ef18b8699fbf4c175526f712ea WHIRLPOOL e8efc18127a570e1a955c9c1dfe4f1122f13b35d9f7031e8aaf366fa171055d5eba299fcc1e0883bbc1e5d91298d94f86e0907bec932c373153ed79cdaa1e048
+AUX ntpdate.service 267 SHA256 f10e9999acd384ce46c0025780e63031c48f43d30655c1ea25aafe1674b88d67 SHA512 2c5f173390f9b3ff25bb2593796a6925cd004cf2157b08bcba87b1dd79a73fd1f50c74294433e795962b52aea243d1532e384a80d6eec83fe3ade53869297c15 WHIRLPOOL baaac80b6f8802b11bb65ccd963f06b43bc5b785c2f5ad0adc32dd98d6174d61b23c9964ba5d6875fe98f255380d78e19243d0d981cadc36f17e738c694318a7
 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
@@ -33,11 +36,18 @@ EBUILD ntp-4.2.6_p3-r1.ebuild 3842 SHA256 b53b9d369ecd1ac7658d2032c087385d403d46
 EBUILD ntp-4.2.6_p3.ebuild 3750 SHA256 615133b52c6e3be7b1a29ffed40882e3c6fdc8d10e6d5faa181a919373cfbc51 SHA512 48d79b04d95efa3ed17dff84e132471087b95ebed6534640dca0aa8f107a9668fdbd483163594033dd6c66f56c3c77f01c4e8b7f2bed740b73b3ce0d852a3b39 WHIRLPOOL d8050f8c337aba87c29379f0300b288c31e674c95cdc0cd421a3fa6f450b3cf8fc709bb57d31d2ca3ce8ff09d479bdc9c0f4dab8c2d3d9d2d1782aff62aa758b
 EBUILD ntp-4.2.6_p4.ebuild 3839 SHA256 5d0436674cb6f49131eb1d65fce424a7bbe6ee79680bf791fd7a788d277d973e SHA512 68f0bfabb92f91dd70c139975cc02eec88da5d77ae57616f8aa26ce1a71e78ad670e3f3d7f6eb9169c5b3bf44a7b91da033a5430e56ebc7bfaf0ed2bc42f78b4 WHIRLPOOL a08728d5be480a43554b836ef0c473ec198359c1f74a8f802c691c8145e4c85c53b967bc0bfa63d455f336511468c06e8c5ee7c06baaad08eef6a4fe7419b703
 EBUILD ntp-4.2.6_p5-r1.ebuild 3792 SHA256 33e91a7ff7a4e4e69905f278574819382db80075b182c6551d2e3b88eec180ff SHA512 7844b475b0ecebac5ade7b0ce0c17b3557489da5013a0c7c9ba722f5e31cd4786b563383093850dea54afb98082ecfdcf3c78c454325a2fbbb852c0ec1ae536e WHIRLPOOL e07202eae303772357b4f6feff39799b055a547b6bd731f23b9805cf18c568023b50c6198829b79a427a999e0f139898e0f30469ebdc8d3b591d65f89975741e
-EBUILD ntp-4.2.6_p5-r10.ebuild 4289 SHA256 180e4b70c7d80f5876dd3e70d53cd9e81ffe5669f9670ed0d89c1a0d7e1096c8 SHA512 cec9d54410dffca874cd9a0ab14737ae04d8b44803041ae4cee149890b26e972cfd67b3b03ead4550cbbf6f50a06b8b7877891f44e26d16306e382a491fd5806 WHIRLPOOL 89b5b81ba6b17044af69a165bd9a4c3fefafc8a07eeea72764650527a26f0a1bda0f9bcd0c7976145915d8019a805afa4448ae5b89bf4dbf39a305f82eeaf806
+EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 42160a25d110f492f1835f20ec2858083a4617723c500cc9ab82889050b9ef0d SHA512 a8800774150fcb7db3d6006e13ed61e4212ae8381cbfa6c68697b88ca59a1c3987595f3a9064c8c50994543a6207c6de74ee1ae422da7b1a46ed388fa6d1565e WHIRLPOOL 908bc9fe8749b973bab016944fee824d624aa26a835cd7d4944504da5299099509ec6ab3a4efc5ee21e66c189425617a07344845e85e8de46585e9f467e6f665
 EBUILD ntp-4.2.6_p5-r2.ebuild 3869 SHA256 f32d367bc823f2b1b8c8244f8912cda1b8b59bd700f4e0f2dc6e6402eae5cb96 SHA512 de94dbc52a52a39be637fb64cc9dedf6099eb694d9b173511faf8fc08d5103130114ed3b68625d92257d4390264873ec5fccae7166fa2279ced6381de7919fa2 WHIRLPOOL 523ae321909f1a95f1e0491bc7e98055461b83158219062830765c54a63b0c4767819fac13aca43981c90dd13bf0b992c9e16d873a82172d176fe59319d84055
 EBUILD ntp-4.2.6_p5-r7.ebuild 4221 SHA256 d56e8d233c1d7fc876a6b5caf051fb69667358fb79e5ef2aa4fc78833b7a2e8e SHA512 3a3e08b2f2108fcc49f0d07aecd57236791e8d603c8145c93768a910e96359e03737eafe4a084a1f7f54071bf27cc0da1eb310b0bf5eaa38d6c1ee5d7f2e97be WHIRLPOOL b8cfee3f7c2f2479a3b26bec04acaf667a0e4ebdb6d187704a1dd85245e49ce32b47ffbf37ea5c7039fb5f9072bd284bd65fe4b7bd836d5a2ba2e30ae2293f3a
 EBUILD ntp-4.2.6_p5-r8.ebuild 4276 SHA256 03ad604101fd53c924e6f7ac425f0d88973b74c7cb37aa458535d93db0998b40 SHA512 9cda0ef278257321b7804022ed742bb89313c299a3cc36a693f26d0162d2fcf6757ffd0dda47e74864355ed1b1456b7064e11706e15f6ad83c4e7ac10859e784 WHIRLPOOL 21e9ce0b53f2e9fbd2e09fac33adfb7bf78a9b3c7f6a887d523345303398961ca7d3d9d9277d63966a7e609e75fe77f63169beb73ade0c859900aaf4fa5b67e9
 EBUILD ntp-4.2.6_p5-r9.ebuild 4276 SHA256 9dab6186242285460d39f8fd11ccbd9d2dc24b6d2a348bf69ca21ce99912f632 SHA512 dcd3cd8b990baa26f828c574d3ffac17ce422f0ebb2f73cd8d7bb12167b7b9be5f72358440da812905cdcfefbbfd626691c5a9e759458c410c15aec2afc5f2d2 WHIRLPOOL a3e6ea5bb2eab429ef7fbb58866957ad6185f4d79019485ec8189449ca153b7aca5912a6b10c158c1fdd6bb2105c2d43b0bdbaf74fb3df653c463e28c9e38a24
 EBUILD ntp-4.2.6_p5.ebuild 3817 SHA256 6128211172e7a6a101e597b3c288f68dcb71c564ba5652d828f2d2aa1123d7ea SHA512 0ed3a2d82232cf08539bcd5612f0509f09d2c39a426ca229e4f8d30fec5b53d00b576998c13a8e3ebc866fc69b99f0a18fbd9ba72dbaacd60695805354178f9d WHIRLPOOL 559b0955be950c79209c034bcdd4a57e7f48d997b4a3c6c25aa39ad0ab8d11c04f5664e0ffbfa27a7246b21222dc9f3869a27c64d439e077c7ec827342b22e54
-MISC ChangeLog 30445 SHA256 9fe6258bbafa9cd1458ae52cd86cb0a3bc941e6d7d425068de0bee83b64e1224 SHA512 e4904432b6076dbcec8a6cbc275cddc1a2a1cc6a068b9ba1f3af0854512a297702484dc249f956eb58b40638dcd349841f7b6c6943c45b6f9cd6896627d415d1 WHIRLPOOL c92a7a1b3ee06fc7acb44b4cadda026b220e7625a1e0052071dcbaeee358a68499631bbb523ba454cbb7bc4df6c5dde3fa3a659c2f9bf15c93c43012faa897b0
+MISC ChangeLog 30700 SHA256 576f2bedd4dd8c510baa29ae5249ada5a7c9fd639993c7e3dc38de49b1715289 SHA512 256c2ed8a223591337af807166c011549de26cd4d3864f6a63a19557bfab59286e0035136fb9f815294b6fabff05e3aff70a14790508c215f4defd0cf7e93756 WHIRLPOOL 0cbc23a3aa3d2a2491c2f29206aa7296888d30c74e512248a4db9ed7ca748603bf12728dfddc6f5c8e99f62f3e412dcefe38e3e2590f107fb4390b3d59114cc7
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlOy58MACgkQCaWpQKGI+9RhLwCfdkSsbc27VsEsq5S8v2z3RcwZ
+kcEAn1MkPKdFu1rCwLx/TVEowgQ8KoT8
+=KkIZ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/ntpdate.service b/net-misc/ntp/files/ntpdate.service
index e223839201f4..a6c75c9c14c0 100644
--- a/net-misc/ntp/files/ntpdate.service
+++ b/net-misc/ntp/files/ntpdate.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Set time via NTP using ntpdate
-After=network.target nss-lookup.target
+After=network-online.target nss-lookup.target
 Before=time-sync.target
 Wants=time-sync.target
 
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild
index d7c6bfc47d2c..e0672898e8b1 100644
--- a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild
+++ b/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.13 2014/06/23 12:55:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.14 2014/07/01 16:54:26 pacho Exp $
 
 EAPI="4"
 
@@ -107,6 +107,7 @@ src_install() {
 		rm usr/share/man/*/ntpd.8 || die
 	else
 		systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service
+		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
 		systemd_enable_ntpunit 60-ntpd ntpd.service
 	fi