remove old

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

10 files changed, 16 insertions, 686 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 966774978165..1a7bbd83fbea 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.135 2015/07/12 18:20:25 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.136 2015/07/12 18:25:36 ottxor Exp $
+
+  12 Jul 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_p2-adjtimex.patch, -files/openntpd-5.7_p2-proctitle.patch,
+  -openntpd-5.7_p2.ebuild, -openntpd-5.7_p3.ebuild, -openntpd-5.7_p4.ebuild:
+  remove old
 
 *openntpd-5.7_p4-r1 (12 Jul 2015)
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 45f059057184..1abae316649b 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,35 +4,25 @@ 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_p2-adjtimex.patch 1507 SHA256 f2eb984daf187a79f766954f24aee3d6be5e7b04342fcee6143b80811f252b33 SHA512 ebc0552b601f38c916a07d983d3c3ad7ca0ba68b791ac8064458b3e4de743f090dd43a3c89d0ad8b0b63df4151515f3e4236596c00039716edc3da6d7b2b3900 WHIRLPOOL ca02fe1c937a498003168d933a4c4638cb6f4e130e10fc914839399aa88617c0ce6c835208b72dc1df82b9cbb89b2f4719adac2715de91b59eb94ec9018b599d
-AUX openntpd-5.7_p2-proctitle.patch 10951 SHA256 3ee5f2c2f4e69fb52cbc6af06acec92f1780148030027b5bb387ca93c6865b3e SHA512 acdd88000db8144362cfea629e186ceadf58e6fc773a47d3ffbb1b127d6085805538814305f01155782b6401cb516d4c0d5dea588f930d58c76ac51b3c76b505 WHIRLPOOL 5fda1ab5043557bde4ab1787703e4e97c1632151b0b1c5e7d1b8577959dec759c07e852fa5dc2d9d8d63ccf2d1082ee6372d0aa17175988e4bd18fcd6d7ba6c6
 AUX openntpd-5.7_p4-nolibtls.patch 1871 SHA256 65f4adf317ad7919674fe380a39434f4955761879efa4bcb1e1ed8ad7f379a22 SHA512 8e62b3ee487e1b0b6f1a7567ae15bd0a376787402121a3a2c3b89ba6fb96915b83924a8b25ea8c5c83df17fbda4bec88399a83029f1f4004ccd3b3e20068a650 WHIRLPOOL 84cf77f83c46d45f515e10ea7d4e2662002b906c13cd5afaeaeaedb0ef9aa7928973e5e155d53f06098efbdb388cae554df0a55e51ed65cda7ba8a5b9f5d0bf1
 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.7p2.tar.gz 408421 SHA256 1640ad4a6e6475f6065d5f999b17b5dc6ab40dc17309b782b9ae390fe54bd6a5 SHA512 f320c6262eccf428428e7a3578cb0e6cf6305c93faa0dd98e5fb9d55474accd5c5e73d636b8c1339a34c2f46071fb6fc31e6fc296453eaa1501b0e2c01cf6e13 WHIRLPOOL f544e920892e4b44864febbb790affa496aca1c998257b298072903722c41cce47fd9c8a2a0707b14b24d02779d5296fb1326e0ea7fb341fc2c1d7394a463a53
-DIST openntpd-5.7p3.tar.gz 409734 SHA256 4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a SHA512 289cdc60413f35a91468f914b44a97d782d700dac150fe2570f31b8eccb4e7060764b5867bd188df3b0fe7598f57685078571685f14e0cc3353ca108bb7d640f WHIRLPOOL 0d4ba1e5de33c6396534bad262d945aa767a97df2c4018a78d354ac8270ec76a53626182a5b4a0433a0eab10d41a66fcec8782ffc031e8dfc11abdc4e79821f3
 DIST openntpd-5.7p4.tar.gz 427900 SHA256 a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 SHA512 2a185139c915482086069fa19dd3070884a415137d1688059559d2da892928afbbe2fa0a8ade70d474809710265dcc05906abaf261892d7894e70272e2e516ef WHIRLPOOL 9464941e0f055ecd1db19a03bb5264a1dce02c6c7c2be078d1e3a19b5bd0a3c4e19ee6768617c90ebed01dea32f3a63751f9ef0436f56e22b7e6bd673a065546
 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 3275 SHA256 37dc9977612c5e8b074ddea26c72e5dbe213cafd3aa594b00793640f78460559 SHA512 974370502106f7fc38d2939cd9d3e9d747493d3af854c452de1051f685e804afe89d5c797b06ab1328407ab585ceb9c66847665eca7a163c984c70a6976f0cdd WHIRLPOOL 6217c75861887d8063c135435d11fa198fe4a76215be14b2fba62b7454c044cab70bd73b714c9524676a7e2cd979f92fdbc5c4e27ccc3fffd7e9b48bda1457c5
-EBUILD openntpd-5.7_p2.ebuild 2987 SHA256 57a10dde48b7f2992fca5690ba39fe0b518353924a877e73f3d4f133caf37071 SHA512 9139976066d70e2a66a8bf26d07a516fcc16263f741eec27ee7fe390c2f2980153962875b529b85be873dfbb2fe6b81f2909be5d77496de00041f57aff137e42 WHIRLPOOL 435ff52ae51df95850f69f90af8c10af6e3244fecf9645e12c13de226d7eade04c7aafb4f021749e6ad7cd8e4651b7eeba2d85224920071005008acd5c1326d2
-EBUILD openntpd-5.7_p3.ebuild 3316 SHA256 22483dde636ba18c8449587aeab9330b1f622d0b6d0323b4a556a2da455ac18a SHA512 d6656fbd6813c76b23288d755287175c694704b46f6dd96c0bc039eda2f46b607478b8f7eb4f7fc044744a58f60f42b7e82af470fd8272f644c21bc5d16a8111 WHIRLPOOL c7a621e3a7976e063080d98a3ff90c0441011e00f519a869fd0b5fc1a2cf003bfab9600a0307f45ce5ec90ab8ffea671add47774857d845b76ef88ac317e62fe
 EBUILD openntpd-5.7_p4-r1.ebuild 2984 SHA256 1bf219a88cffc855802161b427996b28a7b26c26e429ef0af85b6421ff9e4972 SHA512 4e3876444b16090b45ac09dbc1028791969e1046ef1c3d1297d1094070916fc513ef4adfaa20c26b89bcd55f3377786e173a750c4faaa2c3679c95e7b4a03cd9 WHIRLPOOL 142343c830aa38a38dea4ede4e85bfe7c6c25ed07edf8c94602a933bfe98969a8496faa8c6259850ced9a3c4f85b00373947fce37f8d761e04dd382848b60191
-EBUILD openntpd-5.7_p4.ebuild 3399 SHA256 f6159902604b99d4bdfa75f98e9f4c0798cfa3e90ee6e426774ec4077f47bed0 SHA512 2ce37d04567d037ddda444623ede5d9adacb6cc6a7d1a3d41b70a9eca23d5c5f916dd75cdbc0c03780fc28ae359a31012fbd422f1d1e1104f80c7123909d1509 WHIRLPOOL 9f2db371b5245823ab7bdb1c642b9740485d6749c1eb5ad0f7cd9d11ce40868b5d7a2952b0162a1a590108922bd1079b8e16c64f1d96a03e7c880371eaa8aef6
-MISC ChangeLog 19526 SHA256 c72f4edc330fc418304db4736206a3e3af3e0335259f33b81e338312ed4276f9 SHA512 19c7fc77ca15ef06ba1830fcc0af0d68cb26153a6b8d70763f5d8b6c04e6da249f2d5f9173562366d0b65389cff2fdb3b339e07d5cc9f28052c635c6ec7a4c3c WHIRLPOOL acdcc7fdd2d9c5d3067669ae18731eaccc28a12feac30fd1dd09c1bfd62165c961f3c47b3106e1fe18824e091e1579508fae466515273bab3b4ae945aa81708f
+MISC ChangeLog 19875 SHA256 19226d83ba8bc1ae71b04ea1aa530259cf3e941f9101cb887e8627c5063b6265 SHA512 bd46f313f7e5c788d03ef2e8bdc35d7d8d374c19d1eeaf1c34eff584b3be45ac4458cb406e6c53c8304cec5f540c2ef7178b868fd1237ff3d98ccd52e46c35e2 WHIRLPOOL 9cb0788331a523bb9a359ab73ff7bbbde233fa125e063bfcbe099ddb531669bd164bb18f19506e04780e5e794d0335d12fa74706df1ef9f1706363aa92a0de65
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVoq/qAAoJEOeBhlrCAAWGDZgH/jUDtq16yIITmUH+mszCc2wN
-ZDQgIsq99bG2Q/J9ouVFEqB4tEoQlSmyHiusB37j9yndVwJGhdHtCQnYKhUBVNso
-hCnqOM54GyAmxUfU8nbYZE36KFydJRxySvf18qV4MfZJ3ek6H3OPTH+P2TNED9cJ
-myj73Twp7eWMCxd6300sAFWucwUtXalZQgLEvbXN0mebQEUu2C/Yf+gNAOMdGlJx
-cpW+SMnaNhmUYIgElQerGE8OKOAHTbshm854/8OxylCefx0rZ9oNHKTFznv/EQr4
-fmYszTc65b/PxWZgxT7G994z6xhL7WTsXU4N7Hg5gvTZotm2Nn3h0Bp9h73MH1U=
-=0Gj+
+iQEcBAEBCAAGBQJVorEhAAoJEOeBhlrCAAWG2cAH/RmTybNvD52U//MJ5fHl8i1x
+TCI1wxYi6aYd+hu9HcmVuAe+2XnzNRwM87coxMpig0tuqClVHMDY3icCBTWuclPk
+yENPZUDanBg6ZTUrhcEx4kw0TG3bxsabZgSIm8dMO2x+Okra4wyfXmURty4sdk/T
+mRiYOFiP/Meyo+LrqgBmVGAEppBD1oqDVIDG1Gt58KqYtP33iYHnIGp30gvWfkFo
+Z2aVaUQ+M0UtMrnKCPNunqmhgSF8Oy/TtxbYzcO/Fktwu/tVaM7MLrBZMY+bPpvT
+4GnEuLDzDgbLag9mGZCuhoYLBRVGj7G2MbH3qicVjS1l/oR8LY/bse/wy6wIzEs=
+=lHw/
 -----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
deleted file mode 100644
index f95379319fad..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-driftpath.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index 1b7d71354e14..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-gentoopool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 144c1416cf09..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-runpath.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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_p2-adjtimex.patch b/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
deleted file mode 100644
index b856276a3109..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From eeb97529cd5a332a69a312687e41939eb17f7a81 Mon Sep 17 00:00:00 2001
-From: Brent Cook <busterb@gmail.com>
-Date: Wed, 21 Jan 2015 10:30:37 -0600
-Subject: [PATCH] prefer adjtimex over the deprecated ntp_adjtime on Linux
-
-Thanks to @chneukirchen for the suggestion.
----
- compat/adjfreq_linux.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/compat/adjfreq_linux.c b/compat/adjfreq_linux.c
-index 21ee40f..e4a8ae9 100644
---- a/compat/adjfreq_linux.c
-+++ b/compat/adjfreq_linux.c
-@@ -15,7 +15,7 @@
-  */
- 
- #include <sys/types.h>
--# include <sys/timex.h>
-+#include <sys/timex.h>
- 
- #include <unistd.h>
- 
-@@ -37,20 +37,20 @@ adjfreq(const int64_t *freq, int64_t *oldfreq)
- 		txc.modes = ADJ_FREQUENCY;
- 		txc.freq = *freq / 1e3 / (1LL << 16);
- 
--		if ((ntp_adjtime(&txc)) == -1)
--			log_warn("ntp_adjtime (2) failed");
-+		if ((adjtimex(&txc)) == -1)
-+			log_warn("adjtimex failed");
- 
--		log_debug("ntp_adjtime adjusted frequency by %fppm",
-+		log_debug("adjtimex adjusted frequency by %fppm",
- 			  ((txc.freq * 1e3) *  (1LL<<16) / 1e3 / (1LL << 32)));
- 	}
- 	if (oldfreq != NULL) {
- 		txc.modes = 0;
--		if ((ntp_adjtime(&txc)) == -1) {
--			log_warn("ntp_adjtime (1) failed");
-+		if ((adjtimex(&txc)) == -1) {
-+			log_warn("adjtimex failed");
- 			return -1;
- 		}
- 		newfreq = (txc.freq * 1e3) *  (1LL<<16);
--		log_debug("ntp_adjtime returns frequency of %fppm",
-+		log_debug("adjtimex returns frequency of %fppm",
- 			  newfreq / 1e3 / (1LL << 32));
- 		*oldfreq = newfreq;
- 	}
diff --git a/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch b/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
deleted file mode 100644
index 63531c8b630c..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -Nur openntpd-5.7p2-orig/Makefile.am openntpd-5.7p2/Makefile.am
---- openntpd-5.7p2-orig/Makefile.am	2015-01-19 17:18:56.000000000 -0800
-+++ openntpd-5.7p2/Makefile.am	2015-01-21 12:09:17.221031344 -0800
-@@ -162,6 +162,8 @@
- libcompat_la_SOURCES += compat/md5.c
- endif
- 
-+libcompat_la_SOURCES += compat/progname.c
-+
- if !HAVE_REALLOCARRAY
- libcompat_la_SOURCES += compat/reallocarray.c
- endif
-diff -Nur openntpd-5.7p2-orig/configure.ac openntpd-5.7p2/configure.ac
---- openntpd-5.7p2-orig/configure.ac	2015-01-19 17:18:56.000000000 -0800
-+++ openntpd-5.7p2/configure.ac	2015-01-21 12:10:32.118825079 -0800
-@@ -153,6 +153,18 @@
- 	   -a "x$HOST_OS" != xnetbsd \
- 	   -a "x$ac_cv_func_arc4random_uniform" = xyes])
- 
-+AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
-+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-+                [[ extern char *__progname; printf("%s", __progname); ]])],
-+        [ ac_cv_libc_defines___progname="yes" ],
-+        [ ac_cv_libc_defines___progname="no"
-+        ])
-+])
-+if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
-+        AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
-+fi
-+
-+
- AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
- 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <stdarg.h>
-diff -Nur openntpd-5.7p2-orig/configure openntpd-5.7p2/configure
---- openntpd-5.7p2-orig/configure	2015-01-19 18:30:48.000000000 -0800
-+++ openntpd-5.7p2/configure	2015-01-21 12:11:19.827967669 -0800
-@@ -13519,6 +13519,42 @@
- fi
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
-+$as_echo_n "checking if libc defines __progname... " >&6; }
-+if ${ac_cv_libc_defines___progname+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+ extern char *__progname; printf("%s", __progname);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+   ac_cv_libc_defines___progname="yes"
-+else
-+   ac_cv_libc_defines___progname="no"
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
-+$as_echo "$ac_cv_libc_defines___progname" >&6; }
-+if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
-+
-+$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
-+
-+fi
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
- $as_echo_n "checking whether va_copy exists... " >&6; }
- if ${ac_cv_have_va_copy+:} false; then :
-diff -Nur openntpd-5.7p2-orig/Makefile.in openntpd-5.7p2/Makefile.in
---- openntpd-5.7p2-orig/Makefile.in	2015-01-19 18:30:49.000000000 -0800
-+++ openntpd-5.7p2/Makefile.in	2015-01-21 12:11:17.319907603 -0800
-@@ -161,13 +161,14 @@
- 	compat/adjfreq_osx.c compat/adjfreq_solaris.c \
- 	compat/bsd-asprintf.c compat/clock_getres.c \
- 	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \
--	compat/md5.c compat/reallocarray.c compat/setproctitle.c \
--	compat/strlcat.c compat/strlcpy.c compat/strtonum.c \
--	compat/bsd-setresgid.c compat/bsd-setresuid.c \
--	compat/arc4random.c compat/getentropy_freebsd.c \
--	compat/getentropy_linux.c compat/sha2.c \
--	compat/getentropy_netbsd.c compat/getentropy_osx.c \
--	compat/getentropy_solaris.c compat/arc4random_uniform.c
-+	compat/md5.c compat/progname.c compat/reallocarray.c \
-+	compat/setproctitle.c compat/strlcat.c compat/strlcpy.c \
-+	compat/strtonum.c compat/bsd-setresgid.c \
-+	compat/bsd-setresuid.c compat/arc4random.c \
-+	compat/getentropy_freebsd.c compat/getentropy_linux.c \
-+	compat/sha2.c compat/getentropy_netbsd.c \
-+	compat/getentropy_osx.c compat/getentropy_solaris.c \
-+	compat/arc4random_uniform.c
- am__dirstamp = $(am__leading_dot)dirstamp
- @HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo
- @HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo
-@@ -207,7 +208,8 @@
- am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
- 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
- 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
--	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
-+	$(am__objects_9) $(am__objects_10) \
-+	compat/libcompat_la-progname.lo $(am__objects_11) \
- 	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
- 	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
- 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
-@@ -562,12 +564,13 @@
- libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \
- 	$(am__append_7) $(am__append_8) $(am__append_9) \
- 	$(am__append_10) $(am__append_11) $(am__append_12) \
--	$(am__append_13) $(am__append_14) $(am__append_15) \
--	$(am__append_16) $(am__append_17) $(am__append_18) \
--	$(am__append_19) $(am__append_20) $(am__append_21) \
--	$(am__append_22) $(am__append_23) $(am__append_24) \
--	$(am__append_25) $(am__append_26) $(am__append_27) \
--	$(am__append_28) $(am__append_29) $(am__append_30)
-+	$(am__append_13) compat/progname.c $(am__append_14) \
-+	$(am__append_15) $(am__append_16) $(am__append_17) \
-+	$(am__append_18) $(am__append_19) $(am__append_20) \
-+	$(am__append_21) $(am__append_22) $(am__append_23) \
-+	$(am__append_24) $(am__append_25) $(am__append_26) \
-+	$(am__append_27) $(am__append_28) $(am__append_29) \
-+	$(am__append_30)
- libcompat_la_LIBADD = $(PLATFORM_LDADD)
- noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \
- 	compat/arc4random_linux.h compat/arc4random_netbsd.h \
-@@ -649,6 +652,8 @@
- 	compat/$(DEPDIR)/$(am__dirstamp)
- compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \
- 	compat/$(DEPDIR)/$(am__dirstamp)
-+compat/libcompat_la-progname.lo: compat/$(am__dirstamp) \
-+	compat/$(DEPDIR)/$(am__dirstamp)
- compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \
- 	compat/$(DEPDIR)/$(am__dirstamp)
- compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \
-@@ -783,6 +788,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-progname.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@
-@@ -893,6 +899,13 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' || echo '$(srcdir)/'`compat/md5.c
- 
-+compat/libcompat_la-progname.lo: compat/progname.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-progname.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-progname.Tpo -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-progname.Tpo compat/$(DEPDIR)/libcompat_la-progname.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='compat/progname.c' object='compat/libcompat_la-progname.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
-+
- compat/libcompat_la-reallocarray.lo: compat/reallocarray.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' || echo '$(srcdir)/'`compat/reallocarray.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo
-diff -Nur openntpd-5.7p2-orig/compat/progname.c openntpd-5.7p2/compat/progname.c
---- openntpd-5.7p2-orig/compat/progname.c	1969-12-31 16:00:00.000000000 -0800
-+++ openntpd-5.7p2/compat/progname.c	2015-01-21 12:09:55.528948784 -0800
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <string.h>
-+
-+#ifndef HAVE___PROGNAME
-+char *__progname;
-+#endif
-+
-+/*
-+ * NB. duplicate __progname in case it is an alias for argv[0]
-+ * Otherwise it may get clobbered by setproctitle()
-+ */
-+char *get_progname(char *argv0)
-+{
-+#ifdef HAVE___PROGNAME
-+	extern char *__progname;
-+
-+	return strdup(__progname);
-+#else
-+	char *p;
-+
-+	if (argv0 == NULL)
-+		return ("unknown");	/* XXX */
-+	p = strrchr(argv0, '/');
-+	if (p == NULL)
-+		p = argv0;
-+	else
-+		p++;
-+
-+	return (strdup(p));
-+#endif
-+}
-diff -Nur openntpd-5.7p2-orig/ntpd.c openntpd-5.7p2/ntpd.c
---- openntpd-5.7p2-orig/ntpd.c	2015-01-19 18:30:41.000000000 -0800
-+++ openntpd-5.7p2/ntpd.c	2015-01-21 12:11:05.744630385 -0800
-@@ -116,6 +116,8 @@
- static char **saved_argv;
- #endif
- 
-+char *get_progname(char *argv0);
-+
- int
- main(int argc, char *argv[])
- {
-@@ -139,6 +141,8 @@
- 
- 	log_init(1);		/* log to stderr until daemonized */
- 
-+	__progname = get_progname(argv[0]);
-+
- #ifndef HAVE_SETPROCTITLE
- 	int i;
- 	/* Prepare for later setproctitle emulation */
diff --git a/net-misc/openntpd/openntpd-5.7_p2.ebuild b/net-misc/openntpd/openntpd-5.7_p2.ebuild
deleted file mode 100644
index 4b20c77d1d9e..000000000000
--- a/net-misc/openntpd/openntpd-5.7_p2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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_p2.ebuild,v 1.1 2015/01/25 00:54:30 ottxor Exp $
-
-EAPI=5
-
-inherit autotools 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}/${PN}-5.7_p1-runpath.patch"
-	epatch "${FILESDIR}/${PN}-5.7_p1-driftpath.patch"
-	epatch "${FILESDIR}/${PN}-5.7_p1-gentoopool.patch"
-	epatch "${FILESDIR}/${P}-adjtimex.patch"
-	epatch "${FILESDIR}/${P}-proctitle.patch"
-	#Due to last patch
-	eautoreconf
-}
-
-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
-}
diff --git a/net-misc/openntpd/openntpd-5.7_p3.ebuild b/net-misc/openntpd/openntpd-5.7_p3.ebuild
deleted file mode 100644
index 3682e59e9bfa..000000000000
--- a/net-misc/openntpd/openntpd-5.7_p3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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_p3.ebuild,v 1.1 2015/02/03 05:30:01 yngwin Exp $
-
-EAPI=5
-inherit autotools eutils systemd user
-
-MY_P="${P/_p/p}"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-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"
-
-DEPEND="!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]"
-RDEPEND="${DEPEND}
-	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() {
-	# fix /run path
-	sed -i 's:/var/run/ntpd:/run/ntpd:g' ntpctl.8 ntpd.8 || die
-	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' ntpd.h || die
-	# fix ntpd.drift path
-	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' ntpd.8 || die
-	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' ntpd.h || die
-	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
-	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-}
-
-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
-}
diff --git a/net-misc/openntpd/openntpd-5.7_p4.ebuild b/net-misc/openntpd/openntpd-5.7_p4.ebuild
deleted file mode 100644
index 59d295619bfd..000000000000
--- a/net-misc/openntpd/openntpd-5.7_p4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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_p4.ebuild,v 1.1 2015/05/26 14:38:12 ottxor Exp $
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_p/p}"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-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"
-
-DEPEND="!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]"
-RDEPEND="${DEPEND}
-	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() {
-	# add fail constraints when no libtls patch (accepted upstream)
-	epatch "${FILESDIR}/${P}-nolibtls.patch"
-	# fix /run path
-	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
-	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
-	# fix ntpd.drift path
-	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
-	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
-	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
-	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-}
-
-src_configure() {
-	econf --with-privsep-user=ntp
-}
-
-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
-}