diff options
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.2_p3.ebuild | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index aff5e637d72f..0f19e8d7760f 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.84 2006/09/11 06:43:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.85 2006/09/18 22:36:50 vapier Exp $ + + 18 Sep 2006; Mike Frysinger <vapier@gentoo.org> ntp-4.2.2_p3.ebuild: + Restore USE=openntpd due to popular demand. 11 Sep 2006; Mike Frysinger <vapier@gentoo.org> ntp-4.2.2_p3.ebuild: Always block openntpd as trying to make these guys coexist is a pita #147080 diff --git a/net-misc/ntp/ntp-4.2.2_p3.ebuild b/net-misc/ntp/ntp-4.2.2_p3.ebuild index 11f42936e5d7..e0797cff2f8c 100644 --- a/net-misc/ntp/ntp-4.2.2_p3.ebuild +++ b/net-misc/ntp/ntp-4.2.2_p3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2_p3.ebuild,v 1.10 2006/09/16 21:04:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2_p3.ebuild,v 1.11 2006/09/18 22:36:50 vapier Exp $ inherit eutils toolchain-funcs @@ -13,16 +13,17 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="as-is" SLOT="0" KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="logrotate parse-clocks caps selinux ssl ipv6 debug" +IUSE="logrotate parse-clocks caps selinux ssl ipv6 debug openntpd" RDEPEND=">=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) - !net-misc/openntpd + !openntpd? ( !net-misc/openntpd ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp )" DEPEND="${RDEPEND} >=sys-apps/portage-2.0.51" +PDEPEND="!openntpd? ( net-misc/openntpd )" S=${WORKDIR}/${MY_P} @@ -108,6 +109,14 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/ntp.logrotate ntp fi + + 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_preinst() { |