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 9609613835A for ; Thu, 8 Oct 2020 08:16:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0213E08C8; Thu, 8 Oct 2020 08:16:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9A49DE08C8 for ; Thu, 8 Oct 2020 08:16:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6374E33BEBB for ; Thu, 8 Oct 2020 08:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D300D386 for ; Thu, 8 Oct 2020 08:16:45 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1602145003.be7aa74ba8bb6ba12a67f0e9155d91b36dbbd9f8.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-9999.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: be7aa74ba8bb6ba12a67f0e9155d91b36dbbd9f8 X-VCS-Branch: master Date: Thu, 8 Oct 2020 08:16:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c92edae-6c22-4022-acc4-607c63448b08 X-Archives-Hash: 0c213744aa2b7ba0a03bdae84f53aa5b commit: be7aa74ba8bb6ba12a67f0e9155d91b36dbbd9f8 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 8 08:13:50 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 8 08:16:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7aa74b net-misc/chrony: Update live ebuild Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> net-misc/chrony/chrony-9999.ebuild | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index b5c97cbbd86..a13a14df678 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -19,11 +19,10 @@ fi LICENSE="GPL-2" SLOT="0" IUSE=" - +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock + +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux " REQUIRED_USE=" - ?? ( libedit readline ) sechash? ( nettle ) " RESTRICT=test @@ -31,7 +30,6 @@ CDEPEND=" caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) - readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) " DEPEND=" @@ -86,18 +84,6 @@ src_configure() { tc-export CC PKG_CONFIG - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - # Note: ncurses and nss switches are mentioned in the configure script but # do nothing # not an autotools generated script @@ -106,6 +92,7 @@ src_configure() { $(usex caps '' --disable-linuxcaps) $(usex cmdmon '' --disable-cmdmon) $(usex ipv6 '' --disable-ipv6) + $(usex libedit '' --without-editline) $(usex nettle '' --without-nettle) $(usex ntp '' --disable-ntp) $(usex phc '' --disable-phc) @@ -114,7 +101,6 @@ src_configure() { $(usex rtc '' --disable-rtc) $(usex samba --enable-ntp-signd '') $(usex sechash '' --disable-sechash) - ${CHRONY_EDITLINE} ${EXTRA_ECONF} --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}"