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 34D4F1382C5 for ; Fri, 18 Jun 2021 21:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2053E0876; Fri, 18 Jun 2021 21:07:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 658C0E0874 for ; Fri, 18 Jun 2021 21:07:42 +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 92A20340B66 for ; Fri, 18 Jun 2021 21:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA6567BD for ; Fri, 18 Jun 2021 21:07:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1624050410.69b7769cd8060101f41193f5cf5cf9af7d9741b7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xineliboutput/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild X-VCS-Directories: media-plugins/vdr-xineliboutput/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 69b7769cd8060101f41193f5cf5cf9af7d9741b7 X-VCS-Branch: master Date: Fri, 18 Jun 2021 21:07:37 +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: 3d207988-ec16-46b3-adbe-a58ff6b86bd3 X-Archives-Hash: 66ff4970f1ac68369e8e96ac5aed19b4 commit: 69b7769cd8060101f41193f5cf5cf9af7d9741b7 Author: Sam James gentoo org> AuthorDate: Fri Jun 18 21:06:50 2021 +0000 Commit: David Seifert gentoo 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 gentoo.org> Signed-off-by: David Seifert 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 }