commit: 69b7769cd8060101f41193f5cf5cf9af7d9741b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:06:50 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:06:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b7769c
media-plugins/vdr-xineliboutput: respect ${PKG_CONFIG}
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild | 6 +++---
media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index b9d615c9322..fb37a10e6c2 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit vdr-plugin-2
+inherit toolchain-funcs vdr-plugin-2
GENTOO_VDR_CONDITIONAL=yes
@@ -43,7 +43,6 @@ COMMON_DEPEND="
)"
DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
sys-kernel/linux-headers
nls? ( sys-devel/gettext )
xine? (
@@ -53,6 +52,7 @@ DEPEND="${COMMON_DEPEND}
)
)"
RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
REQUIRED_USE=" || ( vdr xine )"
@@ -62,7 +62,7 @@ pkg_setup() {
vdr-plugin-2_pkg_setup
if use xine; then
- XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+ XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir
libxine)
[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin
dir"
fi
}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index b81bf629a3f..bc97c78bee0 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,6 @@ COMMON_DEPEND="
cec? ( dev-libs/libcec )"
DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
sys-kernel/linux-headers
nls? ( sys-devel/gettext )
xine? (
@@ -54,6 +53,7 @@ DEPEND="${COMMON_DEPEND}
)
)"
RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
S=${WORKDIR}/${P}
@@ -67,7 +67,7 @@ pkg_setup() {
vdr-plugin-2_pkg_setup
if use xine; then
- XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+ XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir
libxine)
[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin
dir"
fi
}