Version bump #545836 by Agostino Sarubbo. Disable IPv6 lines in default restrict...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 901914e81e34a921debe7bb56cb8ac717882feb5..c31eb21ff38b1be1f1efaa439d9b5842d17e6c0e 100644 (file)
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.235 2015/04/08 04:54:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.236 2015/04/08 21:13:16 vapier Exp $
+
+*ntp-4.2.8_p2 (08 Apr 2015)
+
+  08 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/ntp-4.2.8-ipc-caps.patch, +ntp-4.2.8_p2.ebuild,
+  files/man-pages/genmans.sh:
+  Version bump #545836 by Agostino Sarubbo.  Disable IPv6 lines in default
+  restrict.conf when USE=-ipv6 #524726 by Toralf Förster.  Increase default
+  rlimit to 256MiB #533232 by Dennis Lichtenthäler.  Add patch from upstream for
+  crashes in ntpd #533966 by Wouter Smeltekop.
 
   08 Apr 2015; Mike Frysinger <vapier@gentoo.org> ntp-4.2.8-r3.ebuild:
   Delete broken info_trimble.c that ships with the source #545546 by Conrad

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 47b35022af8d530743b06a50f5a7a8f42f049cf5..251dcc4f9ff83ada6996b1e757ed18fc7a5a0054 100644 (file)
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX man-pages/genmans.sh 1864 SHA256 87f46fd035c9432e6dc9f8e4273aae2e5a9616dbaa13d20909a6e01044369c1a SHA512 03a8434f1f852d3eafdd0c63a19bdb490ac0194d81fd6d2e04fac5840169a48169b8bf7b5ad56b5ed61efba51852b0ce331eb8af0c640797075a530f88a916db WHIRLPOOL ffbe1ef7279ddb867aef9620f713b00af7fed593fd95c2f5c8a2b93670b6855bca1e5b22b63e8d07eee53b91987c9f82f5e45b8ca4935d566ab3c271d2d48ce2
+AUX man-pages/genmans.sh 1882 SHA256 455bf5a731355c60cb43305befeffbf528a5a6f33e17a72999d0eed65eec59e5 SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d WHIRLPOOL a5bf5f75edb7d32ad6804324a43736a25afabcea5a90e514dc1f83506953a62080e81842300ce9d69740e733df9e23f7503cb67941845c61e8372166611f5645
 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
 AUX ntp-4.2.4_p5-adjtimex.patch 670 SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38 SHA512 d2f50cd8894361b70125b43edba22661cca8b4ce3329c461c78d93b20ffc262f89ba20b6a923783ad85f785c870911712e9cb9ecdf0797832f65a89258e31168 WHIRLPOOL daa33249c492d942bbba2c632e1bc5b14109b4195614dcfc3bf219b5a26672630419b51253add5043bd9f70ca991d68e2c9c837ce5e6a9aad71352f7cb082402
 AUX ntp-4.2.4_p7-nano.patch 393 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4 SHA512 b8531f8b33a4d062ae5910e5775edc5e52a5df971b6fbcc7efdc55fa34681a38bc8881ab6164acfa692e4105bc1ae6d3e20fa06592cb04b7bd935dfd0abd9746 WHIRLPOOL 66dcf8cf79468c8f58e87cceeefea35ccbc930329eee18ed2b0b1c749aa645486207ebb413fe962c9b6824ffc00ed64636622194f8a3e4cf611d3b7ff822325f
+AUX ntp-4.2.8-ipc-caps.patch 471 SHA256 2b63684fdf2d77d4b85081b1d2809a52b34b1406c0d469000ae12795c4b91394 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f WHIRLPOOL c3dd13f7ef04d4f42e37da3ad6c205d91a312600eb45ff1497c8a6ecb58cc83f400763e23ce2f19aff0b025ce9890082d2b7f84cfa69acb13ca6d895a3e84cce
 AUX ntp-4.2.8-ntp-keygen-no-openssl.patch 4335 SHA256 8c13773cc10a0b51b94801bd779c57d412048d3d9e1684dcf5d38e512ccfb639 SHA512 d8bbcc99a25eb8f0ddf940b3765bd37655958a6b39060891046c87ef109e173884e81b4b5c25a1bb4cecc1457d88c404332d224b525f255c19a6a63f60df1194 WHIRLPOOL 3cdf5f556073b4bab3350ad2e81113cf842a0caa3b8460d656b7b5550209d458e5602a5c2b09358f125556e1770f26a6e626bc42b48978f0d42e329ded84ee31
 AUX ntp-client.confd 776 SHA256 c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5 SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 WHIRLPOOL 7282c74d564f776cb6e8e15d79cb77e60088c516a71f87c28d96bda7e67bddc3d35e01cf86eac58655c2536d0a4a023b6142527bc8ec62318524114502d5cc99
 AUX ntp-client.rc 827 SHA256 2e4a42dd64b7c6dacfcfefdab8dc1e7c45d7a0966ef8b928583d18393362c719 SHA512 04cabf1c501922f5c90a3201ee3418acf3934cb4e61640c3915b7d515f246d8fe3ac38f10b9947d574878b92871c9dba59d351a8c15eea1dbde52f518ecac7a5 WHIRLPOOL 08611b1dcacb85fff955c3c6af7118704b7b9a269d8070a538854aea980e5975c0d72ea9bc6f42115e871937a9f90b64d12bda01040a45c5dc70d144f4343d00
@@ -27,27 +28,30 @@ DIST ntp-4.2.6p5-manpages.tar.bz2 47874 SHA256 f49203cba2301ce27a53113a6e22d844b
 DIST ntp-4.2.6p5.tar.gz 4202539 SHA256 d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c SHA512 8d76fc7e92b2ea6dd5031e6030a7aba4ff6fb3e19d3bc0153852509861be5d0960e70604814163caedb81f8315a451d78371f99634a50b55cfe1cbd2c69e3046 WHIRLPOOL 9943706ad02e377cb38d65caed6f675d37db7aa53dd86319b17405791494bf11244ac933867516cca9438947202b595b6606088a8aaa436655f9eeb8d078b77e
 DIST ntp-4.2.8-manpages.tar.bz2 46542 SHA256 9c68840456c7002796baea70231e6cf7f6bc06583bbab370a09f837a66f2c409 SHA512 a87db65da978fcaf123763a6de59a399a3c799d59374acd1c397d7a7816e6ee2ff6091f24ff41223cf719effd2e595dfa7699006a724d2908d380c6098603d28 WHIRLPOOL cb0e53cc0132573d6b2910301c1d7743874598b1487968ec9e49f467a8aa62340609379c8cffb42da2694703955581629aa78897a9319f71b3589600e882b9b0
 DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee SHA512 d69ed02e57c66d5c57616bb5e4be0d58e7410dd27ea96acaed6e8b63726a37cd22ae73e8bdff089abbe8e19bcd8bee05733ab362249018fc495fcedc71aa3a44 WHIRLPOOL 4bfe1222c250425e3fc229649d1d4ae11fa6a32eb03f9d15b95575ee31171761321730c83d6e283551fc89647370a86791ec1c262c49826b31106d4317fb64e1
+DIST ntp-4.2.8p2-manpages.tar.bz2 46421 SHA256 c22f74e0361e5eb921e495ff0f1b8987c26d90db72393dfb307f68498d6501e8 SHA512 8b211e891e96006ba4fa054fe5f111ae5b52cc4b990d4bbe691fd0724f6373ec54428fc39ea0cffc8fe66f757d6f99355ac69f3dc76ad43f8f95c145f3adee9c WHIRLPOOL f1b85c4e39934d308dbaaca1b22779e33c18489abfd9e17ad26368462032445d164a2dbb96fa9865128bc138ce8f8f8790d9eeffc0c37339ed5eafa0ee687a72
+DIST ntp-4.2.8p2.tar.gz 6820869 SHA256 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 SHA512 7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0 WHIRLPOOL 70d63c895a62bcd790760e6205d6b666ab47dfc9fc8737f10d1cd7d4a2c3cafb4efe6b8141570921c5024e71b00ebca73574562694678f448ee7680a982a0084
 EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62cefea076fd8080d1c57a9ae305fc SHA512 18137975fa6703d877a8357da1c24279f1ab001b767257c827b10692994a8636b4fe849b5951f9a1dfbaef47c89c7356299936f82a9474aa8901d7cb3a9b1587 WHIRLPOOL ecb4b932b3ce6c86ce57c86818f803568642d654ca9925f4283a790096ae42f9ace6d6862907b171111daf8a5f0cdc68bc6fbef34a063ccc72be5fb613476bcf
 EBUILD ntp-4.2.6_p5-r11.ebuild 4416 SHA256 d6808650a0477ccae3e0a30577c24a40d789209be87098291fd949e0954f49af SHA512 cf6b5afc4c78c318af4c9f9cd4c90a0942c02f88eb61f985e6fa31352f7a11e3fc971d9913ab6d6e6101e3b02fea529573b3a91f9cfdbdc9b8dbea4b67b29115 WHIRLPOOL 56b4ad2d444dd2d95b380eef283a1f92a4bbedf103875e0eb5bbce183f862c403d8d705b1e83130c4a4dc39bdcdbf3d84a40cccac39c135cdf59a11238485209
 EBUILD ntp-4.2.8-r1.ebuild 4210 SHA256 446c49175af1b8c6eb9a871c491d1330b447cf523b3dcfe7853cdeb8b5a0eed5 SHA512 5bda7c90d38a78375664b073b3a217dbc116f46297eed8c14115f09dbe3aa4700eb6500cb9be04a3d1454a72fa624063548fa59abf6f2bd9e98df26a73c89759 WHIRLPOOL beff9484635e81e260e14eda43939e8d4674dbcbf2ecf48a4dd9b0aa8add121919fc9c1a3c22eb1abc2b2534cb1d76d5b69f4444a666c5aa07e98eaae1fd9a0f
 EBUILD ntp-4.2.8-r2.ebuild 4825 SHA256 9afefc5811cee4570de6904b0622d76db8a4f715ef611055dac3c8a2cfca9053 SHA512 0886d3c0d748c2d956b3117b92a4e8f56830b03137bceaff1a965032b6f678694f4bccb49a0a3e5e9ef562db9e310e3ff7b076f73e858a24e10ace1e1dc77ac7 WHIRLPOOL c6bcc2b107ccc6066327b3c2b63801c3f312e9ce39eb5380b74e93a246af7a5ffcc2a3149c3e149ade7350821d0714fa1e064a284094d91a1c3015a31390fb29
 EBUILD ntp-4.2.8-r3.ebuild 4621 SHA256 8ad41af34c59ce5912cbb7d26e516fa2da082d0bea86141f21af183d1e178074 SHA512 fb4c2ac146f36794be4eb9f8e6d757df207744676224ed264e12dcb1334ced213833e7129682090816e94a37ef3140e5a3fed8f34b987ea5ca7faaf9bd340a83 WHIRLPOOL 6e43a55142ac3d672c0ec10a4a0796ea274e19db8c3a5bb92ff6003dd427ea4a70410633c4c7f07e245dea7cfe49a1048e483aec9f951d1e3cf6f84005fdd3b1
-MISC ChangeLog 33780 SHA256 c46231ff602cbdcfac070a46598f56d1a3421c48d801b814d43a88e8b7a0e2ca SHA512 dd3b74928f2ecf9f778df3722d34200d7f2d81fa8ce88799b050b921d6ea247abbd7b3ea8381a8d566a475c0ddaae45284efb10022420d36238af309738c5879 WHIRLPOOL e9bee0cecd3c29dcd3082e56170ed424e212b393ab13db6e4f63cb9d9e40559b740adcaff81ff3e34f24cb2179c8e75d8cc39c209405daa615ab2b3161b29666
+EBUILD ntp-4.2.8_p2.ebuild 4316 SHA256 6320f84c5ccb5bb4d53d8689ec0cc85e0e172eeb7cc0d1f7f654ce8f2c3a2594 SHA512 e14f4f4b254c4c8bb30ebcc9519bccfa486389f4dfe110029cd8933dbaf1fba0f38aaeb4d06efb3eda0a7a9705906b9801d9fc91d8435ec2d28c72f2409a14c2 WHIRLPOOL 76dec117f1401938257a02863af2308087a14bb9811bccfd75433e5cdd7017a8284b6a41ad1ef2bc2269fde806f051cad2785a459de1a8a0b5a0372f8111d46a
+MISC ChangeLog 34228 SHA256 22e7246eb621bc3a631ee6a41ccd165874904a54c7f8e4a3ab67e81097000f38 SHA512 f80bde72ae8ef5735eadb3277b4d2c2527aa0bc8d1347cd26a56827ba5fec6e7348b6ab3a165aac06309cac7bca0b44cba9fb800f97729f5734653af0be0a0f9 WHIRLPOOL cdcad3950546f291a43c0275343c30f570f858fe46d1bda108dbac84d08f5d2ba6f3309afc8c8742613c56c6595ee84bf6ac98c8c5e51bf2ef84085c1f2909c8
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJLSWAAoJEPGu1DbS6WIA02sQAJrNRDFXx7jZy3fyDDjMitwM
-JNkwP9Aa1XftC+bsRdOhCYoXSHVEbrhojZrhSBmaQwcaRRLvCtd+TTbQXiMjuNfd
-rvxSS8ePI51TMnDY4uJMjIvs+fKpasFogfxb9rLx4m29NRA43IgbdqvugJOTgH/F
-TwpIRneREWs0bsUvGvW4VL2sYJlxSiG5qK5VWsxqEsDPmG+RIH5I/0BKZAIDbE8I
-CH150T0EKXuosyTIO/dRCJPmaXGG/HesQZzl5yItcDya+csPONk3MBGr0bSbY6xm
-Srui3rMe8r2N2Rshztenp4ooCbGTrnU1bqzM60fyMCgO1lQEqVxcexzlTwEGV+e/
-ohghxTKA/BHjw7gTZXTMgYmIPXysxwpmlBLIL9/eNWV4/QXrRY+TihL+cMeoSpUO
-FC7IXJsObs3hLbXcdqhF4tUl3cDJe9tOP/FTl4AP16RGSK3odosPkfxkjnZWVMoD
-xhvLequnR5ZB4fHRwhe3ofmgeCuoUAvUB///ETo4wIy2UnBSovRnpKhfZcMVMthQ
-OFroNn6XMYnUalckVVN7KyxTZlKQG4Ce25oAjSVsVSnmpOgKdWHtdwdrm8WtruS/
-SPaEirmRy4VKiJfpXNB2tOO3c7cwvdoSzQaCDag2NI2HPRdC8OrqqQvk3qSvexPe
-eWKAjVZFyegMXBCeuTSq
-=uNLp
+iQIcBAEBCAAGBQJVJZntAAoJEPGu1DbS6WIAuMIP/1TdtwjXX/TCFH3ukrkvufj6
+0e3qTqvDcFte/03E8aO9i2pXOc9HIZzNZ4p0MqjNJSQLmg5RppPhhtPnOm6xmnjE
+WSdv/XrAbfnHxDCrA7l7bK57cAkeexL9vKe7AvDWBm8DWh6oIHRgW6CSChvUvoay
+9eJgk3l3jK53rbHbzHNCcPW0XBWNAPKvpb0t3M/KGMSxOsfNaEkfvpNuOxrgOiDc
+ZD3qPn0L95t9axzAmdqD7NA9X899H6lzH0HxlSvK35whsK5v2B+nj5eM20Zavdd0
+dMHWkbYQNUv3sJLxFok7UBSgTC0rKwg0GsAZG1MK1HxQep/L/XE6iQKUv8X/8rM2
+AsK4zCsQl/3oCm6FmJ9azq5RktcFRINSxAN/CeiWtqkffermKkdma/w41uwW13PM
+hwOPdIr4+h9zX3ZWVKNK+guNwWVM+1sdtKVFGNRNyTkzM21na4abTEAeUFE5ptJr
+kS/GvgVZSQFQ4wuOW+VES3w7WgF8WE9s0MnSHUrNq8vXHuJLlc7BYt2IvZxOks2m
+pQfI4RUnJbpr4e50zQB8/wB+zUyOfT67Rolvyr9ZpDsrtto2jHTIWmXUyWXG/GaC
+9JIx1sty9/1diHy3Z2avRdmQ7EMkDVlBW15O0mdTot3MPz+mOfWjpK8qjNTMgMOf
+3nKIM8u0EbcV6/z39TqX
+=u4ZV
 -----END PGP SIGNATURE-----

diff --git a/net-misc/ntp/files/man-pages/genmans.sh b/net-misc/ntp/files/man-pages/genmans.sh
index c0e6182899907bf508c8d541e687bf58fe311891..bae21e265f908e4c62d98b6c24f66649e16ff5c6 100755 (executable)
--- a/net-misc/ntp/files/man-pages/genmans.sh
+++ b/net-misc/ntp/files/man-pages/genmans.sh
@@ -62,6 +62,7 @@ cp -vi /usr/local/src/freebsd/src/usr.sbin/ntp/doc/*.5 ${MANDIR}
 (
 d=${PWD}
 cd ${MANDIR}
+shopt -s nullglob
 for p in $d/*.5.patch ; do
        patch -F0 -p0 < $p || exit 1
 done

diff --git a/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch b/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch
new file mode 100644 (file)
index 0000000..a1e5580
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-ipc-caps.patch
@@ -0,0 +1,16 @@
+http://bugs.ntp.org/show_bug.cgi?id=2646
+https://bugs.gentoo.org/533966
+
+--- a/ntpd/ntpd.c
++++ a/ntpd/ntpd.c
+@@ -971,8 +971,8 @@ getgroup:
+                       char *captext;
+                       
+                       captext = (0 != interface_interval)
+-                                    ? "cap_sys_time,cap_net_bind_service=pe"
+-                                    : "cap_sys_time=pe";
++                                    ? "cap_ipc_lock,cap_sys_time,cap_net_bind_service=pe"
++                                    : "cap_ipc_lock,cap_sys_time=pe";
+                       caps = cap_from_text(captext);
+                       if (!caps) {
+                               msyslog(LOG_ERR,

diff --git a/net-misc/ntp/ntp-4.2.8_p2.ebuild b/net-misc/ntp/ntp-4.2.8_p2.ebuild
new file mode 100644 (file)
index 0000000..768dd08
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8_p2.ebuild,v 1.1 2015/04/08 21:13:16 vapier Exp $
+
+EAPI="4"
+
+inherit autotools eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+       mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1 )
+       >=dev-libs/libevent-2.0.9[threads?]
+       kernel_linux? ( caps? ( sys-libs/libcap ) )
+       zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+       !openntpd? ( !net-misc/openntpd )
+       snmp? ( net-analyzer/net-snmp )
+       ssl? ( dev-libs/openssl )
+       parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-ntp )
+       vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       enewgroup ntp 123
+       enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+       append-cppflags -D_GNU_SOURCE #264109
+       # Make sure every build uses the same install layout. #539092
+       find sntp/loc/ -type f '!' -name legacy -delete || die
+       # Disable pointless checks.
+       touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+       # avoid libmd5/libelf
+       export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+       export ac_cv_lib_elf_nlist=no
+       # blah, no real configure options #176333
+       export ac_cv_header_dns_sd_h=$(usex zeroconf)
+       export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+       # Increase the default memlimit from 32MiB to 128MiB.  #533232
+       econf \
+               --with-lineeditlibs=readline,edit,editline \
+               --with-yielding-select \
+               --disable-local-libevent \
+               --docdir='$(datarootdir)'/doc/${PF} \
+               --htmldir='$(docdir)/html' \
+               --with-memlock=256 \
+               $(use_enable caps linuxcaps) \
+               $(use_enable parse-clocks) \
+               $(use_enable ipv6) \
+               $(use_enable debug debugging) \
+               $(use_with readline lineeditlibs readline) \
+               $(use_enable samba ntp-signd) \
+               $(use_with snmp ntpsnmpd) \
+               $(use_with ssl crypto) \
+               $(use_enable threads thread-support)
+}
+
+src_install() {
+       default
+       # move ntpd/ntpdate to sbin #66671
+       dodir /usr/sbin
+       mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+       dodoc INSTALL WHERE-TO-START
+       doman "${WORKDIR}"/man/*.[58]
+
+       insinto /etc
+       doins "${FILESDIR}"/ntp.conf
+       use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+       newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+       newconfd "${FILESDIR}"/ntpd.confd ntpd
+       newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+       newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+       newinitd "${FILESDIR}"/sntp.rc sntp
+       newconfd "${FILESDIR}"/sntp.confd sntp
+       if ! use caps ; then
+               sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+       fi
+       sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+       keepdir /var/lib/ntp
+       use prefix || fowners ntp:ntp /var/lib/ntp
+
+       if use openntpd ; then
+               cd "${ED}"
+               rm usr/sbin/ntpd || die
+               rm -r var/lib
+               rm etc/{conf,init}.d/ntpd
+               rm usr/share/man/*/ntpd.8 || die
+       else
+               systemd_newunit "${FILESDIR}"/ntpd.service-r2 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
+
+       systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+       systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+       systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+       systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+       if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+               eerror "The notrust option was found in your /etc/ntp.conf!"
+               ewarn "If your ntpd starts sending out weird responses,"
+               ewarn "then make sure you have keys properly setup and see"
+               ewarn "http://bugs.gentoo.org/41827"
+       fi
+}