version bump (bug #536032)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

8 files changed, 240 insertions, 9 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 0a8df2580575..eef4c8a5730c 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.128 2015/01/12 18:01:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.129 2015/01/12 18:09:55 ottxor Exp $
+
+*openntpd-5.7_p1 (12 Jan 2015)
+
+  12 Jan 2015; Christoph Junghans <ottxor@gentoo.org>
+  +files/openntpd-5.7_p1-driftpath.patch,
+  +files/openntpd-5.7_p1-gentoopool.patch, +files/openntpd-5.7_p1-runpath.patch,
+  +files/openntpd-5.7_p1-signal.patch,
+  +files/openntpd-5.7_p1-warn-s-failure.patch, +openntpd-5.7_p1.ebuild:
+  version bump (bug #536032)
 
   12 Jan 2015; Christoph Junghans <ottxor@gentoo.org>
   -openntpd-20080406-r9.ebuild, openntpd-4.0_pre20080406.ebuild:
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index dd8e9b7cb20a..87b9764004dd 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,22 +4,29 @@ Hash: SHA256
 AUX openntpd-20080406-dns-timeout.patch 1225 SHA256 c7f7b28db8028bd892a31958849e61227f342f9f16efa0a51e6cb9f91b307d0e SHA512 9e7a86029185ea427b4952352ccac2a2508432b047346fe6d7823f254f9f2b59f2b3e752a0bf2e0a673daf6e0506657acf3973c67588e77fc0ed76798093fd5f WHIRLPOOL 2e5c95378b0e70723413c3d6f99e66448b1a009efa18130e4905c6733de0f9c0348899003b1af5663894e10659ef5f2ff96fe5340ee913b0c7d0c588b5f6ff94
 AUX openntpd-20080406-pidfile.patch 3500 SHA256 6580ab9290ea19ec17f67b1b59a3790546b58a5c06ed82e660e79e393681ba89 SHA512 9647e53c17330a255ace93e1cc40547de57d6f7337d2cbc0bfb58d4a77f5ad79423421e1c6280db1c31fcafcd77903a8fa60d30d883ee0be671bebce10e557a0 WHIRLPOOL ac289e1a3f6ce41cf4721aa834bd88d993ff144d8b630c55f39e7b96f74de38a0ff609c30baab9e4f5f595cd8ccf7939fb4070432e8f8acca5827a04546e2797
 AUX openntpd-20080406-signal.patch 1587 SHA256 06febce7828dcd351c62544685ff084157716f3ce8c8858cde87a987ed4685b5 SHA512 09cc248490ef88ca0f911d799fd513d3ce577a58a2ccbd82a561580bb79e7b9cba6a62220c8ae5bf20f1ac91fe833e4f383dac73e3bd7593ef9ebfa49287f565 WHIRLPOOL 389c86b7b6338c270f93b4c93969030790b2594d09db911311dfab667d598a35ed1dcdfb8325a44f1e5a8091e85565b4ba8a16b4f3e505adc449ceff20dc7666
+AUX openntpd-5.7_p1-driftpath.patch 1245 SHA256 7a6f9f58d0b4d51b580e6b665bdead03e1383f205d0f8ac3bd571575b2d43edf SHA512 14330b1865bd6ac7a8c36f6c71e9649714631c49443aa3b08fbc22d2baed50fcdd578ce53bc681ecaf3c000ac57170ab735eeaaae4a192c4dbe17ea9fa20b778 WHIRLPOOL 045ddca163182d05f54e4727c295363dabc8cb6c2995e0e235ed27b6b01335901480b22980a594a8d52bcf0d5b6201f3db7b1304646478b173aada1b79002d80
+AUX openntpd-5.7_p1-gentoopool.patch 553 SHA256 1a04dc8610569babb013aaa188111482221d7c73310fb5660899e507aa9617a9 SHA512 e6a2efe366dc1cd0b8867ef658d8da6720c08999ceea84a027819f281fc932d76db81bffe56183b1c646992ddef86a210b789d1449bf211c49634f1448373cea WHIRLPOOL 578d0de20a0188503b95c8b286c6a9ddea459e76260e369bba8225ec4d0da9858c3d6e608bc98efc10c5ad4dcbada26bd25fcf0fb465097152047837d91535c0
+AUX openntpd-5.7_p1-runpath.patch 1281 SHA256 5aad437c8c5895525a06b0d316ac4ff48b4fbfecc66fee17c1eb17131df4d6da SHA512 f3bba088d7251c6ce0ecae0d23bb30910add4a6fcd4005d4c8eaa72fdf9fe6e775e5c0e9d949186bf141274631a7c9a4975b284fcc3370a642a02011177a42fb WHIRLPOOL 05eb38b88b03d62444212242526e42b3a555d051e9ea61fe2447680640c6a63440a9773275edd54836aac40de1ca9e4f2680a776f3c3ad00414770135daefd51
+AUX openntpd-5.7_p1-signal.patch 519 SHA256 999ff799adf14e0ec9c66666a801dd493f114a17b3397e723f8b7181e5827246 SHA512 574bb49be6d23e691898524b2feb04a12a9378b68a5e50581f651c8ba57b71cbabce211251dcdabe8e2bcb5863175ee6c9018347760e7293811e388d30dc1a58 WHIRLPOOL a1860bc52262fac4d30a1aa94e30138c8429243bb29d38d35abc36fb731fcffcba7a323c823e3d7f5104ae7cc83846aa0ade3d723ead60bb273def028fd49538
+AUX openntpd-5.7_p1-warn-s-failure.patch 475 SHA256 3bba63e1766f7d583bfa24d641f423f7ecc2aaa33e75819198741e7b01c94daf SHA512 c6050a68918c85e79dac07416d705c6d22014ee8ac37a3eb8cd38f9430179476fdcdfa81006502c121b113d102ccb883c7c5a13ec6d5ca6a31cbd4bb9dd193ee WHIRLPOOL 39a0f5bfc0650eef163aef9f30a31faca8f72839d746efad335af1a95ceb605c389e8bebbdb67d7330b1680279987f2eac131a0925e32eb7491de08745f323c1
 AUX openntpd.conf.d-20080406-r6 255 SHA256 91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059 WHIRLPOOL 9fa127624f50b01ba1b5872262d26b18362d3784a73021e608bd8a6cead2499cabf0fe5eafeaa315548e97285228a6e70689a3cadbdb7031ac00e23bf064e3b9
 AUX openntpd.init.d-20080406-r6 417 SHA256 fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876 SHA512 e5ea7b26871e92a04713c93b0d60d435839f9321aeea7105330b9d9d4259d98581d6da6224274fae89cf7107329a28a9348c8c40a9372c5fc7bc7f5d47801a3b WHIRLPOOL 72626acd887bb997dae48fb717a94f046e2a3f4b01bad72cffc8da03bf388528149f37c6672362ed0661c9582851ebd77124749dcc9238bb013d6f2ccc2bf78f
 AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
+DIST openntpd-5.7p1.tar.gz 400113 SHA256 071cfdcfc179c481568a2b8262945243a3123abfc7fa8831da1bbff3729b8307 SHA512 2fe6f7daae147eca616bbc76bbcc9d0d2d03cb705f1437a3fa21c98114ce9b78eabbbcbf9ed38d4d7752936a9bf2ee2cabe0a75dfa8f00980088dc2d9f8ac4df WHIRLPOOL 79120a4634badc3b0f38d621bb369f07672ec7d3e27e953012fbb84ffac15d09c9a7ba2f1cb0cc17c1b2bb580308e6beddc5968e8e771b10ee39afbeca24c502
 DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 EBUILD openntpd-4.0_pre20080406.ebuild 3242 SHA256 c63281f7874ed6cfd767d5bf8f2feacd63f0d2e6e501dd7f8af4b63f91ee78d3 SHA512 04c3843c4cbaf27dd12e5880d6a1a6921db7f2481575f6d5f3fe6e821cc151d568dacd64adb0d239e38c2a7217e28a91f690d88a4d6be26970952dcb424f3464 WHIRLPOOL c0f7447735b237d5777aad88858f738f0395154ebcd3a10a679f8e6280e48ae14b986765071db124b130df735049ec70d61710c766dde05bd4019f7b7532b870
-MISC ChangeLog 18115 SHA256 678eac359007a49b71e9f3d6dbd8fc38a6f7cafbb133015ff6f88429abdf221c SHA512 f54aa7b7f43bd438e15f794ecb04d9da86136f92194438540c111b12a4e95267e03bce756ee56834e7bdb11a6975cb1169d473349832afc172438a6ec18c8a7e WHIRLPOOL 46d35ba87e0f61ef736f23295b89104540dcd6f3558323d5e595eb242f8740d8d8165bcf1cb9f910d0083528c581fe187aa4e918c86c4ad98fb228c04932fc0d
+EBUILD openntpd-5.7_p1.ebuild 2923 SHA256 5b616b89dc6222de47ab5498b8b1aef7ad21e8d0f5c1812a9828c224b34e7737 SHA512 b88d5efbc9c595938c99f424959e5a531594055a66e77a807fdcb36c542bc25a902d3480d3255bbd71a3b2af71a53af11f81680ecda7f608c1a3128e86b9dc6a WHIRLPOOL 26099de5d12c87de39c85f8c99b4fa12a016d4a32f09b78f8463a71fe5034cd2c62fa4ad98a90fbdc43e523a3916bc3ac1ecf154c46bec4ad9d9c2eb7e37b35a
+MISC ChangeLog 18465 SHA256 8ad54430375a7a91d4840892bb038c5ba34a0e1e6a6ede96918ba1082c6dcd92 SHA512 30ba10f487076fd5f1d993c3b183279cd54bedd68c8e0a28b95dc3cdd0108a7251b0383c30ac5876368a2233d975e1c2c4c891c034c82520f5e5591144890c22 WHIRLPOOL 6b0c53fef2c07b2f9e76ede63f915cae4e96bcea791b2058af7b8e4af42c3d5ece9c2d7deb98f47eb2c482fb473ea9346f9eb57eeff9a645d2868a98112d1e1e
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUtAwBAAoJEOeBhlrCAAWGTSsIAKLUfFbd1kCkQodEkanLeD4E
-RYW8DPzXiDOloDWhKmAp0NikrxtHGmmnxVrDaoDdoq+Zevu6Hs/KqqGhw3j6Ezlq
-bDxsyr8fQX4fCCqyUS3zn2RXNcruU8x9rhbCY7vnYlex0tQEOIr7UfondAEJ8aJZ
-7We0xoxCFVDqpnp/uLMzWTwMQ5IwXmS9cV9NWDw9SBKPh3ltcfToPA+gTCeWUrjp
-HwlaFzUPI0LCtOl9uXbwZWlEHEndxQBvE4iI1I+bIyGhZwt2R1yiEg7y1J0ng+GS
-rD+qtkvAv9pJxxE9ZIgfy7H9V9aL5whjytDGUMZnNZCjgQnKZp9jbSYxtRshzUI=
-=tvAU
+iQEcBAEBCAAGBQJUtA30AAoJEOeBhlrCAAWG6lUH/0joQs0LXINmiYrkIthV5sSc
+IHCYwquFUpI92ZOz+Ohzv2lNf6qkUMfhulNktY4flMtCKZX/wp0ZWYeGhmGl1N8Z
+kaiwZbKMEeKXeUm2oCr1oADgVlDOX/6xYDzSLeLTHua+/TiO9qZcfu+98PNgXZDh
+tZCgE8mGFUTG0OqC9svcaRQGkYVPr5kFu+8DCmymumt6XR7mavQXyHRJIyZYUPR8
+Iy/CgF1GiaYGQcoB+AolGR3WtM6ZuHbVWeP0y3izYF7EZu1Cr1V8MenJVQq2aEha
+pKU6HUf4OVTYlXZ235EK4wYdspMEPfWq4YG8mMDqju3RL1/FeBdLGLAZ2kOhFGs=
+=BkqB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-driftpath.patch b/net-misc/openntpd/files/openntpd-5.7_p1-driftpath.patch
new file mode 100644
index 000000000000..f95379319fad
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p1-driftpath.patch
@@ -0,0 +1,37 @@
+diff -u -r openntpd-5.7p1-orig/ntpd.8 openntpd-5.7p1/ntpd.8
+--- openntpd-5.7p1-orig/ntpd.8	2015-01-09 16:22:41.451768526 -0800
++++ openntpd-5.7p1/ntpd.8	2015-01-09 16:23:23.840778527 -0800
+@@ -118,7 +118,7 @@
+ typically
+ .Xr ntpd.conf 5 ,
+ and its initial clock drift from
+-.Pa /var/db/ntpd.drift .
++.Pa /var/lib/openntpd/ntpd.drift .
+ Clock drift is periodically written to the drift file thereafter.
+ .Pp
+ When
+@@ -129,10 +129,10 @@
+ signal, it writes its peer and sensor status to
+ .Xr syslog 3 .
+ .Sh FILES
+-.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
++.Bl -tag -width "/var/lib/openntpd/ntpd.driftXXX" -compact
+ .It Pa /etc/ntpd.conf
+ Default configuration file.
+-.It Pa /var/db/ntpd.drift
++.It Pa /var/lib/openntpd/ntpd.drift
+ Drift file.
+ .It Pa /run/ntpd.sock
+ Socket file for communication with
+diff -u -r openntpd-5.7p1-orig/ntpd.h openntpd-5.7p1/ntpd.h
+--- openntpd-5.7p1-orig/ntpd.h	2015-01-09 16:22:41.452768549 -0800
++++ openntpd-5.7p1/ntpd.h	2015-01-09 16:23:55.100523371 -0800
+@@ -48,7 +48,7 @@
+ #ifndef	LOCALSTATEDIR
+ #define	LOCALSTATEDIR	"/var"
+ #endif
+-#define	DRIFTFILE	LOCALSTATEDIR "/db/ntpd.drift"
++#define	DRIFTFILE	LOCALSTATEDIR "/openntpd/ntpd.drift"
+ #define	CTLSOCKET	"/run/ntpd.sock"
+ 
+ #if defined(SO_SETFIB)
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-gentoopool.patch b/net-misc/openntpd/files/openntpd-5.7_p1-gentoopool.patch
new file mode 100644
index 000000000000..1b7d71354e14
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p1-gentoopool.patch
@@ -0,0 +1,15 @@
+diff -u -r openntpd-5.7p1-orig/ntpd.conf openntpd-5.7p1/ntpd.conf
+--- openntpd-5.7p1-orig/ntpd.conf	2015-01-01 21:00:03.000000000 -0800
++++ openntpd-5.7p1/ntpd.conf	2015-01-09 18:59:46.404092984 -0800
+@@ -8,4 +8,10 @@
+ 
+ # use a random selection of NTP Pool Time Servers
+ # see http://support.ntp.org/bin/view/Servers/NTPPoolServers
+-servers pool.ntp.org
++#servers pool.ntp.org
++
++# Choose servers announced from Gentoo NTP Pool
++servers 0.gentoo.pool.ntp.org
++servers 1.gentoo.pool.ntp.org
++servers 2.gentoo.pool.ntp.org
++servers 3.gentoo.pool.ntp.org
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-runpath.patch b/net-misc/openntpd/files/openntpd-5.7_p1-runpath.patch
new file mode 100644
index 000000000000..144c1416cf09
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p1-runpath.patch
@@ -0,0 +1,38 @@
+diff -u -r openntpd-5.7p1-orig/ntpctl.8 openntpd-5.7p1/ntpctl.8
+--- openntpd-5.7p1-orig/ntpctl.8	2015-01-09 16:16:37.102087085 -0800
++++ openntpd-5.7p1/ntpctl.8	2015-01-09 16:18:07.162232969 -0800
+@@ -55,8 +55,8 @@
+ system call, is displayed.
+ .El
+ .Sh FILES
+-.Bl -tag -width "/var/run/ntpd.sockXXX" -compact
+-.It Pa /var/run/ntpd.sock
++.Bl -tag -width "/run/ntpd.sockXXX" -compact
++.It Pa /run/ntpd.sock
+ Socket file for communication with
+ .Xr ntpd 8 .
+ .El
+diff -u -r openntpd-5.7p1-orig/ntpd.8 openntpd-5.7p1/ntpd.8
+--- openntpd-5.7p1-orig/ntpd.8	2015-01-09 16:16:37.101087061 -0800
++++ openntpd-5.7p1/ntpd.8	2015-01-09 16:18:17.853487710 -0800
+@@ -134,7 +134,7 @@
+ Default configuration file.
+ .It Pa /var/db/ntpd.drift
+ Drift file.
+-.It Pa /var/run/ntpd.sock
++.It Pa /run/ntpd.sock
+ Socket file for communication with
+ .Xr ntpctl 8 .
+ .El
+diff -u -r openntpd-5.7p1-orig/ntpd.h openntpd-5.7p1/ntpd.h
+--- openntpd-5.7p1-orig/ntpd.h	2015-01-09 16:16:37.102087085 -0800
++++ openntpd-5.7p1/ntpd.h	2015-01-09 16:18:38.837987712 -0800
+@@ -49,7 +49,7 @@
+ #define	LOCALSTATEDIR	"/var"
+ #endif
+ #define	DRIFTFILE	LOCALSTATEDIR "/db/ntpd.drift"
+-#define	CTLSOCKET	LOCALSTATEDIR "/run/ntpd.sock"
++#define	CTLSOCKET	"/run/ntpd.sock"
+ 
+ #if defined(SO_SETFIB)
+ #define	SO_RTABLE	SO_SETFIB
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch b/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
new file mode 100644
index 000000000000..68bd5992eeac
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
@@ -0,0 +1,17 @@
+Only in openntpd-5.7p1: .ntpd.8.swp
+diff -u -r openntpd-5.7p1-orig/ntpd.8 openntpd-5.7p1/ntpd.8
+--- openntpd-5.7p1-orig/ntpd.8	2015-01-09 18:51:48.724711211 -0800
++++ openntpd-5.7p1/ntpd.8	2015-01-09 18:56:32.461471870 -0800
+@@ -126,7 +126,11 @@
+ .Pq engine
+ receives a
+ .Dv SIGINFO
+-signal, it writes its peer and sensor status to
++signal (or a
++.Dv SIGUSR1
++signal on systems without
++.Dv SIGINFO),
++it writes its peer and sensor status to
+ .Xr syslog 3 .
+ .Sh FILES
+ .Bl -tag -width "/var/db/ntpd.driftXXX" -compact
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch b/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
new file mode 100644
index 000000000000..884c0865d4c2
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
@@ -0,0 +1,12 @@
+diff -u -r openntpd-5.7p1-orig/ntpd.c openntpd-5.7p1/ntpd.c
+--- openntpd-5.7p1-orig/ntpd.c	2015-01-09 18:58:14.498903138 -0800
++++ openntpd-5.7p1/ntpd.c	2015-01-09 19:00:59.917844614 -0800
+@@ -242,7 +242,7 @@
+ 			lconf.settime = 0;
+ 			timeout = INFTIM;
+ 			log_init(lconf.debug);
+-			log_debug("no reply received in time, skipping initial "
++			log_warnx("no reply received in time, skipping initial "
+ 			    "time setting");
+ 			if (!lconf.debug) {
+ 				if (daemon(1, 0))
diff --git a/net-misc/openntpd/openntpd-5.7_p1.ebuild b/net-misc/openntpd/openntpd-5.7_p1.ebuild
new file mode 100644
index 000000000000..aea04df87a78
--- /dev/null
+++ b/net-misc/openntpd/openntpd-5.7_p1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p1.ebuild,v 1.1 2015/01/12 18:09:55 ottxor Exp $
+
+EAPI=5
+
+inherit eutils systemd user
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+
+MY_P="${P/_p/p}"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+CDEPEND="!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
+	enewgroup ntp
+	enewuser ntp -1 -1 "${NTP_HOME}" ntp
+
+	# make sure user has correct HOME as flipping between
+	# the standard ntp pkg and this one was possible in
+	# the past
+	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
+		ewarn "From this version on, the homedir of the ntp user cannot be changed"
+		ewarn "dynamically after the installation. For homedir different from"
+		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
+		esethome ntp "${NTP_HOME}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-runpath.patch"
+	epatch "${FILESDIR}/${P}-driftpath.patch"
+	epatch "${FILESDIR}/${P}-signal.patch"
+	epatch "${FILESDIR}/${P}-gentoopool.patch"
+	epatch "${FILESDIR}/${P}-warn-s-failure.patch"
+}
+
+src_configure() {
+	econf --with-privsep-user=ntp --with-privsep-path="${NTP_HOME}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/var
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
+
+pkg_config() {
+	einfo "Setting up chroot for ntp in ${NTP_HOME}"
+	# remove localtime file from previous installations
+	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
+	mkdir -p "${EROOT%/}${NTP_HOME}"/etc
+	if ! ln "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime ; then
+		cp "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime || die
+		einfo "We could not create a hardlink from /etc/localtime to ${NTP_HOME}/etc/localtime,"
+		einfo "so please run 'emerge --config =${CATEGORY}/${PF}' whenever you change"
+		einfo "your timezone."
+	fi
+	chown -R root:root "${EROOT%/}${NTP_HOME}" || die
+}
+
+pkg_postinst() {
+	pkg_config
+
+	[[ -f ${EROOT}var/log/ntpd.log ]] && \
+		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
+
+	if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then
+		einfo "Moving ntpd.drift file to new location."
+		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift"
+	fi
+}
+
+pkg_postrm() {
+	# remove localtime file from previous installations
+	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
+}