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 DB719138359 for ; Thu, 27 Aug 2020 10:04:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3213E0CA1; Thu, 27 Aug 2020 10:04:52 +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 9C8D7E0CA1 for ; Thu, 27 Aug 2020 10:04:52 +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 1324333BEBE for ; Thu, 27 Aug 2020 10:04:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E89432A for ; Thu, 27 Aug 2020 10:04:49 +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: <1598522688.cdbd2b4e08d33fa3b74dafab8b4a24da04beab03.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-3.5.1-r1.ebuild net-misc/chrony/chrony-4.0_pre3.ebuild 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: cdbd2b4e08d33fa3b74dafab8b4a24da04beab03 X-VCS-Branch: master Date: Thu, 27 Aug 2020 10:04:49 +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: 26ed39ef-2965-463f-a9ff-7e3c6fc5ece3 X-Archives-Hash: 19630abb7c8bae45bc60c6f8c0fc1073 commit: cdbd2b4e08d33fa3b74dafab8b4a24da04beab03 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Aug 27 10:01:53 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Aug 27 10:04:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbd2b4e net-misc/chrony: BDEPEND on virtual/pkgconfig Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> net-misc/chrony/chrony-3.5.1-r1.ebuild | 13 +++++++++++-- net-misc/chrony/chrony-4.0_pre3.ebuild | 13 +++++++++++-- net-misc/chrony/chrony-9999.ebuild | 13 +++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild index 84346525f5c..877718f6031 100644 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild +++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild @@ -43,6 +43,9 @@ RDEPEND=" ${CDEPEND} 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 @@ -50,7 +53,7 @@ PATCHES=( S="${WORKDIR}/${P/_/-}" if [[ ${PV} == "9999" ]]; then - BDEPEND=" virtual/w3m" + BDEPEND+=" virtual/w3m" fi src_prepare() { @@ -60,6 +63,10 @@ src_prepare() { -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ doc/* examples/* || die + sed -i \ + -e 's|pkg-config|${PKG_CONFIG}|g' \ + configure || die + # Copy for potential user fixup cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service @@ -79,7 +86,7 @@ src_configure() { "${T}"/chronyd.conf "${T}"/chronyd.service || die fi - tc-export CC + tc-export CC PKG_CONFIG local CHRONY_EDITLINE # ./configure legend: @@ -93,6 +100,8 @@ src_configure() { 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 local myconf=( $(use_enable seccomp scfilter) diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild index 84346525f5c..877718f6031 100644 --- a/net-misc/chrony/chrony-4.0_pre3.ebuild +++ b/net-misc/chrony/chrony-4.0_pre3.ebuild @@ -43,6 +43,9 @@ RDEPEND=" ${CDEPEND} 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 @@ -50,7 +53,7 @@ PATCHES=( S="${WORKDIR}/${P/_/-}" if [[ ${PV} == "9999" ]]; then - BDEPEND=" virtual/w3m" + BDEPEND+=" virtual/w3m" fi src_prepare() { @@ -60,6 +63,10 @@ src_prepare() { -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ doc/* examples/* || die + sed -i \ + -e 's|pkg-config|${PKG_CONFIG}|g' \ + configure || die + # Copy for potential user fixup cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service @@ -79,7 +86,7 @@ src_configure() { "${T}"/chronyd.conf "${T}"/chronyd.service || die fi - tc-export CC + tc-export CC PKG_CONFIG local CHRONY_EDITLINE # ./configure legend: @@ -93,6 +100,8 @@ src_configure() { 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 local myconf=( $(use_enable seccomp scfilter) diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 84346525f5c..877718f6031 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -43,6 +43,9 @@ RDEPEND=" ${CDEPEND} 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 @@ -50,7 +53,7 @@ PATCHES=( S="${WORKDIR}/${P/_/-}" if [[ ${PV} == "9999" ]]; then - BDEPEND=" virtual/w3m" + BDEPEND+=" virtual/w3m" fi src_prepare() { @@ -60,6 +63,10 @@ src_prepare() { -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ doc/* examples/* || die + sed -i \ + -e 's|pkg-config|${PKG_CONFIG}|g' \ + configure || die + # Copy for potential user fixup cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service @@ -79,7 +86,7 @@ src_configure() { "${T}"/chronyd.conf "${T}"/chronyd.service || die fi - tc-export CC + tc-export CC PKG_CONFIG local CHRONY_EDITLINE # ./configure legend: @@ -93,6 +100,8 @@ src_configure() { 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 local myconf=( $(use_enable seccomp scfilter)