Control snmp support via USE=snmp #322795 by Eduard Warkentin.

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

3 files changed, 134 insertions, 6 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 3eb3460ba7aa..726da97e6266 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.158 2010/04/16 22:42:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.159 2010/06/07 09:48:02 vapier Exp $
+
+*ntp-4.2.6_p1-r1 (07 Jun 2010)
+
+  07 Jun 2010; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.6_p1-r1.ebuild:
+  Control snmp support via USE=snmp #322795 by Eduard Warkentin.
 
 *ntp-4.2.6_p1 (16 Apr 2010)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 788a5d57a1b0..9317d9b57ed6 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -26,13 +26,14 @@ EBUILD ntp-4.2.4_p6.ebuild 4135 RMD160 15cec7d894f3a013d330c81ec72e7d920311f9c4
 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
-MISC ChangeLog 21340 RMD160 884060276ea5c7054e5406383884d1fd1f66a704 SHA1 130073bac1a53e84b551691106d44ff8d30b0f89 SHA256 a23a0c106288ebb1e1b646e35fae997b3b7f67bc05046f56af4cbcc2ea14377a
+MISC ChangeLog 21513 RMD160 bf4c949c1d50191ee97110f0b6916a66b2bf16a5 SHA1 a98d5fd60a2794242d5f2a19f071b8586f7ea26a SHA256 c24b169c772461f38253ea02f83c07f4ce1edef8cd92955ea96e69d6af8d73a5
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkvI54kACgkQTwhj9JtAlp6rbgEAoydKmmbcvg6RH7UnCUV2jsLC
-QDqHL9sXaxzUjxweBl4BAJbsAceWE4XBIBySKRau+EyjQdOZZkX3otdcAjU1Msbi
-=YPpk
+iF4EAREIAAYFAkwMwFAACgkQTwhj9JtAlp4SrwEAjHTp26sy2wLVpVx3EOg01pdo
+OT2AJ99tSlTVa1n5iu4BAIKE4+GipVSc+4+ihdDKhlySgzXUbv/bYiTHfWwkrR7x
+=7a/4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.6_p1-r1.ebuild b/net-misc/ntp/ntp-4.2.6_p1-r1.ebuild
new file mode 100644
index 000000000000..d269582112a5
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.6_p1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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
+}