commit: b6a6e98314e6dd3e8f171dc42054ff414f3427ef
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 18:07:32 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 18:07:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a6e983
net-misc/ntpsec: move blockers to RDEPEND
Building ntpsec with ntp installed works fine. Installing them
concurrently produces file colisions, so the blockers belong in RDEPEND,
not DEPEND.
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99
net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild | 4 ++--
net-misc/ntpsec/ntpsec-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild
b/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild
index 3d627137b63..e1d9e24eb0d 100644
--- a/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild
@@ -46,6 +46,8 @@ CDEPEND="${PYTHON_DEPS}
"
RDEPEND="${CDEPEND}
ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+ !net-misc/ntp
+ !net-misc/openntpd
"
DEPEND="${CDEPEND}
app-text/asciidoc
@@ -53,8 +55,6 @@ DEPEND="${CDEPEND}
sys-devel/bison
rclock_oncore? ( net-misc/pps-tools )
rclock_pps? ( net-misc/pps-tools )
- !net-misc/ntp
- !net-misc/openntpd
"
WAF_BINARY="${S}/waf"
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild
b/net-misc/ntpsec/ntpsec-9999.ebuild
index 6b202f93605..a4689a76e05 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -46,6 +46,8 @@ CDEPEND="${PYTHON_DEPS}
"
RDEPEND="${CDEPEND}
ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+ !net-misc/ntp
+ !net-misc/openntpd
"
DEPEND="${CDEPEND}
app-text/asciidoc
@@ -53,8 +55,6 @@ DEPEND="${CDEPEND}
sys-devel/bison
rclock_oncore? ( net-misc/pps-tools )
rclock_pps? ( net-misc/pps-tools )
- !net-misc/ntp
- !net-misc/openntpd
"
WAF_BINARY="${S}/waf"