xorg-2.eclass, xorg-3.eclass: Depend on virtual/pkgconfig[${MULTILIB_USEDEP}] when...

Fixes: https://bugs.gentoo.org/684494
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 0bba5bb7a369c091b82ff7889b7d9668dbdf3a1d..6034da49bc325bc8d812568106f444c90e6329d0 100644 (file)
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -172,7 +172,7 @@ fi
 # QA: configure: WARNING: unrecognized options: --disable-static
 : ${XORG_STATIC:="yes"}
 
-# Add static-libs useflag where usefull.
+# Add static-libs useflag where useful.
 if [[ ${XORG_STATIC} == yes \
                && ${FONT} != yes \
                && ${CATEGORY} != app-doc \
@@ -186,7 +186,11 @@ if [[ ${XORG_STATIC} == yes \
        IUSE+=" static-libs"
 fi
 
-DEPEND+=" virtual/pkgconfig"
+if [[ ${XORG_MULTILIB} == yes ]]; then
+       DEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]"
+else
+       DEPEND+=" virtual/pkgconfig"
+fi
 
 # @ECLASS-VARIABLE: XORG_DRI
 # @DESCRIPTION:

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 557a65233cb7e4a9de7b73f12e359eddafb7f197..6ac90a64d59d97f6406141ad976df689e49b5c6a 100644 (file)
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -140,7 +140,11 @@ if [[ ${XORG_STATIC} == yes \
        IUSE+=" static-libs"
 fi
 
-BDEPEND+=" virtual/pkgconfig"
+if [[ ${XORG_MULTILIB} == yes ]]; then
+       BDEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]"
+else
+       BDEPEND+=" virtual/pkgconfig"
+fi
 
 # @ECLASS-VARIABLE: XORG_DRI
 # @DESCRIPTION: