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 E9A8F138359 for ; Fri, 7 Aug 2020 16:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08323E0805; Fri, 7 Aug 2020 16:26:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 E3A62E0805 for ; Fri, 7 Aug 2020 16:26:14 +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 0661934F0F8 for ; Fri, 7 Aug 2020 16:26:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 762942EE for ; Fri, 7 Aug 2020 16:26:12 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1596817565.d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/xorg-3.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d X-VCS-Branch: master Date: Fri, 7 Aug 2020 16:26:12 +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: 81e97edd-69da-40fe-a47e-12600c8b8e53 X-Archives-Hash: 04d58db2213489436ec308b2e64acbc2 commit: d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d Author: Mike Lothian fireburn co uk> AuthorDate: Fri Aug 7 14:06:12 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Aug 7 16:26:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fbdaa8 xorg-3.eclass: Fix inherits and BDEPEND Remove duplicate flag-o-matic and re-add ${GIT_ECLASS} to allow xorg-3 git ebuilds to work again Don't overwrite BDEPEND variable Signed-off-by: Mike Lothian fireburn.co.uk> Closes: https://github.com/gentoo/gentoo/pull/17043 Signed-off-by: Matt Turner gentoo.org> eclass/xorg-3.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 45bf1259348..20ba2187e56 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -49,7 +49,7 @@ fi # we need to inherit autotools first to get the deps inherit autotools libtool multilib toolchain-funcs flag-o-matic \ - flag-o-matic ${FONT_ECLASS} + ${FONT_ECLASS} ${GIT_ECLASS} if [[ ${XORG_MULTILIB} == yes ]]; then inherit multilib-minimal @@ -152,7 +152,7 @@ if [[ ${FONT} == yes ]]; then PDEPEND+=" media-fonts/font-alias" DEPEND+=" >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0" - BDEPEND="x11-apps/bdftopcf" + BDEPEND+="x11-apps/bdftopcf" # @ECLASS-VARIABLE: FONT_DIR # @DESCRIPTION: