| 1 |
commit: b6a6e98314e6dd3e8f171dc42054ff414f3427ef |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 27 18:07:32 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 27 18:07:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a6e983 |
| 7 |
|
| 8 |
net-misc/ntpsec: move blockers to RDEPEND |
| 9 |
|
| 10 |
Building ntpsec with ntp installed works fine. Installing them |
| 11 |
concurrently produces file colisions, so the blockers belong in RDEPEND, |
| 12 |
not DEPEND. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 |
| 15 |
|
| 16 |
net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild | 4 ++-- |
| 17 |
net-misc/ntpsec/ntpsec-9999.ebuild | 4 ++-- |
| 18 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild |
| 21 |
index 3d627137b63..e1d9e24eb0d 100644 |
| 22 |
--- a/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild |
| 23 |
+++ b/net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild |
| 24 |
@@ -46,6 +46,8 @@ CDEPEND="${PYTHON_DEPS} |
| 25 |
" |
| 26 |
RDEPEND="${CDEPEND} |
| 27 |
ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) |
| 28 |
+ !net-misc/ntp |
| 29 |
+ !net-misc/openntpd |
| 30 |
" |
| 31 |
DEPEND="${CDEPEND} |
| 32 |
app-text/asciidoc |
| 33 |
@@ -53,8 +55,6 @@ DEPEND="${CDEPEND} |
| 34 |
sys-devel/bison |
| 35 |
rclock_oncore? ( net-misc/pps-tools ) |
| 36 |
rclock_pps? ( net-misc/pps-tools ) |
| 37 |
- !net-misc/ntp |
| 38 |
- !net-misc/openntpd |
| 39 |
" |
| 40 |
|
| 41 |
WAF_BINARY="${S}/waf" |
| 42 |
|
| 43 |
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 44 |
index 6b202f93605..a4689a76e05 100644 |
| 45 |
--- a/net-misc/ntpsec/ntpsec-9999.ebuild |
| 46 |
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 47 |
@@ -46,6 +46,8 @@ CDEPEND="${PYTHON_DEPS} |
| 48 |
" |
| 49 |
RDEPEND="${CDEPEND} |
| 50 |
ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) |
| 51 |
+ !net-misc/ntp |
| 52 |
+ !net-misc/openntpd |
| 53 |
" |
| 54 |
DEPEND="${CDEPEND} |
| 55 |
app-text/asciidoc |
| 56 |
@@ -53,8 +55,6 @@ DEPEND="${CDEPEND} |
| 57 |
sys-devel/bison |
| 58 |
rclock_oncore? ( net-misc/pps-tools ) |
| 59 |
rclock_pps? ( net-misc/pps-tools ) |
| 60 |
- !net-misc/ntp |
| 61 |
- !net-misc/openntpd |
| 62 |
" |
| 63 |
|
| 64 |
WAF_BINARY="${S}/waf" |
Archives