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 A3315138359 for ; Tue, 24 Nov 2020 02:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89685E070D; Tue, 24 Nov 2020 02:22:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 61AC9E070D for ; Tue, 24 Nov 2020 02:22:37 +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 B97E1340F42 for ; Tue, 24 Nov 2020 02:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F9F3464 for ; Tue, 24 Nov 2020 02:22:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1606184536.6a9ad0e5536ad9df769f29e0c7e40324fcde1437.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-4.0.ebuild net-misc/chrony/chrony-9999.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6a9ad0e5536ad9df769f29e0c7e40324fcde1437 X-VCS-Branch: master Date: Tue, 24 Nov 2020 02:22:34 +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: 2251765b-0a88-4f04-9a89-1e1dd7019d72 X-Archives-Hash: e09ced69cccf056c1254ba027030d80e commit: 6a9ad0e5536ad9df769f29e0c7e40324fcde1437 Author: Sam James gentoo org> AuthorDate: Tue Nov 24 02:21:21 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 24 02:22:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9ad0e5 net-misc/chrony: tidy ebuild Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-misc/chrony/chrony-4.0.ebuild | 46 ++++++++++++++++++-------------------- net-misc/chrony/chrony-9999.ebuild | 46 ++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 48 deletions(-) diff --git a/net-misc/chrony/chrony-4.0.ebuild b/net-misc/chrony/chrony-4.0.ebuild index a13a14df678..11c78bf628d 100644 --- a/net-misc/chrony/chrony-4.0.ebuild +++ b/net-misc/chrony/chrony-4.0.ebuild @@ -2,57 +2,55 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/" if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - inherit git-r3 + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" else SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi +S="${WORKDIR}/${P/_/-}" + LICENSE="GPL-2" SLOT="0" -IUSE=" - +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock - +rtc samba +seccomp +sechash selinux -" -REQUIRED_USE=" - sechash? ( nettle ) -" -RESTRICT=test -CDEPEND=" - caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) +IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" +REQUIRED_USE="sechash? ( nettle )" +RESTRICT="test" + +BDEPEND="nettle? ( virtual/pkgconfig )" + +if [[ ${PV} == "9999" ]]; then + BDEPEND+=" virtual/w3m" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) " RDEPEND=" - ${CDEPEND} + ${DEPEND} selinux? ( sec-policy/selinux-chronyd ) " -BDEPEND=" - nettle? ( virtual/pkgconfig ) -" + PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch ) -S="${WORKDIR}/${P/_/-}" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" virtual/w3m" -fi src_prepare() { default diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index a13a14df678..11c78bf628d 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -2,57 +2,55 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/" if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - inherit git-r3 + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" else SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi +S="${WORKDIR}/${P/_/-}" + LICENSE="GPL-2" SLOT="0" -IUSE=" - +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock - +rtc samba +seccomp +sechash selinux -" -REQUIRED_USE=" - sechash? ( nettle ) -" -RESTRICT=test -CDEPEND=" - caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) +IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" +REQUIRED_USE="sechash? ( nettle )" +RESTRICT="test" + +BDEPEND="nettle? ( virtual/pkgconfig )" + +if [[ ${PV} == "9999" ]]; then + BDEPEND+=" virtual/w3m" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) -" -DEPEND=" - ${CDEPEND} html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) " RDEPEND=" - ${CDEPEND} + ${DEPEND} selinux? ( sec-policy/selinux-chronyd ) " -BDEPEND=" - nettle? ( virtual/pkgconfig ) -" + PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch ) -S="${WORKDIR}/${P/_/-}" - -if [[ ${PV} == "9999" ]]; then - BDEPEND+=" virtual/w3m" -fi src_prepare() { default