Version bump.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 206 insertions, 15 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index d4a6f5c0b80f..b9600e031119 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.74 2006/06/17 07:42:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.75 2006/07/16 07:03:01 vapier Exp $
+
+*ntp-4.2.2_p2 (16 Jul 2006)
+
+  16 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ntp-4.2.2_p2-sntp-header.patch, +ntp-4.2.2_p2.ebuild:
+  Version bump.
 
 *ntp-4.2.2 (17 Jun 2006)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 1de82a33f925..efeaa27d30be 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.1.2-droproot.patch 12672 RMD160 977c39c8e5c512efd6e172cb823fd24dcb80735e SHA1 d6706c35ca038663466acd9d31c49ecede96fae1 SHA256 0eceaf7e95787704577f056113eecfaa5579b1821c3cf043ab0d16d19be45b69
 MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672
 RMD160 977c39c8e5c512efd6e172cb823fd24dcb80735e files/4.1.2-droproot.patch 12672
@@ -58,6 +61,10 @@ AUX ntp-4.2.0.20050303-rlimit-memlock.patch 839 RMD160 771d40a38f1ae33cdee53c9ec
 MD5 339d87d68d483b28f5b70dd76cbc20c4 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839
 RMD160 771d40a38f1ae33cdee53c9ece0ede6be5d68f61 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839
 SHA256 fc5072cf0ac04b95c3b242e6de489779abf564b260fbea48da016b12f2330ce3 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839
+AUX ntp-4.2.2_p2-sntp-header.patch 239 RMD160 ef54dbe18e39ccfdc642f97ed03c26a8dd337002 SHA1 0573c0111df19d073f8dc7e5f2b954f17d0050e1 SHA256 3ccbbac286bd214d91ad5939d94e4d2b107cf954cc319997d31951fb2c523fc8
+MD5 6fff5d2793b5cd469e275757e33f5665 files/ntp-4.2.2_p2-sntp-header.patch 239
+RMD160 ef54dbe18e39ccfdc642f97ed03c26a8dd337002 files/ntp-4.2.2_p2-sntp-header.patch 239
+SHA256 3ccbbac286bd214d91ad5939d94e4d2b107cf954cc319997d31951fb2c523fc8 files/ntp-4.2.2_p2-sntp-header.patch 239
 AUX ntp-client-4.1.2.rc 840 RMD160 c59a65945c2b82159a5fb3daf0d0dc2ac2962945 SHA1 97d88ba47005a35bc54d00fc39f1b06eea651379 SHA256 fd49a2ced29d224ae1d802ffc2cdf65dc735c4c6562d646af74e8031aa215f99
 MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
 RMD160 c59a65945c2b82159a5fb3daf0d0dc2ac2962945 files/ntp-client-4.1.2.rc 840
@@ -94,18 +101,20 @@ AUX ntpd.rc 805 RMD160 5b8ab5a48bca9bdc8052d07092ecdda1a21f9c5b SHA1 1708ff0dbd6
 MD5 299ea30653b1e0b93d51f19e07176bc4 files/ntpd.rc 805
 RMD160 5b8ab5a48bca9bdc8052d07092ecdda1a21f9c5b files/ntpd.rc 805
 SHA256 26fe2367fc969cc0f7dc150d7ec218fef1e316eb0d72715e6f59344fe154673e files/ntpd.rc 805
-DIST ntp-4.1.2-manpages.tbz2 19961 RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd5c SHA256 2b1174f9158c1af00bfbda451719321cea2f8b98d68d0b54e2f087d347195835
-DIST ntp-4.1.2.tar.gz 2168384 RMD160 053bc86725a923784da6af37f6a844f6a9819d03 SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a
-DIST ntp-4.2.0-r2-manpages.tar.bz2 25355 RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3
-DIST ntp-4.2.0.tar.gz 2514502 RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
+DIST ntp-4.1.2-manpages.tbz2 19961 RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd5c SHA1 6df4e6e7ba61f6c26a7ae01a3581fbd5df3f3fed SHA256 2b1174f9158c1af00bfbda451719321cea2f8b98d68d0b54e2f087d347195835
+DIST ntp-4.1.2.tar.gz 2168384 RMD160 053bc86725a923784da6af37f6a844f6a9819d03 SHA1 2fc41170cd821365ffaa112a5e9b871fda042c81 SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a
+DIST ntp-4.2.0-r2-manpages.tar.bz2 25355 RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 SHA1 c4aae8d44f6a978a4746e263dad4c688b37f74d5 SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3
+DIST ntp-4.2.0.tar.gz 2514502 RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 SHA1 38343a4ebfc0b8d9aff3bec4c6a93f4c59071ce3 SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
 DIST ntp-4.2.2-manpages.tar.bz2 25213 RMD160 ac90f9b371fe6cd6bfdf931fd53432e054e7ce8a SHA1 0484c00eab29456e148136999bcfc51bd6a17ec3 SHA256 290e5a2ccb61960c7c35b07ac5255c8efa0721858fd85594792b62daa2852bc0
 DIST ntp-4.2.2.tar.gz 2546027 RMD160 2cf9540cf2e6c5fc3e3d8922676ea3b2efb9215e SHA1 a3e9652a1d9e288e2c0d88d1876de67ca4d608fb SHA256 fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc
-DIST ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf
-DIST ntp-stable-4.2.0a-20040617.tar.gz 2435648 RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3
-DIST ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d
-DIST ntp-stable-4.2.0a-20050303.tar.gz 2446073 RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c
-DIST ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b
-DIST ntp-stable-4.2.0a-20060224.tar.gz 2447194 RMD160 36bcce870220fb670d63c4b05a968075f990ca9c SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1
+DIST ntp-4.2.2p2-manpages.tar.bz2 48744 RMD160 e684f7e0fc285b0cd469346859e9daf8ead413fc SHA1 da341206d762fe5797df1a82382ae4027445873e SHA256 1ca88851575e7cb2fc9c48409e26da89048ac78e4098f5a4f6d504846de28690
+DIST ntp-4.2.2p2.tar.gz 2563137 RMD160 3c4c01c902be0afe92dd15d52c746549bd26d27f SHA1 f43125e25138c7d4de1d054b4e6df8186ca30b8d SHA256 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923
+DIST ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 SHA1 1f6c4398938a562213b63f61ae232b0a3e2087c8 SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf
+DIST ntp-stable-4.2.0a-20040617.tar.gz 2435648 RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 SHA1 99d20e4884acf63d8423625dd2c68655af6d16df SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3
+DIST ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 SHA1 036220c904de96cdd94aefe1b56ee832758a17dc SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d
+DIST ntp-stable-4.2.0a-20050303.tar.gz 2446073 RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d SHA1 7a3a489fa2300a4074a11bc69be8bd6ad8b6979a SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c
+DIST ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab SHA1 66be0f8d630a83838ee5de700f188d5abb731362 SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b
+DIST ntp-stable-4.2.0a-20060224.tar.gz 2447194 RMD160 36bcce870220fb670d63c4b05a968075f990ca9c SHA1 73139f5aa6af1199ed172196d4cf7d1b35f09592 SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1
 EBUILD ntp-4.1.2.ebuild 3162 RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 SHA1 52918eb755155cb92a8398756cc7378697cb6ee3 SHA256 5ecd462cd07be1f01087116067196b26ff08a07d89265b5cd980102ec423c89a
 MD5 4874c08acda470ce7373d36b64c39c09 ntp-4.1.2.ebuild 3162
 RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 ntp-4.1.2.ebuild 3162
@@ -130,10 +139,14 @@ EBUILD ntp-4.2.2.ebuild 3861 RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee SHA
 MD5 cb235e49c06ff3b3aff0e76d2cf52bc4 ntp-4.2.2.ebuild 3861
 RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee ntp-4.2.2.ebuild 3861
 SHA256 cbd3dcf3be18a5c1db493ec3955c33d241af15aa850d9fe73911df4356c5b10c ntp-4.2.2.ebuild 3861
-MISC ChangeLog 11315 RMD160 74fe86841d7cdc59463765c4ef3e57119074235b SHA1 24795c812582727e65a2ed8582671bd517b3a10f SHA256 427e66838d70be64a1471ffba0d43272ce2e245dd86d5f1adf7aa30bfad2e12d
-MD5 2be4b8fb7a220541883134ebaade5a71 ChangeLog 11315
-RMD160 74fe86841d7cdc59463765c4ef3e57119074235b ChangeLog 11315
-SHA256 427e66838d70be64a1471ffba0d43272ce2e245dd86d5f1adf7aa30bfad2e12d ChangeLog 11315
+EBUILD ntp-4.2.2_p2.ebuild 3982 RMD160 0f5db51411279764c0ffdd95edfad7b79b818dc9 SHA1 a6f94a4f024a87904ee0ddf93cea086434331932 SHA256 e005e961744f4b0665d90363497b8e436f1fa3346b092651311623b416282a59
+MD5 91deb8a87c5c9cb733f48d78a9274753 ntp-4.2.2_p2.ebuild 3982
+RMD160 0f5db51411279764c0ffdd95edfad7b79b818dc9 ntp-4.2.2_p2.ebuild 3982
+SHA256 e005e961744f4b0665d90363497b8e436f1fa3346b092651311623b416282a59 ntp-4.2.2_p2.ebuild 3982
+MISC ChangeLog 11474 RMD160 ca7dc8c0048e7b55411f924d6bcf3accf99f5e1a SHA1 ef50ee5a707b8bbad2c0a509be35c9c215eca5c7 SHA256 5cdc57d168a25b518d783ac610274ecb79ce24716864f5946d9b64e6368a6484
+MD5 35a9a3c2cc5d66c46e37891620053869 ChangeLog 11474
+RMD160 ca7dc8c0048e7b55411f924d6bcf3accf99f5e1a ChangeLog 11474
+SHA256 5cdc57d168a25b518d783ac610274ecb79ce24716864f5946d9b64e6368a6484 ChangeLog 11474
 MISC metadata.xml 636 RMD160 12f6aa70bfc2112d5cc9b6ac955eadc2da4add8c SHA1 f4a032bb0eece99babe176fb858e08fde8604889 SHA256 d3bc84bbb2f194aee41b43fd10cb07c2752073a339e642119d9bf03d31f50494
 MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
 RMD160 12f6aa70bfc2112d5cc9b6ac955eadc2da4add8c metadata.xml 636
@@ -156,3 +169,13 @@ SHA256 4932ba26b477696bcd9f8ae11f9055de029b45e522ad685f82abd56ef67b22b7 files/di
 MD5 3262184e8d74a645d0a9533c7fff7fa4 files/digest-ntp-4.2.2 488
 RMD160 7626c88be4d9cf362921b01ad3d75da3d21dc845 files/digest-ntp-4.2.2 488
 SHA256 49c96c94188f4ce54072347cd086e2acf60aa39d4ff81fce95c685a726744eca files/digest-ntp-4.2.2 488
+MD5 931e77d23c1e3b08a64d33bcae4ffad0 files/digest-ntp-4.2.2_p2 500
+RMD160 97521f75396a8e083da6976773b7cb33cf5aa939 files/digest-ntp-4.2.2_p2 500
+SHA256 489fe8b95da6a304f6da89b5f4a39445a7c32d5afb6afe29b17164373d41fb4e files/digest-ntp-4.2.2_p2 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEueTramhnQswr0vIRAkTLAKC+B4s1L02ovya8Vd378ocXjGjuXgCfeTbK
+iYaKTMi1qMb0fD1r21gaxos=
+=YvMZ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/digest-ntp-4.2.2_p2 b/net-misc/ntp/files/digest-ntp-4.2.2_p2
new file mode 100644
index 000000000000..9bf17bbed341
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.2_p2
@@ -0,0 +1,6 @@
+MD5 d42b28df83b9c08850f5b92d4f17a8a3 ntp-4.2.2p2-manpages.tar.bz2 48744
+RMD160 e684f7e0fc285b0cd469346859e9daf8ead413fc ntp-4.2.2p2-manpages.tar.bz2 48744
+SHA256 1ca88851575e7cb2fc9c48409e26da89048ac78e4098f5a4f6d504846de28690 ntp-4.2.2p2-manpages.tar.bz2 48744
+MD5 5c6ca6fab651c9cb21754a6478b8650e ntp-4.2.2p2.tar.gz 2563137
+RMD160 3c4c01c902be0afe92dd15d52c746549bd26d27f ntp-4.2.2p2.tar.gz 2563137
+SHA256 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923 ntp-4.2.2p2.tar.gz 2563137
diff --git a/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch b/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch
new file mode 100644
index 000000000000..039a5663dd2d
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch
@@ -0,0 +1,11 @@
+--- ntp-4.2.2p2/sntp/socket.c	2006-07-09 07:01:46.000000000 -0400
++++ ntp-4.2.2/sntp/socket.c	2006-06-06 16:17:16.000000000 -0400
+@@ -8,8 +8,6 @@
+ 
+ 
+ 
+-#include "config.h"
+-
+ #include "header.h"
+ #include "internet.h"
+ #include <fcntl.h>
diff --git a/net-misc/ntp/ntp-4.2.2_p2.ebuild b/net-misc/ntp/ntp-4.2.2_p2.ebuild
new file mode 100644
index 000000000000..393090ae5688
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.2_p2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2_p2.ebuild,v 1.1 2006/07/16 07:03:01 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+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="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	!openntpd? ( !net-misc/openntpd )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+hax_bitkeeper() {
+	# the makefiles have support for bk ...
+	# basically we have to do this or bk will try to write
+	# to files in /opt/bitkeeper causing sandbox violations ;(
+	mkdir "${T}"/fakebin
+	echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk
+	chmod a+x "${T}"/fakebin/bk
+	export PATH="${T}/fakebin:${PATH}"
+}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Needs to be ported ...
+	#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+
+	epatch "${FILESDIR}"/${P}-sntp-header.patch
+
+	sed -i \
+		-e 's:md5\.h:touch_not_my_md5:g' \
+		-e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
+		-e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
+		configure || die "sed failed"
+}
+
+src_compile() {
+	hax_bitkeeper
+	econf \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with ssl crypto) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	hax_bitkeeper
+	make install DESTDIR="${D}" || die "install failed"
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin"
+
+	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${D}"/usr/share/ntp/
+	chmod -R go-w "${D}"/usr/share/ntp
+	find "${D}"/usr/share/ntp \
+		'(' \
+		-name '*.in' -o \
+		-name 'Makefile*' -o \
+		-name 'rc[12]' -o \
+		-name support \
+		')' \
+		-exec rm -r {} \;
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	newinitd "${FILESDIR}"/ntpd.rc ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+	dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed
+	dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+	keepdir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ntp.logrotate ntp
+	fi
+
+	if use openntpd ; then
+		cd "${D}"
+		rm usr/sbin/ntpd
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/ntp.conf ]] ; then
+		rm -f "${D}"/etc/ntp.conf
+	fi
+}
+
+pkg_postinst() {
+	ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
+	ewarn "Review /etc/ntp.conf to setup server info."
+	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
+	echo
+	einfo "The way ntp sets and maintains your system time has changed."
+	einfo "Now you can use /etc/init.d/ntp-client to set your time at"
+	einfo "boot while you can use /etc/init.d/ntpd to maintain your time"
+	einfo "while your machine runs"
+	if [[ -n $(egrep '^[^#].*notrust' "${ROOT}"/etc/ntp.conf) ]] ; then
+		echo
+		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
+}