Fix net-snmp automagic dependency (bug #330043, thanks to Timo Gurr). Cleanup old versions.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

10 files changed, 20 insertions, 713 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 922db328f276..f41290574af3 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.161 2010/07/18 21:54:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.162 2010/07/27 13:06:37 flameeyes Exp $
+
+*ntp-4.2.6_p2-r1 (27 Jul 2010)
+
+  27 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ntp-4.2.4_p6.ebuild, -ntp-4.2.4_p7.ebuild, -ntp-4.2.6.ebuild,
+  -ntp-4.2.6_p1.ebuild, -ntp-4.2.6_p1-r1.ebuild, -ntp-4.2.6_p2.ebuild,
+  +ntp-4.2.6_p2-r1.ebuild, -files/ntp-4.2.6-linking.patch,
+  -files/ntp-4.2.6_p1-linking.patch:
+  Fix net-snmp automagic dependency (bug #330043, thanks to Timo Gurr).
+  Cleanup old versions.
 
 *ntp-4.2.6_p2 (18 Jul 2010)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 6a3e16396d51..8f8911e4cf59 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX man-pages/genmans.sh 1925 RMD160 97a28b5e8b074f8691f46fd9f17ade32be104782 SHA1 f55923837e7536e36c92a56e570ab4ef94eedca7 SHA256 4471387034c2ef6dd9e23bedddc1ec7ae12baf084704c18a842bea5e5a181322
 AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d
@@ -7,36 +7,23 @@ AUX man-pages/ntpdc.html.patch 1620 RMD160 0d240cb9b547b7a056b4f08a93385f5c1f4dc
 AUX ntp-4.2.4_p5-adjtimex.patch 670 RMD160 54cb1f9e8bf872044cc6e9f2a8a469f03d29af00 SHA1 53b437ce6c200cb9a1d4a1f4b0e543ea6e2c268a SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38
 AUX ntp-4.2.4_p7-CVE-2009-3563.patch 1752 RMD160 d259ed78523701ce22dd7aaadc945277b0586dd3 SHA1 3696ce854ea1bca9e2a514cdf883772ee38436e4 SHA256 4a6eb328ccfe3be771dc0932d6f6ee8210868f8c3d5ba09dbe6e9707edd4ce60
 AUX ntp-4.2.4_p7-nano.patch 393 RMD160 59096f773b7206f6c9a8a94aa4ca6ac9c6b7a2a4 SHA1 4de6cd3fad1946146107f86d1f161eb835fbb2d3 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4
-AUX ntp-4.2.6-linking.patch 1673 RMD160 b23c96e4864b3eb038daf65dd9a2ef4c12282b73 SHA1 c771d4c9f01decdd86193d04376a67c82d67cd82 SHA256 06a95e96bca8715aea1191abc250df42e6312f52fa8a4d4fd406a5315d0df7db
-AUX ntp-4.2.6_p1-linking.patch 895 RMD160 d7459e97f2e920b3348e24493b1dbfcf208c330c SHA1 298130af9f570266781710b770e6a24e16bd678a SHA256 88829d9b42df399d220dc7f10b27c8ee91bb58fe201d7c51d5805d75782b6f37
 AUX ntp-client.confd 623 RMD160 e577043438d3e1fffb0bb6a00468d1d5d0bfe3c8 SHA1 a5d618de62c4861e541b066562d2ecac7e7d971a SHA256 e8d5883461f4297c052e3b39814b663965ed3a756c4234675f4a9b62349eca13
 AUX ntp-client.rc 833 RMD160 bc24de842f93866a9d7663df81323b8c4ef75afa SHA1 4a794373a29e95889ae5448192affebabdbc322a SHA256 19f6a7fc0cc589e12cf1eaf7681d654d5c4613e8b3ae08dcc1b7dec12da2590c
 AUX ntp.conf 1517 RMD160 749056c054071b300de2b0a04a4b2a9a7a135da7 SHA1 4d2924d2ea6269b53f12e7f2fa45c3a2be2f2c4b SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9
 AUX ntpd.confd 189 RMD160 f66902d8abf5180ac8cc24646d665597cec8ba43 SHA1 f5fc6088e5f859f59b8a7a085da2193154a2c222 SHA256 a3bc17ee0f7d41102d6c33e4281e22d312a42cc2ffd8848b08e9cd78d63f2d05
 AUX ntpd.rc 819 RMD160 a72b275af880ad23468169400b17ed06086895f4 SHA1 b417648ce8e52c1f30ecad94a8527eacd9b4dab1 SHA256 f7c58e8f8e91ee0c1b947e9684b0a9e9e27220e0c97a8b06ee4e3bc5578a88b2
-DIST ntp-4.2.4p6-manpages.tar.bz2 49716 RMD160 5caa9341e0cbf66fef371d3b1832f81d42c5c139 SHA1 993b849a2e5fa719f53f85c4e83ee52eecbea56d SHA256 960447080376ecb429e83eea11f1cc64ec69c8abcb0534293a1da43c78eb515d
-DIST ntp-4.2.4p6.tar.gz 3443787 RMD160 d3853bdd593b49c435ec19b95066097ef5e71acc SHA1 ad4b068cc03ce346a6276ed6b31c026b6ffc3d92 SHA256 647640067c7c6a4c568af54c139ce07bbf9f69b54bf9be2704b4c99c56651067
 DIST ntp-4.2.4p7-manpages.tar.bz2 49719 RMD160 deebf4f80e4c3684c48f743a03e0481030c7993a SHA1 4e6939aff7b41e7e3efc42332e0a7048f7075240 SHA256 cd21e29fcd9a13ee92d5f5ad492c9be49eeb2e877351865973805c12993cad3f
 DIST ntp-4.2.4p7.tar.gz 3382146 RMD160 11d69176c8cb4b95f7e9f468c37ab8fc53a28876 SHA1 8476f75daffe9851cc6f33d170902bce77637499 SHA256 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
-DIST ntp-4.2.6-manpages.tar.bz2 47646 RMD160 8a62a4e8b31d72ab37a4568cf7f8b176d9710eb6 SHA1 89fb6a63d3d1c0d22fe150c8ed1f87c5128dbac9 SHA256 22c04530386ee47d5b0ec8e1eaefb0bb46c84389e0c0906f699c37f2446c42ac
-DIST ntp-4.2.6.tar.gz 4322055 RMD160 2258b2c624559aa5f8ae0ead164059064d341332 SHA1 a1f21b23c8c80f35801d59e30ba30779f2025a72 SHA256 0b0d4c62ae0138e7fa0e318dc5cb5577a7618de895c20834339a138068a98a11
-DIST ntp-4.2.6p1-manpages.tar.bz2 47677 RMD160 3778d6b26a3365676bbe5d762b71c9486d454662 SHA1 68889d4abcc9d7d0154efcc4012ecc50fddf69ba SHA256 045e4ef3f5e5cdf5805ac3787b392658f0e3c22e412edccbe40b4b4718c1f694
-DIST ntp-4.2.6p1.tar.gz 4327920 RMD160 95527acd587a42f726fa2dcd0450abf91167d3e6 SHA1 c4fa55afb8f2104146d25b75a09437ebffb4d657 SHA256 ec40f3525e6d66371093705688130c8c8a3d6ab2c90ac6e3dbc1ab455fbc7c5d
 DIST ntp-4.2.6p2-manpages.tar.bz2 47783 RMD160 f6bbe49014a81abe5a7562d147ec00a71a234218 SHA1 caee4667a0bf34d1e9b9d7808b7005572ee8fd78 SHA256 22cc78432f26ea1585637cae9cf3cc213192c1542da0bdbbf318c6553d1625c9
 DIST ntp-4.2.6p2.tar.gz 4338873 RMD160 805e7845017b97e4d5a8c38ec754c8c7373a3531 SHA1 04b5e3c3755fe9e5bcec5bd5d29255cfef2102c4 SHA256 42898b7903a2da04a242885c92919903d56ee69c0293ec828568cab71dd3e9d8
-EBUILD ntp-4.2.4_p6.ebuild 4135 RMD160 15cec7d894f3a013d330c81ec72e7d920311f9c4 SHA1 453dff9e9ef1bd4d3e58ba9d98caa243b02ff1bd SHA256 460e8ca13c724f4d105209d2fe7f9a84e825c08ce36b031c81de2360e6ff4265
 EBUILD ntp-4.2.4_p7-r1.ebuild 3782 RMD160 b07238f8198685f90e02bfbd84354fc2e0365dc6 SHA1 ca339df3e41933668b16e8a1f84e91c333395619 SHA256 53c26e8d0f2e1b8a8af8181931145cb124c5fff85962c7d116cd37f0edcbb3fe
-EBUILD ntp-4.2.4_p7.ebuild 3718 RMD160 1ef66c290349bea5dd58b95812a07e83ca0e67d4 SHA1 17689b7577b8ea10a2da04c643c2e4e81866723f SHA256 8bbcb2ac27d54f79b439656e13af20a5ad7a8f3c49257f64ab43cc0563470e12
-EBUILD ntp-4.2.6.ebuild 3691 RMD160 3e4532af1a09696a321d61a06ab86380a785a407 SHA1 d2c83c9e006f708f703263e2eee87bfab8dcc834 SHA256 7c2efd92d93036ae9e957259ba5aaae46916a09202d9105bee1c12835b10ac9e
-EBUILD ntp-4.2.6_p1-r1.ebuild 3793 RMD160 e4ea5b1f836662d67c2dfbc266d367b69a081207 SHA1 fa2c93cb88e51ae2c15cb028756f2a178d960589 SHA256 1117409eb1ed0766921124ffadbaa93751679166bd051ac3ac841db336afd92c
-EBUILD ntp-4.2.6_p1.ebuild 3722 RMD160 bc4fe9511e91cb06f6617ad7ffe8b316d4283245 SHA1 5ab30f8ad638028d1e699d5ed7f4edeaab2e7bc6 SHA256 e4e47549dc196f74ebb5e232c2a1deb13f712ead1c3a557a19c30b51b0110120
-EBUILD ntp-4.2.6_p2.ebuild 3749 RMD160 dd62a4e37376fcfb235a3acfe120c20952636113 SHA1 7edb56dd4757432e26b981d1926d048d2c3ed764 SHA256 ef2c6989cc0e2a2431da81c3196e4a06f5b597d16dba97330d43ff569e2a9988
-MISC ChangeLog 21850 RMD160 055f1c2f018deb0f57c5a003d83cb23d8abc984d SHA1 0c60599155f499fcf213225b87bdc60c1a6b1550 SHA256 b310b2e171e5b07c8bd5e1ad3bcd8d7adeb8e7a03e5212193a53a15014740949
+EBUILD ntp-4.2.6_p2-r1.ebuild 3755 RMD160 07f0e90b8967892d2e1401fad3ebce7348310635 SHA1 318b366b266ba7a0eefba326c7d580b21e8ccd61 SHA256 d43e6a29aeb123fca8e52e45e6cc3cb28268cb2f46145ca8ca95e4e2cb2fe3b5
+MISC ChangeLog 22270 RMD160 2add1a35516206885f543665213d287b5c986c25 SHA1 af50b243592cae679abaa52c4a2969a30fd7f3da SHA256 257380f4a75e7d12eb0cf0a1f00339535382189f7eb91c4b3555671b6b320d3f
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxDd6QACgkQTwhj9JtAlp72RAEAi30BExWeod4z7Ry/G2xye24F
-0wNEeCj7K2InlyBFtscA/R0lgr/WaB68hL5FDRZ1+yOloMECKvUwes08OoE0+YG0
-=pb8m
+iEYEARECAAYFAkxO2eoACgkQAiZjviIA2XgvcACfbEdOnHfKILj+U0azkONIdD2P
+tKkAn1D/3x7xyelgl7WQjxHWzthst8aZ
+=NSIl
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch
deleted file mode 100644
index 8318e81f62ae..000000000000
--- a/net-misc/ntp/files/ntp-4.2.6-linking.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/296832
-https://support.ntp.org/bugs/show_bug.cgi?id=1418
-
---- ntp-4.2.6/ntpd/Makefile.in
-+++ ntp-4.2.6/ntpd/Makefile.in
-@@ -358,8 +358,8 @@ man_MANS = ntpd.1
- # floor                               refclock_wwv.o
- # which are (usually) provided by -lm.
- keyword_gen_LDADD = ../libntp/libntp.a
--ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
--ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
-+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
-+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
- ntpdsim_CFLAGS = $(CFLAGS) -DSIM
- check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
- DISTCLEANFILES = keyword-gen .version version.c
---- ntp-4.2.6/ntpdc/Makefile.in
-+++ ntp-4.2.6/ntpdc/Makefile.in
-@@ -264,8 +264,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
- 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
- 
- # LDADD might need RESLIB and ADJLIB
--ntpdc_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a
-+ntpdc_LDADD = version.o $(LIBOPTS_LDADD) \
-+		../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
- 
- # ntpdc-layout doesn't need any additional libraries at all
- ntpdc_layout_LDADD = 
---- ntp-4.2.6/ntpq/Makefile.in
-+++ ntp-4.2.6/ntpq/Makefile.in
-@@ -265,8 +265,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
- 
- 
- # LDADD might need RESLIB and ADJLIB
--ntpq_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a
-+ntpq_LDADD = version.o $(LIBOPTS_LDADD) \
-+		../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
- 
- noinst_HEADERS = ntpq.h
- noinst_LIBRARIES = libntpq.a
diff --git a/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch b/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
deleted file mode 100644
index 20f87f8edc33..000000000000
--- a/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix readline linking order
-https://bugs.ntp.org/show_bug.cgi?id=1528
-
---- ntp-4.2.6_p1/ntpdc/Makefile.in
-+++ ntp-4.2.6_p1/ntpdc/Makefile.in
-@@ -267,8 +267,8 @@
- 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
- 
- # LDADD might need RESLIB and ADJLIB
--ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a @LCRYPTO@
-+ntpdc_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
-+		@EDITLINE_LIBS@ @LCRYPTO@
- 
- # ntpdc-layout doesn't need any additional libraries at all
- ntpdc_layout_LDADD = 
---- ntp-4.2.6_p1/ntpqMakefile.in
-+++ ntp-4.2.6_p1/ntpq/Makefile.in
-@@ -268,8 +268,8 @@
- 
- 
- # LDADD might need RESLIB and ADJLIB
--ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
--		../libntp/libntp.a @LCRYPTO@
-+ntpq_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
-+		@EDITLINE_LIBS@ @LCRYPTO@
- 
- noinst_HEADERS = ntpq.h
- noinst_LIBRARIES = libntpq.a
diff --git a/net-misc/ntp/ntp-4.2.4_p6.ebuild b/net-misc/ntp/ntp-4.2.4_p6.ebuild
deleted file mode 100644
index e7764744ad1a..000000000000
--- a/net-misc/ntp/ntp-4.2.4_p6.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2009 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_p6.ebuild,v 1.10 2009/08/28 21:24:01 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 s390 sh sparc ~sparc-fbsd x86 ~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}
-
-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 -p "${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_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
-	append-cppflags -D_GNU_SOURCE #264109
-
-	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_configure() {
-	hax_bitkeeper
-	# 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() {
-	hax_bitkeeper
-	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.4_p7.ebuild b/net-misc/ntp/ntp-4.2.4_p7.ebuild
deleted file mode 100644
index 6a8949e577df..000000000000
--- a/net-misc/ntp/ntp-4.2.4_p7.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.10 2009/08/28 21:24:01 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 s390 sh sparc ~sparc-fbsd x86 ~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
-	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 \
-		$(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.ebuild b/net-misc/ntp/ntp-4.2.6.ebuild
deleted file mode 100644
index 3d3dcfbb1e6a..000000000000
--- a/net-misc/ntp/ntp-4.2.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.4 2009/12/29 07:33:20 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~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() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${P}-linking.patch #296832
-	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 \
-		$(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_p1-r1.ebuild b/net-misc/ntp/ntp-4.2.6_p1-r1.ebuild
deleted file mode 100644
index d269582112a5..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 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_p1-r1.ebuild,v 1.1 2010/06/07 09:48:02 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~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
-	epatch "${FILESDIR}"/${P}-linking.patch
-	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 netsnmpd) \
-		$(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_p1.ebuild b/net-misc/ntp/ntp-4.2.6_p1.ebuild
deleted file mode 100644
index 817ed7429f18..000000000000
--- a/net-misc/ntp/ntp-4.2.6_p1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2010 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_p1.ebuild,v 1.1 2010/04/16 22:42:22 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~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() {
-	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
-	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
-	epatch "${FILESDIR}"/${P}-linking.patch
-	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 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_p2.ebuild b/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild
index 3e01607f92f6..9bb218acf402 100644
--- a/net-misc/ntp/ntp-4.2.6_p2.ebuild
+++ b/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.1 2010/07/18 21:54:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild,v 1.1 2010/07/27 13:06:37 flameeyes Exp $
 
 EAPI="2"
 
@@ -55,7 +55,7 @@ src_configure() {
 		$(use_enable parse-clocks) \
 		$(use_enable ipv6) \
 		$(use_enable debug debugging) \
-		$(use_with snmp netsnmpd) \
+		$(use_with snmp ntpsnmpd) \
 		$(use_with ssl crypto)
 }