From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA25C1382C5 for ; Tue, 27 Feb 2018 18:08:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5084E08E0; Tue, 27 Feb 2018 18:08:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2947E08E0 for ; Tue, 27 Feb 2018 18:08:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E28B7335C2A for ; Tue, 27 Feb 2018 18:08:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97E611D8 for ; Tue, 27 Feb 2018 18:08:02 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1519754852.b6a6e98314e6dd3e8f171dc42054ff414f3427ef.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/ntpsec-1.0.0-r4.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b6a6e98314e6dd3e8f171dc42054ff414f3427ef X-VCS-Branch: master Date: Tue, 27 Feb 2018 18:08:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0e90db70-ccec-48e5-81e8-14bd56555601 X-Archives-Hash: 68ca3daf30856967352e84d1ca4cd53c commit: b6a6e98314e6dd3e8f171dc42054ff414f3427ef Author: Mike Gilbert gentoo org> AuthorDate: Tue Feb 27 18:07:32 2018 +0000 Commit: Mike Gilbert gentoo 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"