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 | |
| 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>
177 files changed, 179 insertions, 187 deletions
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild index 56116f115112..0d83856cb014 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild @@ -22,7 +22,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( >=dev-libs/libxml2-2.9.1 ) " diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild index 39f1c8350a09..1311786dc54c 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild @@ -22,7 +22,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( >=dev-libs/libxml2-2.9.1 ) " diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild index 3b35954bef94..d3a01c29e026 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild @@ -30,7 +30,7 @@ BDEPEND=" >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " PATCHES=( diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild index 41d9c25f0bd0..d60fccdd5d6a 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild @@ -31,7 +31,7 @@ BDEPEND=" >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " PATCHES=( diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild index 67e6586b1007..df9407c883a0 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild @@ -31,7 +31,7 @@ BDEPEND=" >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " PATCHES=( diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild index c6af58ac732d..0710a88ee3d1 100644 --- a/app-crypt/heimdal/heimdal-7.5.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild @@ -42,7 +42,7 @@ CDEPEND=" DEPEND="${CDEPEND} ${PYTHON_DEPS} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( ${VIRTUALX_DEPEND} ) )" diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild index 648f2f91ecff..36aee840b6d5 100644 --- a/app-crypt/heimdal/heimdal-7.6.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild @@ -45,7 +45,7 @@ CDEPEND=" DEPEND="${CDEPEND} ${PYTHON_DEPS} dev-perl/JSON - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( ${VIRTUALX_DEPEND} ) )" diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild index f62d69fb6a6e..1f5dcf3141cf 100644 --- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild +++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild @@ -45,7 +45,7 @@ CDEPEND=" DEPEND="${CDEPEND} ${PYTHON_DEPS} dev-perl/JSON - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( ${VIRTUALX_DEPEND} ) )" diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild index 7b382e18f118..121e3f5f3f02 100644 --- a/app-crypt/libsecret/libsecret-0.18.8.ebuild +++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( $(python_gen_any_dep ' dev-python/mock[${PYTHON_USEDEP}] diff --git a/app-crypt/libsecret/libsecret-0.20.2.ebuild b/app-crypt/libsecret/libsecret-0.20.2.ebuild index 346eb620ef31..e5125875d2b1 100644 --- a/app-crypt/libsecret/libsecret-0.20.2.ebuild +++ b/app-crypt/libsecret/libsecret-0.20.2.ebuild @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( $(python_gen_any_dep ' dev-python/mock[${PYTHON_USEDEP}] diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild index 28696c25eb4b..8272d6cfa416 100644 --- a/app-crypt/libsecret/libsecret-0.20.3.ebuild +++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( $(python_gen_any_dep ' dev-python/mock[${PYTHON_USEDEP}] diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild index 1358e3c9e1ce..1cede2d14203 100644 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild @@ -32,7 +32,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig virtual/wine[${MULTILIB_USEDEP}] >=dev-util/meson-0.50.1 " diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild index 1358e3c9e1ce..1cede2d14203 100644 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild @@ -32,7 +32,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig virtual/wine[${MULTILIB_USEDEP}] >=dev-util/meson-0.50.1 " diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild index c24a8be726c9..e4cf763c5baa 100644 --- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild +++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild @@ -24,7 +24,7 @@ RDEPEND=" >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild index 642563cfad76..2747db92aafa 100644 --- a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild +++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild @@ -19,7 +19,7 @@ RDEPEND=" >=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " multilib_src_prepare() { diff --git a/dev-cpp/pangomm/pangomm-2.42.0.ebuild b/dev-cpp/pangomm/pangomm-2.42.0.ebuild index a26725fccced..f19e34ec2a2e 100644 --- a/dev-cpp/pangomm/pangomm-2.42.0.ebuild +++ b/dev-cpp/pangomm/pangomm-2.42.0.ebuild @@ -19,7 +19,7 @@ COMMON_DEPEND=" >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}] " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild index e592edcb44b2..fefc39269edf 100644 --- a/dev-cpp/pangomm/pangomm-2.42.1.ebuild +++ b/dev-cpp/pangomm/pangomm-2.42.1.ebuild @@ -19,7 +19,7 @@ COMMON_DEPEND=" >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}] " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild index e50315c40880..46521641412a 100644 --- a/dev-libs/atk/atk-2.34.1.ebuild +++ b/dev-libs/atk/atk-2.34.1.ebuild @@ -22,7 +22,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=sys-devel/gettext-0.19.8 " diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild index 4e54ebb066df..fb26bc563698 100644 --- a/dev-libs/atk/atk-2.36.0.ebuild +++ b/dev-libs/atk/atk-2.36.0.ebuild @@ -22,7 +22,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=sys-devel/gettext-0.19.8 " diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild index c694d28efa8e..14742fe11e5a 100644 --- a/dev-libs/fribidi/fribidi-1.0.9.ebuild +++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild @@ -17,7 +17,7 @@ IUSE="static-libs" RDEPEND="" DEPEND="" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7 diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild index 501c9bc33f0d..36ff91aa1a1d 100644 --- a/dev-libs/fstrm/fstrm-0.3.0.ebuild +++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild @@ -15,7 +15,7 @@ IUSE="static-libs utils" RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { default diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild index f67ed49b7843..57adaa590548 100644 --- a/dev-libs/glib/glib-2.62.6.ebuild +++ b/dev-libs/glib/glib-2.62.6.ebuild @@ -51,7 +51,7 @@ BDEPEND=" systemtap? ( >=dev-util/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " # TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen diff --git a/dev-libs/glib/glib-2.64.3.ebuild b/dev-libs/glib/glib-2.64.3.ebuild index 8b05703c3473..481b31a84637 100644 --- a/dev-libs/glib/glib-2.64.3.ebuild +++ b/dev-libs/glib/glib-2.64.3.ebuild @@ -54,7 +54,7 @@ BDEPEND=" systemtap? ( >=dev-util/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " # TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild index f459281f5e42..39488ffadbc4 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="debug static-libs" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND=" ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild index bc67bb2c0d34..29001e5eecca 100644 --- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild +++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild index a351d707086b..b4a5172fae10 100644 --- a/dev-libs/json-glib/json-glib-1.4.4.ebuild +++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild @@ -24,7 +24,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild index 62d5da200877..0a3bd6b40731 100644 --- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild +++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild @@ -26,7 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND} introspection? ( $(vala_depend) ) dev-util/gtk-doc-am - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " PATCHES=( diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild index 61dff4c399d9..4208a3c7ceba 100644 --- a/dev-libs/libcroco/libcroco-0.6.13.ebuild +++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild @@ -21,7 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-util/gtk-doc-am - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild index 95dcd5d6b281..2de4fb108df9 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild @@ -32,7 +32,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils dev-util/intltool sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(vala_depend) ) test? ( >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] diff --git a/dev-libs/libevdev/libevdev-1.9.0.ebuild b/dev-libs/libevdev/libevdev-1.9.0.ebuild index 68bbc0b36445..a89a1b34d155 100644 --- a/dev-libs/libevdev/libevdev-1.9.0.ebuild +++ b/dev-libs/libevdev/libevdev-1.9.0.ebuild @@ -26,7 +26,7 @@ DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )" BDEPEND=" ${PYTHON_DEPS} doc? ( app-doc/doxygen ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RESTRICT="!test? ( test )" diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild index 7fbea6d971fe..7509db80b34d 100644 --- a/dev-libs/libevdev/libevdev-9999.ebuild +++ b/dev-libs/libevdev/libevdev-9999.ebuild @@ -26,7 +26,7 @@ DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )" BDEPEND=" ${PYTHON_DEPS} doc? ( app-doc/doxygen ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RESTRICT="!test? ( test )" diff --git a/dev-libs/libgudev/libgudev-233-r1.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild index 3aff776cc8be..ff398aff9a35 100644 --- a/dev-libs/libgudev/libgudev-233-r1.ebuild +++ b/dev-libs/libgudev/libgudev-233-r1.ebuild @@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Needs multilib dev-util/umockdev diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild index 3202cd2a1316..364b24314774 100644 --- a/dev-libs/libgusb/libgusb-0.3.3.ebuild +++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild @@ -31,7 +31,7 @@ BDEPEND=" dev-util/gtk-doc ) vala? ( $(vala_depend) ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RESTRICT="!test? ( test )" diff --git a/dev-libs/libgusb/libgusb-0.3.4.ebuild b/dev-libs/libgusb/libgusb-0.3.4.ebuild index c38c2990d9ad..5ec7e1e7ab8e 100644 --- a/dev-libs/libgusb/libgusb-0.3.4.ebuild +++ b/dev-libs/libgusb/libgusb-0.3.4.ebuild @@ -35,7 +35,7 @@ BDEPEND=" dev-util/gtk-doc ) vala? ( $(vala_depend) ) - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RESTRICT="!test? ( test )" diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild index 8e59ad01fd19..24ca42f49f2e 100644 --- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild +++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild @@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} dev-util/glib-utils - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( dev-util/dbus-test-runner )" src_prepare() { diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild index 7dbbe27af996..068768b22c0f 100644 --- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild +++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild @@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}] >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} dev-util/glib-utils - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( dev-util/dbus-test-runner )" src_prepare() { diff --git a/dev-libs/libuv/libuv-1.35.0.ebuild b/dev-libs/libuv/libuv-1.35.0.ebuild index 351c2d1a3317..28641ca34383 100644 --- a/dev-libs/libuv/libuv-1.35.0.ebuild +++ b/dev-libs/libuv/libuv-1.35.0.ebuild @@ -15,7 +15,7 @@ IUSE="static-libs" RESTRICT="test" DEPEND="sys-devel/libtool - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { default diff --git a/dev-libs/libuv/libuv-1.37.0.ebuild b/dev-libs/libuv/libuv-1.37.0.ebuild index 351c2d1a3317..28641ca34383 100644 --- a/dev-libs/libuv/libuv-1.37.0.ebuild +++ b/dev-libs/libuv/libuv-1.37.0.ebuild @@ -15,7 +15,7 @@ IUSE="static-libs" RESTRICT="test" DEPEND="sys-devel/libtool - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { default diff --git a/dev-libs/libuv/libuv-1.38.0-r1.ebuild b/dev-libs/libuv/libuv-1.38.0-r1.ebuild index a1c26f2a3fdb..a9a8ca340c4c 100644 --- a/dev-libs/libuv/libuv-1.38.0-r1.ebuild +++ b/dev-libs/libuv/libuv-1.38.0-r1.ebuild @@ -16,7 +16,7 @@ RESTRICT="test" BDEPEND=" sys-devel/libtool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild index 20c92f0e53d8..6d626d10b334 100644 --- a/dev-libs/libuv/libuv-9999.ebuild +++ b/dev-libs/libuv/libuv-9999.ebuild @@ -16,7 +16,7 @@ RESTRICT="test" BDEPEND=" sys-devel/libtool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/dev-libs/nss/nss-3.51.1.ebuild b/dev-libs/nss/nss-3.51.1.ebuild index 61acd9960f9b..2c01890c4d30 100644 --- a/dev-libs/nss/nss-3.51.1.ebuild +++ b/dev-libs/nss/nss-3.51.1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND="${RDEPEND}" diff --git a/dev-libs/nss/nss-3.51.ebuild b/dev-libs/nss/nss-3.51.ebuild index f3bc78472679..25170cb99d38 100644 --- a/dev-libs/nss/nss-3.51.ebuild +++ b/dev-libs/nss/nss-3.51.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND="${RDEPEND}" diff --git a/dev-libs/nss/nss-3.52.1-r1.ebuild b/dev-libs/nss/nss-3.52.1-r1.ebuild index 0f733991c195..fcd9c6e73a80 100644 --- a/dev-libs/nss/nss-3.52.1-r1.ebuild +++ b/dev-libs/nss/nss-3.52.1-r1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND="${RDEPEND}" diff --git a/dev-libs/nss/nss-3.52.ebuild b/dev-libs/nss/nss-3.52.ebuild index 61acd9960f9b..2c01890c4d30 100644 --- a/dev-libs/nss/nss-3.52.ebuild +++ b/dev-libs/nss/nss-3.52.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND="${RDEPEND}" diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild index 3c3dc101011b..b47188055827 100644 --- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild +++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild @@ -20,7 +20,7 @@ IUSE="static-libs test" RESTRICT="!test? ( test )" BDEPEND=">=dev-libs/protobuf-3:0 - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild index ae60dda591b6..e56c2587e41d 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild @@ -15,7 +15,7 @@ IUSE="" RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { multilib_copy_sources diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild index 26b4cdecaef2..098294058563 100644 --- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild +++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild @@ -17,7 +17,7 @@ IUSE="" RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}] >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { multilib_copy_sources diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild index 6f0dbe661453..445630ad79d5 100644 --- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild +++ b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild @@ -16,7 +16,7 @@ IUSE="debug" RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" S=${WORKDIR}/${PN}-${PV/_/-} diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild index 9d375b492633..69fe77e2dca1 100644 --- a/dev-python/subunit/subunit-1.2.0-r1.ebuild +++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild @@ -27,7 +27,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( dev-python/fixtures[${PYTHON_USEDEP}] dev-python/hypothesis[${PYTHON_USEDEP}] diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild index 73b540892dab..65fdd6aed637 100644 --- a/dev-python/subunit/subunit-1.4.0.ebuild +++ b/dev-python/subunit/subunit-1.4.0.ebuild @@ -27,7 +27,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=virtual/pkgconfig-0-r1 test? ( dev-python/fixtures[${PYTHON_USEDEP}] dev-python/hypothesis[${PYTHON_USEDEP}] diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild index c4d61d96500e..edd87b90f8a2 100644 --- a/dev-util/umockdev/umockdev-0.11.3.ebuild +++ b/dev-util/umockdev/umockdev-0.11.3.ebuild @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Tests seem to hang forever diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild index 8b36fb5d0bb8..489c41974703 100644 --- a/dev-util/umockdev/umockdev-0.12.1.ebuild +++ b/dev-util/umockdev/umockdev-0.12.1.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} dev-libs/libgudev:=[${MULTILIB_USEDEP}] ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Tests seem to hang forever 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: diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild index ebaac26eb04b..5712c7277f6e 100644 --- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild +++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.35 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild index 8aab040241a5..2d74d7c50016 100644 --- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild +++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} sys-devel/gettext gnome-base/gnome-common >=dev-util/intltool-0.40 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 " diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild index 3ce81eeb82c7..5e004a473cb6 100644 --- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild +++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild @@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] tools? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" pkg_setup() { use tools && python-single-r1_pkg_setup diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild index 381c53c0dc07..f68e3014e302 100644 --- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild +++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.35 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { gnome2_src_prepare diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild index b5655355df53..972d7b6e6d2e 100644 --- a/gnome-base/librsvg/librsvg-2.40.21.ebuild +++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild @@ -32,7 +32,7 @@ DEPEND="${RDEPEND} dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig vala? ( $(vala_depend) ) " # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild index c75226331a14..b2767d69d408 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild @@ -149,7 +149,7 @@ RDEPEND=" DEPEND="${RDEPEND} v4l? ( sys-kernel/linux-headers ) >=sys-devel/gettext-0.18.1 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " MULTILIB_CHOST_TOOLS=( diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild index 21301b194b4a..8ccc0a909943 100644 --- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild @@ -17,7 +17,7 @@ IUSE="doc static-libs" BDEPEND="dev-util/gperf >=sys-devel/gettext-0.19.8 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild index 6341455b7147..b4896640b7bd 100644 --- a/media-libs/gd/gd-2.2.5-r2.ebuild +++ b/media-libs/gd/gd-2.2.5-r2.ebuild @@ -31,7 +31,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" S="${WORKDIR}/lib${P}" diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild index eca394038242..923a8390e6a0 100644 --- a/media-libs/gd/gd-2.3.0.ebuild +++ b/media-libs/gd/gd-2.3.0.ebuild @@ -27,7 +27,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" S="${WORKDIR}/lib${P}" diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild index 642bbd7fd66b..043fe837d5a8 100644 --- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild +++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild @@ -30,7 +30,7 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig nls? ( sys-devel/gettext ) " # gtk-doc-am to install API docs diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild index 5160237662ac..b93960892a1b 100644 --- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild +++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild @@ -30,7 +30,7 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig nls? ( sys-devel/gettext ) " diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild index 09128428d3f1..8e86f6eadb1b 100644 --- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild +++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild @@ -13,7 +13,7 @@ SLOT="0/24" # based on SONAME KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="static-libs" -DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]" +DEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.3.0-testBox.patch ) diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild index 1ad5cd159e96..087d0d390219 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +DEPEND="virtual/pkgconfig" # The provided tests are interactive only RESTRICT="test" diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild index 87f3c4bd930d..d45dbc32ba06 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( app-doc/doxygen ) " diff --git a/media-libs/libkate/libkate-0.4.1-r4.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild index 4bfadc43985f..21c8c8a455aa 100644 --- a/media-libs/libkate/libkate-0.4.1-r4.ebuild +++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild @@ -22,7 +22,7 @@ COMMON_DEPEND=" media-libs/libpng:0=[${MULTILIB_USEDEP}] " DEPEND="${COMMON_DEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig sys-devel/flex[${MULTILIB_USEDEP}] sys-devel/bison doc? ( app-doc/doxygen ) diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild index efbb61fc521d..ff6565c00a7e 100644 --- a/media-libs/libofa/libofa-0.9.3-r2.ebuild +++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +BDEPEND="virtual/pkgconfig" DEPEND=">=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild index 1616c1db31fd..cf8f4821192d 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild +++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild @@ -43,7 +43,7 @@ RDEPEND=" x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=" - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen ) X? ( x11-base/xorg-proto )" diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild index d929bc964083..d4abf353873b 100644 --- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild +++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND=">=dev-lua/LuaBitOp-1.0.1-r1[${MULTILIB_USEDEP}] >=dev-lua/luajson-1.1.1 >=dev-lua/luasocket-3.0_rc1-r2[${MULTILIB_USEDEP}]" DEPEND="app-arch/xz-utils - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" # tests fetch data from live websites RESTRICT="test" diff --git a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild index 17609a305216..71aeba6b75e8 100644 --- a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild +++ b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND="!<media-libs/quvi-0.4.0 nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} app-arch/xz-utils - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig nls? ( sys-devel/gettext )" PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch ) diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild index 9621818824e8..52aa7ea0a6e3 100644 --- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild +++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild @@ -17,7 +17,7 @@ SLOT="0/1" KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="cpu_flags_x86_sse openmp static-libs" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild index 8ad6c144f449..2e118f17e648 100644 --- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild +++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild @@ -17,7 +17,7 @@ RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}] >=media-libs/libkate-0.2.0[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( app-doc/doxygen )" src_prepare() { diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6.ebuild index 01a192c0cd71..58febaec1c0f 100644 --- a/media-libs/lilv/lilv-0.24.6.ebuild +++ b/media-libs/lilv/lilv-0.24.6.ebuild @@ -28,7 +28,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} ${PYTHON_DEPS} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-python/unittest2 ) " diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild index 683c36a14930..76c7ada5db8c 100644 --- a/media-libs/opencv/opencv-3.4.1-r7.ebuild +++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild @@ -99,7 +99,7 @@ RDEPEND=" webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva )" diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild index ba6201ddc539..19a98b7fe06d 100644 --- a/media-libs/opencv/opencv-4.1.2-r1.ebuild +++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild @@ -95,7 +95,7 @@ RDEPEND=" webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva )" diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild index 0265b3431315..87648f6a4298 100644 --- a/media-libs/opencv/opencv-4.1.2-r3.ebuild +++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild @@ -99,7 +99,7 @@ DEPEND="${RDEPEND} vaapi? ( x11-libs/libva )" BDEPEND=" java? ( >=virtual/jdk-1.6 ) - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" MULTILIB_WRAPPED_HEADERS=( /usr/include/opencv2/cvconfig.h diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild index a7351949fe4c..1fee7ea7fa6b 100644 --- a/media-libs/openexr/openexr-2.3.0.ebuild +++ b/media-libs/openexr/openexr-2.3.0.ebuild @@ -20,7 +20,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=sys-devel/autoconf-archive-2016.09.16 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680 diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild index 7ae3e405da27..9f2da54374af 100644 --- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild +++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild @@ -17,7 +17,7 @@ SLOT="0" IUSE="debug examples test" RESTRICT="!test? ( test )" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +BDEPEND="virtual/pkgconfig" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] ) diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild index ab6c68ecac5f..612b7bd335d9 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild @@ -34,7 +34,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " S="${WORKDIR}/${MY_P}" diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild index d097496927db..6dc5aea5a1d0 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild index 62c76eb773e4..c95bb5729a91 100644 --- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild +++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild @@ -20,7 +20,7 @@ RDEPEND=" media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " S=${WORKDIR}/${MY_P} diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild index 978f1152fdb4..a49b0cece2e8 100644 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild @@ -66,7 +66,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild index aa36989078b0..18753a605de9 100644 --- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild +++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.2.ebuild @@ -68,7 +68,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild index 89d6fc4e1e82..2ebdcaae9d40 100644 --- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild +++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild @@ -30,7 +30,7 @@ RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" DOCS="AUTHORS ChangeLog NEWS README TODO" diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild index 59d74664cf3a..494a305ed54f 100644 --- a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86" IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND=" dev-libs/glib:2[${MULTILIB_USEDEP}] diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild index 672fdd204679..a01ed47a190c 100644 --- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86" IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads" BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND=" dev-libs/glib:2[${MULTILIB_USEDEP}] diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild index 66e6bc724774..d0eac45a335b 100644 --- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild @@ -255,7 +255,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild index 91e2e0bddbf5..a5584f5368d4 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild @@ -272,7 +272,7 @@ RDEPEND="${RDEPEND} DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild index 3c7a5baf5cd6..4b9f49b43eb2 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild @@ -272,7 +272,7 @@ RDEPEND="${RDEPEND} DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild index d04a9e8a9bf8..954f3be64b52 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild @@ -283,7 +283,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=sys-devel/make-3.81 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild index 1cc832f8624a..7a4ae7399077 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild @@ -285,7 +285,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=sys-devel/make-3.81 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg/ffmpeg-4.2.3.ebuild b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild index 3b5a30510456..a61a062ccd21 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild @@ -290,7 +290,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=sys-devel/make-3.81 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 3c29683e04bc..feaa590acf9f 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -288,7 +288,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=sys-devel/make-3.81 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild index 31f4aa6bd7d5..4f884d393033 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild @@ -16,7 +16,7 @@ IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" REQUIRED_USE="sdlgfx? ( sdl )" BDEPEND=" - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND=" virtual/jpeg:0=[${MULTILIB_USEDEP}] diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild index 9e8cd0613072..e7f3715817f3 100644 --- a/media-video/vcdimager/vcdimager-2.0.1.ebuild +++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild @@ -20,7 +20,7 @@ RDEPEND=" xml? ( dev-libs/libxml2:2 ) " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " DOCS=( AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO ) diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild index 82887ed35e77..a86a94cf5aff 100644 --- a/net-dns/avahi/avahi-0.7-r2.ebuild +++ b/net-dns/avahi/avahi-0.7-r2.ebuild @@ -57,7 +57,7 @@ DEPEND=" doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND=" diff --git a/net-dns/avahi/avahi-0.7-r4.ebuild b/net-dns/avahi/avahi-0.7-r4.ebuild index 859083f44e02..a67f33d87346 100644 --- a/net-dns/avahi/avahi-0.7-r4.ebuild +++ b/net-dns/avahi/avahi-0.7-r4.ebuild @@ -69,7 +69,7 @@ BDEPEND=" doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) diff --git a/net-dns/avahi/avahi-0.7-r5.ebuild b/net-dns/avahi/avahi-0.7-r5.ebuild index 52fc47208afa..e9e84e60c397 100644 --- a/net-dns/avahi/avahi-0.7-r5.ebuild +++ b/net-dns/avahi/avahi-0.7-r5.ebuild @@ -69,7 +69,7 @@ BDEPEND=" doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild index 1f6f87be06d3..65fc2f8f3de2 100644 --- a/net-dns/avahi/avahi-0.8-r2.ebuild +++ b/net-dns/avahi/avahi-0.8-r2.ebuild @@ -68,7 +68,7 @@ BDEPEND=" doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild index e58e9fbfb911..3755ec84df2b 100644 --- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild +++ b/net-libs/glib-networking/glib-networking-2.60.4.ebuild @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild index 402238e5e1d0..1bc616f05a71 100644 --- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild +++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/net-libs/glib-networking/glib-networking-2.64.0.ebuild b/net-libs/glib-networking/glib-networking-2.64.0.ebuild index f4858b4fe70d..133f9d9bc174 100644 --- a/net-libs/glib-networking/glib-networking-2.64.0.ebuild +++ b/net-libs/glib-networking/glib-networking-2.64.0.ebuild @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/net-libs/glib-networking/glib-networking-2.64.2.ebuild b/net-libs/glib-networking/glib-networking-2.64.2.ebuild index f4858b4fe70d..133f9d9bc174 100644 --- a/net-libs/glib-networking/glib-networking-2.64.2.ebuild +++ b/net-libs/glib-networking/glib-networking-2.64.2.ebuild @@ -24,7 +24,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild index 04abee1942cc..a5f6b160c168 100644 --- a/net-libs/gssdp/gssdp-1.0.3.ebuild +++ b/net-libs/gssdp/gssdp-1.0.3.ebuild @@ -26,7 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.14 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/net-libs/gssdp/gssdp-1.2.2.ebuild b/net-libs/gssdp/gssdp-1.2.2.ebuild index d7d1dca09cee..4590776d84b4 100644 --- a/net-libs/gssdp/gssdp-1.2.2.ebuild +++ b/net-libs/gssdp/gssdp-1.2.2.ebuild @@ -25,7 +25,7 @@ DEPEND="${RDEPEND}" BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig vala? ( $(vala_depend) net-libs/libsoup:2.4[vala] diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild index 756607d9a69e..dccc1aa812e6 100644 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " # The only existing test is broken diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild index 68eefd20d9ac..c8dee50645bb 100644 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " # The only existing test is broken diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild index a9bc2db8bed5..21d5109ef959 100644 --- a/net-libs/gupnp/gupnp-1.0.4.ebuild +++ b/net-libs/gupnp/gupnp-1.0.4.ebuild @@ -38,7 +38,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild index 5f5d8143a021..b73234a91a5a 100644 --- a/net-libs/gupnp/gupnp-1.2.2.ebuild +++ b/net-libs/gupnp/gupnp-1.2.2.ebuild @@ -37,7 +37,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.2 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( $(vala_depend) >=net-libs/gssdp-1.1.3:0[vala] diff --git a/net-libs/libnice/libnice-0.1.13.ebuild b/net-libs/libnice/libnice-0.1.13.ebuild index ac0b799fafc3..bca6e1f8abfd 100644 --- a/net-libs/libnice/libnice-0.1.13.ebuild +++ b/net-libs/libnice/libnice-0.1.13.ebuild @@ -20,7 +20,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-util/gtk-doc-am - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " # Many tests fail from time to time, for example: diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild index 0ee77232e83e..9c8fb774645b 100644 --- a/net-libs/libnice/libnice-0.1.15.ebuild +++ b/net-libs/libnice/libnice-0.1.15.ebuild @@ -25,7 +25,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/50 diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild index 47631759bbe8..89890d0941fb 100644 --- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild @@ -28,7 +28,7 @@ DEPEND=" ${RDEPEND} sys-devel/flex virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + dbus? ( virtual/pkgconfig ) " S=${WORKDIR}/${PN}-${P/_} diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild index 0f687314ce41..eb184a07121e 100644 --- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild @@ -29,7 +29,7 @@ DEPEND=" ${RDEPEND} sys-devel/flex virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + dbus? ( virtual/pkgconfig ) " S=${WORKDIR}/${PN}-${P/_} diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild index c07bb80e0971..4775c7d9c5b4 100644 --- a/net-libs/libpcap/libpcap-1.9.1.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1.ebuild @@ -27,7 +27,7 @@ DEPEND=" ${RDEPEND} sys-devel/flex virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + dbus? ( virtual/pkgconfig ) " S=${WORKDIR}/${PN}-${P/_} diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index 6ff5bf8f081d..5ad21ee77a4e 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -27,7 +27,7 @@ DEPEND=" ${RDEPEND} sys-devel/flex virtual/yacc - dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + dbus? ( virtual/pkgconfig ) " PATCHES=( diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild index 735c770babe5..ea1e91bfaa25 100644 --- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild +++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild @@ -18,7 +18,7 @@ IUSE="gnome kde mono networkmanager spidermonkey test webkit" RESTRICT="!test? ( test )" BDEPEND=" - virtual/pkgconfig:0[${MULTILIB_USEDEP}] + virtual/pkgconfig " DEPEND=" gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild index 46a37bc45006..d55643d5a8f3 100644 --- a/net-libs/libsoup/libsoup-2.62.3.ebuild +++ b/net-libs/libsoup/libsoup-2.62.3.ebuild @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.20 >=dev-util/intltool-0.35 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] ) vala? ( $(vala_depend) ) " diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild index a43fd5fe6a7d..c26cf2bfb52c 100644 --- a/net-libs/libsoup/libsoup-2.66.4.ebuild +++ b/net-libs/libsoup/libsoup-2.66.4.ebuild @@ -35,7 +35,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig vala? ( $(vala_depend) ) " # test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild index 4edf27d7e113..9d39df972428 100644 --- a/net-libs/libsoup/libsoup-2.70.0.ebuild +++ b/net-libs/libsoup/libsoup-2.70.0.ebuild @@ -38,7 +38,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig vala? ( $(vala_depend) ) " # test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild index fe70ea837553..632193139a10 100644 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild @@ -20,7 +20,7 @@ DEPEND="${RDEPEND} elibc_musl? ( sys-libs/queue-standalone )" BDEPEND=" app-arch/xz-utils - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild index 46c7e4093d96..b10ca76d3ce2 100644 --- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild +++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild @@ -20,7 +20,7 @@ DEPEND="${RDEPEND} elibc_musl? ( sys-libs/queue-standalone )" BDEPEND=" app-arch/xz-utils - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild index 6e4e2fc96974..fca4daa7349d 100644 --- a/net-libs/neon/neon-0.30.2.ebuild +++ b/net-libs/neon/neon-0.30.2.ebuild @@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" MULTILIB_CHOST_TOOLS=( /usr/bin/neon-config diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild index f038f33ba546..a13f5f590f94 100644 --- a/net-libs/neon/neon-0.31.0.ebuild +++ b/net-libs/neon/neon-0.31.0.ebuild @@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" MULTILIB_CHOST_TOOLS=( /usr/bin/neon-config diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild index 11cf88702f22..d3724b859dbb 100644 --- a/net-libs/neon/neon-0.31.1.ebuild +++ b/net-libs/neon/neon-0.31.1.ebuild @@ -33,7 +33,7 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) ) zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" MULTILIB_CHOST_TOOLS=( /usr/bin/neon-config diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild index 541ab5c65511..76001caf195d 100644 --- a/net-libs/rest/rest-0.8.1.ebuild +++ b/net-libs/rest/rest-0.8.1.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) " diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild index 3f2075b469f5..c7e4fe4d0cab 100644 --- a/net-misc/curl/curl-7.68.0.ebuild +++ b/net-misc/curl/curl-7.68.0.ebuild @@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) # fbopenssl $(use_with spnego) DEPEND="${RDEPEND}" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +BDEPEND="virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.69.1.ebuild index cdec6acd02b4..f3eb5376e6a1 100644 --- a/net-misc/curl/curl-7.69.1.ebuild +++ b/net-misc/curl/curl-7.69.1.ebuild @@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) # fbopenssl $(use_with spnego) DEPEND="${RDEPEND}" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +BDEPEND="virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.70.0-r1.ebuild b/net-misc/curl/curl-7.70.0-r1.ebuild index 7b751a4ef1c8..20e90a029c51 100644 --- a/net-misc/curl/curl-7.70.0-r1.ebuild +++ b/net-misc/curl/curl-7.70.0-r1.ebuild @@ -68,7 +68,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) # fbopenssl $(use_with spnego) DEPEND="${RDEPEND}" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +BDEPEND="virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild index 05cb34606ead..453af4ab92ad 100644 --- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild @@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-lang/perl diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild index 0a6bc3c37e28..070ae215d272 100644 --- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.6.ebuild @@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-lang/perl diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12.ebuild index 1a1c31156f67..81c6f70ed900 100644 --- a/net-misc/networkmanager/networkmanager-1.20.12.ebuild +++ b/net-misc/networkmanager/networkmanager-1.20.12.ebuild @@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-lang/perl diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.22.14.ebuild index 7a59df42aa19..c7d5376f75d7 100644 --- a/net-misc/networkmanager/networkmanager-1.22.14.ebuild +++ b/net-misc/networkmanager/networkmanager-1.22.14.ebuild @@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-lang/perl diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2.ebuild index 0082e77dbf99..91ce0e3aeda7 100644 --- a/net-misc/networkmanager/networkmanager-1.24.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.24.2.ebuild @@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-lang/perl diff --git a/net-print/cups/cups-2.2.13.ebuild b/net-print/cups/cups-2.2.13.ebuild index efd23a0698bd..5dbd96f3d264 100644 --- a/net-print/cups/cups-2.2.13.ebuild +++ b/net-print/cups/cups-2.2.13.ebuild @@ -57,7 +57,7 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" acct-group/lp - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND="${CDEPEND} diff --git a/net-print/cups/cups-2.3.1.ebuild b/net-print/cups/cups-2.3.1.ebuild index 241cb46e4268..2b4ffcdbf046 100644 --- a/net-print/cups/cups-2.3.1.ebuild +++ b/net-print/cups/cups-2.3.1.ebuild @@ -56,7 +56,7 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" acct-group/lp - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND="${CDEPEND} diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild index 805de00b9089..5db9ba18dbbf 100644 --- a/net-print/cups/cups-2.3.3-r1.ebuild +++ b/net-print/cups/cups-2.3.3-r1.ebuild @@ -57,7 +57,7 @@ DEPEND="${CDEPEND}" BDEPEND=" acct-group/lp acct-group/lpadmin - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND="${CDEPEND} diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 69919acb60a3..e037ec1076ca 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -57,7 +57,7 @@ DEPEND="${CDEPEND}" BDEPEND=" acct-group/lp acct-group/lpadmin - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " RDEPEND="${CDEPEND} diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild index 4ede34cd9338..e645237e888e 100644 --- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild +++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild @@ -22,7 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/intltool-0.28 gnome-base/gnome-common - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild index 6eb8bb41080b..c3630b9ccaa1 100644 --- a/sys-apps/hwloc/hwloc-1.11.10.ebuild +++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) DOCS=( AUTHORS NEWS README VERSION ) diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild index 5ea06899c88e..6d4a1f6d1025 100644 --- a/sys-apps/hwloc/hwloc-1.11.13.ebuild +++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) DOCS=( AUTHORS NEWS README VERSION ) diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild index 48b8f6e46a3a..a447cda89521 100644 --- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild +++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" DOCS=( AUTHORS NEWS README VERSION ) diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild index b70355bd1d6a..c412bfedcf48 100644 --- a/sys-apps/hwloc/hwloc-2.0.4.ebuild +++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild @@ -30,7 +30,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) DOCS=( AUTHORS NEWS README VERSION ) diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild index 9a3839b7e14d..d996e67548ae 100644 --- a/sys-apps/hwloc/hwloc-2.1.0.ebuild +++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) DOCS=( AUTHORS NEWS README VERSION ) diff --git a/sys-apps/systemd/systemd-245-r5.ebuild b/sys-apps/systemd/systemd-245-r5.ebuild index 46c7844250b6..6e765fe563b5 100644 --- a/sys-apps/systemd/systemd-245-r5.ebuild +++ b/sys-apps/systemd/systemd-245-r5.ebuild @@ -131,7 +131,7 @@ BDEPEND=" >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 diff --git a/sys-auth/libnss-compat/libnss-compat-1.2.ebuild b/sys-auth/libnss-compat/libnss-compat-1.2.ebuild index d5d005a22e54..ea92eb8bdf8d 100644 --- a/sys-auth/libnss-compat/libnss-compat-1.2.ebuild +++ b/sys-auth/libnss-compat/libnss-compat-1.2.ebuild @@ -20,7 +20,7 @@ RDEPEND=" !>=sys-libs/glibc-2.27 " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " S=${WORKDIR}/libnss_compat-libnss_compat-${PV} diff --git a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild index 859bbcea81f5..d067904370e6 100644 --- a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild +++ b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild @@ -19,7 +19,7 @@ RDEPEND=" !<sys-libs/glibc-2.26 " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " S=${WORKDIR}/libnss_nis-${PV} diff --git a/sys-auth/libnss-nis/libnss-nis-3.1.ebuild b/sys-auth/libnss-nis/libnss-nis-3.1.ebuild index 9ff224b8b42d..ef828c2dd01f 100644 --- a/sys-auth/libnss-nis/libnss-nis-3.1.ebuild +++ b/sys-auth/libnss-nis/libnss-nis-3.1.ebuild @@ -19,7 +19,7 @@ RDEPEND=" !<sys-libs/glibc-2.26 " DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig " S=${WORKDIR}/libnss_nis-${PV} diff --git a/sys-fs/udev/udev-245.5.ebuild b/sys-fs/udev/udev-245.5.ebuild index f8ba208e8aef..4b884c8001b5 100644 --- a/sys-fs/udev/udev-245.5.ebuild +++ b/sys-fs/udev/udev-245.5.ebuild @@ -34,7 +34,7 @@ BDEPEND=" dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets diff --git a/sys-fs/udev/udev-245.ebuild b/sys-fs/udev/udev-245.ebuild index 4cdaa936a654..d5fc3ed104d5 100644 --- a/sys-fs/udev/udev-245.ebuild +++ b/sys-fs/udev/udev-245.ebuild @@ -29,7 +29,7 @@ BDEPEND=" dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index f8ba208e8aef..4b884c8001b5 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -34,7 +34,7 @@ BDEPEND=" dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild index 33e512b651a3..86de2a87b7b9 100644 --- a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild +++ b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -BDEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]" +BDEPEND="virtual/pkgconfig" DEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild index 74fc7dac605f..81493f7f5dc9 100644 --- a/sys-libs/libomp/libomp-10.0.0.ebuild +++ b/sys-libs/libomp/libomp-10.0.0.ebuild @@ -32,7 +32,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/libomp/libomp-10.0.1.9999.ebuild b/sys-libs/libomp/libomp-10.0.1.9999.ebuild index aa0be13c4ba5..7277ff84d5c8 100644 --- a/sys-libs/libomp/libomp-10.0.1.9999.ebuild +++ b/sys-libs/libomp/libomp-10.0.1.9999.ebuild @@ -32,7 +32,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild index aa0be13c4ba5..7277ff84d5c8 100644 --- a/sys-libs/libomp/libomp-10.0.1_rc1.ebuild +++ b/sys-libs/libomp/libomp-10.0.1_rc1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild index aa0be13c4ba5..7277ff84d5c8 100644 --- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild @@ -32,7 +32,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/libomp/libomp-8.0.1.ebuild b/sys-libs/libomp/libomp-8.0.1.ebuild index add0d7125ed6..0cb1ed1a721c 100644 --- a/sys-libs/libomp/libomp-8.0.1.ebuild +++ b/sys-libs/libomp/libomp-8.0.1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND} dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/libomp/libomp-9.0.1.ebuild b/sys-libs/libomp/libomp-9.0.1.ebuild index f8e49887b6aa..256f61807d3a 100644 --- a/sys-libs/libomp/libomp-9.0.1.ebuild +++ b/sys-libs/libomp/libomp-9.0.1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" # - sys-devel/clang provides the compiler to run tests DEPEND="${RDEPEND}" BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + offload? ( virtual/pkgconfig ) test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') >=sys-devel/clang-6 diff --git a/sys-libs/pam/pam-1.3.1-r2.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild index 26873bc6edcf..560c09a3fe16 100644 --- a/sys-libs/pam/pam-1.3.1-r2.ebuild +++ b/sys-libs/pam/pam-1.3.1-r2.ebuild @@ -21,7 +21,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt sys-devel/flex sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" DEPEND=" virtual/libcrypt:=[${MULTILIB_USEDEP}] diff --git a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild index 97a36d6399c7..d4103fb8fcda 100644 --- a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild +++ b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild @@ -23,7 +23,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt sys-devel/flex sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" DEPEND=" virtual/libcrypt:=[${MULTILIB_USEDEP}] diff --git a/sys-libs/tevent/tevent-0.10.2.ebuild b/sys-libs/tevent/tevent-0.10.2.ebuild index a5b491901fc3..0d5e3cf69422 100644 --- a/sys-libs/tevent/tevent-0.10.2.ebuild +++ b/sys-libs/tevent/tevent-0.10.2.ebuild @@ -21,7 +21,7 @@ RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig elibc_glibc? ( net-libs/libtirpc[${MULTILIB_USEDEP}] || ( diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild index 4e81883be6ca..d409d7878f89 100644 --- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild @@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig !aqua? ( x11-base/xorg-proto ) test? ( x11-themes/hicolor-icon-theme diff --git a/x11-libs/gtk+/gtk+-3.24.16.ebuild b/x11-libs/gtk+/gtk+-3.24.16.ebuild index d477b0005f60..ed300aa27ff8 100644 --- a/x11-libs/gtk+/gtk+-3.24.16.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.16.ebuild @@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND} gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc diff --git a/x11-libs/gtk+/gtk+-3.24.18.ebuild b/x11-libs/gtk+/gtk+-3.24.18.ebuild index ddb924517c94..476dca8c34fd 100644 --- a/x11-libs/gtk+/gtk+-3.24.18.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.18.ebuild @@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND} gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild index ddb924517c94..476dca8c34fd 100644 --- a/x11-libs/gtk+/gtk+-3.24.20.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild @@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND} gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild index e37df52431b7..b8b0a33c60ab 100644 --- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild @@ -26,7 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/glib-utils >=sys-devel/autoconf-archive-2014.02.28 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild index 96d5811c15c3..e00510e6dd7e 100644 --- a/x11-libs/pango/pango-1.42.4-r2.ebuild +++ b/x11-libs/pango/pango-1.42.4-r2.ebuild @@ -34,7 +34,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig test? ( media-fonts/cantarell ) X? ( x11-base/xorg-proto ) !<=sys-devel/autoconf-2.63:2.5 diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild index 7100e6c4679d..2f4853c526e9 100644 --- a/x11-libs/pango/pango-1.44.7.ebuild +++ b/x11-libs/pango/pango-1.44.7.ebuild @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} x11-base/xorg-proto " BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.2 diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild index bd2fc9d88d55..85369585a3b0 100644 --- a/x11-libs/tslib/tslib-1.21.ebuild +++ b/x11-libs/tslib/tslib-1.21.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x8 IUSE="evdev sdl uinput" BDEPEND=" - evdev? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + evdev? ( virtual/pkgconfig ) " DEPEND=" evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] ) diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild index c7da89e676d4..f2f9f516fd36 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild @@ -43,7 +43,7 @@ RDEPEND=" )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-base/xorg-proto )" diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild index e081aaad649e..dbac81cd1d5a 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild @@ -51,7 +51,7 @@ RDEPEND=" )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-base/xorg-proto )" diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild index d6c1e1ec1a85..b6b210a9e649 100644 --- a/x11-misc/colord/colord-1.3.5.ebuild +++ b/x11-misc/colord/colord-1.3.5.ebuild @@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( $(vala_depend) ) " diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild index 1e601e9dc3da..84bd547ce38e 100644 --- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild +++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild @@ -25,7 +25,7 @@ PDEPEND="themes? ( x11-themes/murrine-themes )" DEPEND="${RDEPEND} >=dev-util/intltool-0.37.1 sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + virtual/pkgconfig" DOCS="AUTHORS ChangeLog NEWS TODO" diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild index 1e562329a679..d125a7b23890 100644 --- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild +++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild @@ -22,7 +22,7 @@ RDEPEND=" " DEPEND="${RDEPEND} >=dev-util/intltool-0.31 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + virtual/pkgconfig " src_prepare() { |