diff options
| author |   Mike Lothian <mike@fireburn.co.uk> | 2020-08-07 15:06:12 +0100 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2020-08-07 09:26:05 -0700 |
| commit | d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d (patch) | |
| tree | 8d2eb6af963a5612f64057b80842538b1d33e40b /eclass/xorg-3.eclass | |
| parent | net-vpn/wireguard-tools: actually use checkconfig (diff) | |
| download | gentoo-d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d.tar.gz gentoo-d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d.tar.bz2 gentoo-d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d.zip | |
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@fireburn.co.uk>
Closes: https://github.com/gentoo/gentoo/pull/17043
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'eclass/xorg-3.eclass')
| -rw-r--r-- | eclass/xorg-3.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 45bf12593484..20ba2187e567 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: |