--- /usr/portage/net-misc/ntp/ntp-4.2.6_p5-r1.ebuild	2012-09-27 18:31:23.000000000 -0600
+++ ntp-4.2.6_p5-r1.ebuild	2012-11-26 08:40:03.000000000 -0700
@@ -2,9 +2,9 @@
 # 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.10 2012/09/28 00:30:04 ulm Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic user
 
 MY_P=${P/_p/p}
 DESCRIPTION="Network Time Protocol suite/programs"
@@ -14,7 +14,7 @@
 
 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"
+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
@@ -62,20 +62,20 @@
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
+	default
 	# move ntpd/ntpdate to sbin #66671
 	dodir /usr/sbin
-	mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin"
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
 
-	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+	dodoc INSTALL 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 \
+	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 \
@@ -89,14 +89,14 @@
 	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
+	use caps || sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
 
 	keepdir /var/lib/ntp
-	fowners ntp:ntp /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
 
 	if use openntpd ; then
-		cd "${D}"
+		cd "${ED}"
 		rm usr/sbin/ntpd || die
 		rm -r var/lib
 		rm etc/{conf,init}.d/ntpd
@@ -113,7 +113,7 @@
 	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
+	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,"