Added rewritten init script for ntpd. Removed old versions

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

15 files changed, 35 insertions, 1329 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index c5307000d2b0..87084722b251 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.224 2014/12/22 03:26:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.225 2014/12/22 08:42:22 polynomial-c Exp $
+
+  22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -ntp-4.2.4_p7-r1.ebuild,
+  -ntp-4.2.6_p2-r1.ebuild, -ntp-4.2.6_p3.ebuild, -ntp-4.2.6_p3-r1.ebuild,
+  -ntp-4.2.6_p4.ebuild, -ntp-4.2.6_p5.ebuild, -ntp-4.2.6_p5-r1.ebuild,
+  -ntp-4.2.6_p5-r2.ebuild, -ntp-4.2.6_p5-r7.ebuild, -ntp-4.2.6_p5-r9.ebuild,
+  ntp-4.2.8-r1.ebuild, -files/ntp-4.2.4_p7-CVE-2009-3563.patch,
+  +files/ntpd.rc-r1, -files/sntp.service:
+  Added rewritten init script for ntpd. Removed old versions.
 
   22 Dec 2014; Mike Gilbert <floppym@gentoo.org> ntp-4.2.8-r1.ebuild:
   Drop redundant copy of ntp.conf. Remove cleanup code rendered obsolete by
diff --git a/net-misc/ntp/files/ntp-4.2.4_p7-CVE-2009-3563.patch b/net-misc/ntp/files/ntp-4.2.4_p7-CVE-2009-3563.patch
deleted file mode 100644
index 7fdcc336693f..000000000000
--- a/net-misc/ntp/files/ntp-4.2.4_p7-CVE-2009-3563.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2009/10/07 01:33:22+00:00 davehart@shiny.ad.hartbrothers.com
-#   [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
-#
-# ChangeLog
-#   2009/10/07 01:33:21+00:00 davehart@shiny.ad.hartbrothers.com +4 -0
-#   [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
-#
-# ntpd/ntp_request.c
-#   2009/10/07 01:33:21+00:00 davehart@shiny.ad.hartbrothers.com +9 -2
-#   [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
-#
-Index: ntp-4.2.4p7/ChangeLog
-===================================================================
---- ntp-4.2.4p7.orig/ChangeLog
-+++ ntp-4.2.4p7/ChangeLog
-@@ -1,4 +1,8 @@
- ---
-+
-+* [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
-+
-+---
- (4.2.4p7) 2009/05/18 Released by Harlan Stenn <stenn@ntp.org>
- 
- * [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252.
-Index: ntp-4.2.4p7/ntpd/ntp_request.c
-===================================================================
---- ntp-4.2.4p7.orig/ntpd/ntp_request.c
-+++ ntp-4.2.4p7/ntpd/ntp_request.c
-@@ -409,6 +409,7 @@ process_private(
- 	int mod_okay
- 	)
- {
-+	static u_long quiet_until;
- 	struct req_pkt *inpkt;
- 	struct req_pkt_tail *tailinpkt;
- 	struct sockaddr_storage *srcadr;
-@@ -444,8 +445,14 @@ process_private(
- 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
- 	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
- 		) {
--		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
--		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
-+		NLOG(NLOG_SYSEVENT)
-+			if (current_time >= quiet_until) {
-+				msyslog(LOG_ERR,
-+					"process_private: drop test %d"
-+					" failed, pkt from %s",
-+					ec, stoa(srcadr));
-+				quiet_until = current_time + 60;
-+			}
- 		return;
- 	}
- 
diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r1
new file mode 100644
index 000000000000..53533e78df77
--- /dev/null
+++ b/net-misc/ntp/files/ntpd.rc-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc-r1,v 1.1 2014/12/22 08:42:22 polynomial-c Exp $
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+		eerror "Please create /etc/ntp.conf"
+		eerror "Sample conf: /usr/share/ntp/ntp.conf"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/ntp/files/sntp.service b/net-misc/ntp/files/sntp.service
deleted file mode 100644
index 4127bc76e185..000000000000
--- a/net-misc/ntp/files/sntp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via SNTP
-After=network.target NetworkManager-wait-online.service nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/sntp
-ExecStart=/usr/bin/sntp $SNTP_OPTS
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.4_p7-r1.ebuild b/net-misc/ntp/ntp-4.2.4_p7-r1.ebuild
deleted file mode 100644
index 80afb89c1629..000000000000
--- a/net-misc/ntp/ntp-4.2.4_p7-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7-r1.ebuild,v 1.5 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks selinux ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )"
-RDEPEND="${DEPEND}
-	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() {
-	# Needs to be ported ...
-	#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
-	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-CVE-2009-3563.patch #290881
-	append-cppflags -D_GNU_SOURCE #264109
-	# upstream has fixed these issues in newer versions; just ignore
-	# it for older since the changes are invasive
-	append-flags -fno-strict-aliasing
-}
-
-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=$(use zeroconf && echo yes || echo no)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with ssl crypto) \
-		|| die
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild b/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild
deleted file mode 100644
index 9b1b5b8efd61..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild,v 1.4 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-	# upstream has fixed these issues in newer versions; just ignore
-	# it for older since the changes are invasive
-	append-flags -fno-strict-aliasing
-}
-
-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=$(use zeroconf && echo yes || echo no)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p3-r1.ebuild b/net-misc/ntp/ntp-4.2.6_p3-r1.ebuild
deleted file mode 100644
index c93e458d97df..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p3-r1.ebuild,v 1.5 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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=$(use zeroconf && echo yes || echo no)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p3.ebuild b/net-misc/ntp/ntp-4.2.6_p3.ebuild
deleted file mode 100644
index 8f9c5fed2a20..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p3.ebuild,v 1.9 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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=$(use zeroconf && echo yes || echo no)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p4.ebuild b/net-misc/ntp/ntp-4.2.6_p4.ebuild
deleted file mode 100644
index 527a6cb54f33..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p4.ebuild,v 1.4 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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=$(use zeroconf && echo yes || echo no)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r1.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r1.ebuild
deleted file mode 100644
index 55dc824a3f99..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r1.ebuild,v 1.11 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	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 )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r2.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r2.ebuild
deleted file mode 100644
index 2b8d47a7b31d..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r2.ebuild,v 1.2 2014/04/06 14:47:01 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 ~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 samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	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 )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-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]
-	dohtml -r html/*
-
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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
-	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
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r7.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r7.ebuild
deleted file mode 100644
index 8310adb29fe4..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r7.ebuild,v 1.5 2014/04/06 14:47:01 vapier Exp $
-
-EAPI="4"
-
-inherit 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 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 samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	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 )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-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]
-	dohtml -r html/*
-
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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
-	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-r1 ntpd.service
-	fi
-
-	systemd_dounit "${FILESDIR}"/ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_dounit "${FILESDIR}"/sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild
deleted file mode 100644
index 91f7ff741662..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild,v 1.2 2014/04/06 14:47:01 vapier Exp $
-
-EAPI="4"
-
-inherit 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 ~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 samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	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 )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-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]
-	dohtml -r html/*
-
-	insinto /usr/share/ntp
-	doins "${FILESDIR}"/ntp.conf
-	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
-	use prefix || fperms -R go-w /usr/share/ntp
-	find "${ED}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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
-	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-r1 ntpd.service
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_dounit "${FILESDIR}"/ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_dounit "${FILESDIR}"/sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*notrust' "${EROOT}"/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
-}
diff --git a/net-misc/ntp/ntp-4.2.6_p5.ebuild b/net-misc/ntp/ntp-4.2.6_p5.ebuild
deleted file mode 100644
index efae101f03b6..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5.ebuild,v 1.3 2014/01/08 06:19:03 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-	!openntpd? ( !net-misc/openntpd )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-ntp )
-	parse-clocks? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	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.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	append-cppflags -D_GNU_SOURCE #264109
-}
-
-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}
-	econf \
-		--with-lineeditlibs=readline,edit,editline \
-		$(use_enable caps linuxcaps) \
-		$(use_enable parse-clocks) \
-		$(use_enable ipv6) \
-		$(use_enable debug debugging) \
-		$(use_enable samba ntp-signd) \
-		$(use_with snmp ntpsnmpd) \
-		$(use_with ssl crypto)
-}
-
-src_install() {
-	emake 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/ || die
-	fperms -R go-w /usr/share/ntp
-	find "${D}"/usr/share/ntp \
-		'(' \
-		-name '*.in' -o \
-		-name 'Makefile*' -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:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
-
-	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${D}"
-		rm usr/sbin/ntpd || die
-		rm -r var/lib
-		rm etc/{conf,init}.d/ntpd
-		rm usr/share/man/*/ntpd.8 || die
-	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
-	elog "The way ntp sets and maintains your system time has changed."
-	elog "Now you can use /etc/init.d/ntp-client to set your time at"
-	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
-	elog "while your machine runs"
-	if grep -qs '^[^#].*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
-}
diff --git a/net-misc/ntp/ntp-4.2.8-r1.ebuild b/net-misc/ntp/ntp-4.2.8-r1.ebuild
index d5b8c7a8e409..b8c51ece629c 100644
--- a/net-misc/ntp/ntp-4.2.8-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r1.ebuild,v 1.2 2014/12/22 03:26:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r1.ebuild,v 1.3 2014/12/22 08:42:22 polynomial-c Exp $
 
 EAPI="4"
 
@@ -77,7 +77,7 @@ src_install() {
 
 	insinto /etc
 	doins "${FILESDIR}"/ntp.conf
-	newinitd "${FILESDIR}"/ntpd.rc ntpd
+	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