Version bump #328359 by Lars Wendler.

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

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index dd039910f6730fff5e9d26a02b9f125ac0080feb..922db328f276b257747b4209098c27d75b402a18 100644 (file)
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,9 +1,14 @@
 # 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.160 2010/07/18 21:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.161 2010/07/18 21:54:28 vapier Exp $
+
+*ntp-4.2.6_p2 (18 Jul 2010)
+
+  18 Jul 2010; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.6_p2.ebuild:
+  Version bump #328359 by Lars Wendler.
 
   18 Jul 2010; Mike Frysinger <vapier@gentoo.org> files/ntpd.rc:
-  Have ntpd init.d "use net" rather than "depend net" since it can handle
+  Have ntpd init.d "use net" rather than "need net" since it can handle
   interfaces coming & going #321063 by Łukasz Stelmach.
 
 *ntp-4.2.6_p1-r1 (07 Jun 2010)

diff --git a/net-misc/ntp/ntp-4.2.6_p2.ebuild b/net-misc/ntp/ntp-4.2.6_p2.ebuild
new file mode 100644 (file)
index 0000000..3e01607
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.6_p2.ebuild
@@ -0,0 +1,121 @@
+# 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 $
+
+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
+       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
+}