From 5008bbcb72fc5e5889b0ab9f94aae16fc3698a57 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 30 May 2020 22:42:45 -0400 Subject: Remove MULTILIB_USEDEP from all virtual/pkgconfig dependencies Bug: https://bugs.gentoo.org/723112 Signed-off-by: Mike Gilbert --- x11-libs/gtk+/gtk+-2.24.32-r1.ebuild | 2 +- x11-libs/gtk+/gtk+-3.24.16.ebuild | 2 +- x11-libs/gtk+/gtk+-3.24.18.ebuild | 2 +- x11-libs/gtk+/gtk+-3.24.20.ebuild | 2 +- x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +- x11-libs/pango/pango-1.42.4-r2.ebuild | 2 +- x11-libs/pango/pango-1.44.7.ebuild | 2 +- x11-libs/tslib/tslib-1.21.ebuild | 2 +- x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild | 2 +- x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'x11-libs') 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 )" -- cgit v1.2.3-65-gdbad