diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-11 00:21:22 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-11 00:21:22 +0000 |
| commit | 2fa921aedcd033b530df4d2dd83f699b2aa8388a (patch) | |
| tree | 9c02284cfae15fa01e5df3f2e42751e6046f73f8 /net-misc/openntpd | |
| parent | EAPI=2 version. fix the paths in the installed headers since we change the lo... (diff) | |
| download | gentoo-2-2fa921aedcd033b530df4d2dd83f699b2aa8388a.tar.gz gentoo-2-2fa921aedcd033b530df4d2dd83f699b2aa8388a.tar.bz2 gentoo-2-2fa921aedcd033b530df4d2dd83f699b2aa8388a.zip | |
Since the latest revision is already EAPI=2, instead of dying during setup phase, block ntp when the openntp USE flag for that is disabled (don't *depend* on it with it enabled, obviously).
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openntpd')
| -rw-r--r-- | net-misc/openntpd/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/openntpd/openntpd-3.9_p1-r2.ebuild | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog index 2e5dfb3cd648..ed6b19983bdf 100644 --- a/net-misc/openntpd/ChangeLog +++ b/net-misc/openntpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/openntpd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.43 2009/10/14 13:39:14 bangert Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.44 2010/01/11 00:21:22 flameeyes Exp $ + + 11 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> + openntpd-3.9_p1-r2.ebuild: + Since the latest revision is already EAPI=2, instead of dying during setup + phase, block ntp when the openntp USE flag for that is disabled (don't + *depend* on it with it enabled, obviously). 14 Oct 2009; Thilo Bangert <bangert@gentoo.org> files/openntpd.rc-3.9_p1-r2: diff --git a/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild b/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild index a6413d823ed4..e62c628b7231 100644 --- a/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild +++ b/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild,v 1.1 2009/10/14 08:04:18 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild,v 1.2 2010/01/11 00:21:22 flameeyes Exp $ EAPI="2" @@ -18,7 +18,8 @@ IUSE="ssl selinux" RDEPEND="ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) - !<=net-misc/ntp-4.2.0-r2" + !<=net-misc/ntp-4.2.0-r2 + !net-misc/ntp[-openntpd]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -29,10 +30,6 @@ pkg_setup() { #make sure user has correct HOME usermod -d /var/lib/openntpd/chroot ntp - - if has_version net-misc/ntp && ! built_with_use net-misc/ntp openntpd ; then - die "you need to emerge ntp with USE=openntpd" - fi } src_prepare() { |