commit: d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d
Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Fri Aug 7 14:06:12 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mike <AT> fireburn.co.uk>
Closes: https://github.com/gentoo/gentoo/pull/17043
Signed-off-by: Matt Turner <mattst88 <AT> 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:
