| 1 |
commit: d3fbdaa8f6cbc59acdc5ae3b2a4b7dca03ced16d |
| 2 |
Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk> |
| 3 |
AuthorDate: Fri Aug 7 14:06:12 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 7 16:26:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fbdaa8 |
| 7 |
|
| 8 |
xorg-3.eclass: Fix inherits and BDEPEND |
| 9 |
|
| 10 |
Remove duplicate flag-o-matic and re-add ${GIT_ECLASS} to allow xorg-3 git ebuilds to work again |
| 11 |
|
| 12 |
Don't overwrite BDEPEND variable |
| 13 |
|
| 14 |
Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17043 |
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/xorg-3.eclass | 4 ++-- |
| 19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
| 22 |
index 45bf1259348..20ba2187e56 100644 |
| 23 |
--- a/eclass/xorg-3.eclass |
| 24 |
+++ b/eclass/xorg-3.eclass |
| 25 |
@@ -49,7 +49,7 @@ fi |
| 26 |
|
| 27 |
# we need to inherit autotools first to get the deps |
| 28 |
inherit autotools libtool multilib toolchain-funcs flag-o-matic \ |
| 29 |
- flag-o-matic ${FONT_ECLASS} |
| 30 |
+ ${FONT_ECLASS} ${GIT_ECLASS} |
| 31 |
|
| 32 |
if [[ ${XORG_MULTILIB} == yes ]]; then |
| 33 |
inherit multilib-minimal |
| 34 |
@@ -152,7 +152,7 @@ if [[ ${FONT} == yes ]]; then |
| 35 |
PDEPEND+=" media-fonts/font-alias" |
| 36 |
DEPEND+=" >=media-fonts/font-util-1.2.0 |
| 37 |
>=x11-apps/mkfontscale-1.2.0" |
| 38 |
- BDEPEND="x11-apps/bdftopcf" |
| 39 |
+ BDEPEND+="x11-apps/bdftopcf" |
| 40 |
|
| 41 |
# @ECLASS-VARIABLE: FONT_DIR |
| 42 |
# @DESCRIPTION: |
Archives