Remove MULTILIB_USEDEP from all virtual/pkgconfig dependencies

Bug: https://bugs.gentoo.org/723112 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
2026-08-25 07:08:13 -07:00 · 2020-05-30 22:42:45 -04:00
parent 6d9bf9e118
commit 5008bbcb72
177 changed files with 179 additions and 187 deletions
--- 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 )
 "

--- 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 )
 "

--- 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=(
--- 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=(
--- 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=(
--- 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} ) )"

--- 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} ) )"

--- 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} ) )"

--- 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}]
--- 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}]
--- 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}]
--- 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
 "
--- 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
 "
--- 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
--- 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() {
--- 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
--- 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
--- 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
 "

--- 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
 "

--- 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
--- 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
--- 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

--- 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

--- 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}]
--- 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() {
--- 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() {
--- 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=(
--- 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() {
--- 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}]
--- 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 )"

--- 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 )"

--- 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
--- 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 )"
--- 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 )"
--- 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() {
--- 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() {
--- 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
--- 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
--- 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() {
--- 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() {
--- 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}"

--- 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}"

--- 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}"

--- 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}"

--- 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}"

--- 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
--- 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
--- 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/_/-}

--- 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}]
--- 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}]
--- 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
--- 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
--- 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.
--- 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:
--- 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:
--- 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}"
--- 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
 "

--- 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
--- 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
--- 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
--- 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=(
--- 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]
--- 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}"

--- 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}"

--- 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
--- 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 )
 "

--- 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 )

--- 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"
--- 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 )
 "

--- 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 )
--- 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}"

--- 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 )"
--- 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"
--- 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 )
--- 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}"

--- 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() {
--- 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 )
 "
--- 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 )"
--- 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 )"
--- 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
--- 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
--- 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}] )
--- 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}"
--- 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}"
--- 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}
--- 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}"
--- 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}"
--- 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"
--- 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}]
--- 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}]
--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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}]
--- 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 )
--- 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="
--- a/Show More
+++ b/Show More