diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-05-30 22:42:45 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-06-13 12:58:11 -0400 |
| commit | 5008bbcb72fc5e5889b0ab9f94aae16fc3698a57 (patch) | |
| tree | b0d046a183f9175d0ba31598cfa43d6dadf87400 /eclass | |
| parent | sci-libs/bmrblib: Bump to 1.0.4 (diff) | |
| download | gentoo-5008bbcb72fc5e5889b0ab9f94aae16fc3698a57.tar.gz gentoo-5008bbcb72fc5e5889b0ab9f94aae16fc3698a57.tar.bz2 gentoo-5008bbcb72fc5e5889b0ab9f94aae16fc3698a57.zip | |
Remove MULTILIB_USEDEP from all virtual/pkgconfig dependencies
Bug: https://bugs.gentoo.org/723112
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gstreamer.eclass | 2 | ||||
| -rw-r--r-- | eclass/xorg-2.eclass | 8 | ||||
| -rw-r--r-- | eclass/xorg-3.eclass | 8 |
3 files changed, 5 insertions, 13 deletions
diff --git a/eclass/gstreamer.eclass b/eclass/gstreamer.eclass index e592d726863d..301d0874106e 100644 --- a/eclass/gstreamer.eclass +++ b/eclass/gstreamer.eclass @@ -95,7 +95,7 @@ RDEPEND=" " DEPEND=" >=sys-apps/sed-4 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Export common multilib phases. diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 95345042a998..c703d06f1dbd 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-2.eclass @@ -189,11 +189,7 @@ if [[ ${XORG_STATIC} == yes \ IUSE+=" static-libs" fi -if [[ ${XORG_MULTILIB} == yes ]]; then - DEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" -else - DEPEND+=" virtual/pkgconfig" -fi +DEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI # @DESCRIPTION: diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index b8dca22726d1..168e58b42c81 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -149,11 +149,7 @@ if [[ ${XORG_STATIC} == yes \ IUSE+=" static-libs" fi -if [[ ${XORG_MULTILIB} == yes ]]; then - BDEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" -else - BDEPEND+=" virtual/pkgconfig" -fi +BDEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI # @DESCRIPTION: |