commit: cdbd2b4e08d33fa3b74dafab8b4a24da04beab03
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 10:01:53 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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 <jer <AT> 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)
