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 --- net-libs/glib-networking/glib-networking-2.60.4.ebuild | 2 +- net-libs/glib-networking/glib-networking-2.62.3.ebuild | 2 +- net-libs/glib-networking/glib-networking-2.64.0.ebuild | 2 +- net-libs/glib-networking/glib-networking-2.64.2.ebuild | 2 +- net-libs/gssdp/gssdp-1.0.3.ebuild | 2 +- net-libs/gssdp/gssdp-1.2.2.ebuild | 2 +- net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 2 +- net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild | 2 +- net-libs/gupnp/gupnp-1.0.4.ebuild | 2 +- net-libs/gupnp/gupnp-1.2.2.ebuild | 2 +- net-libs/libnice/libnice-0.1.13.ebuild | 2 +- net-libs/libnice/libnice-0.1.15.ebuild | 2 +- net-libs/libpcap/libpcap-1.9.1-r2.ebuild | 2 +- net-libs/libpcap/libpcap-1.9.1-r3.ebuild | 2 +- net-libs/libpcap/libpcap-1.9.1.ebuild | 2 +- net-libs/libpcap/libpcap-9999.ebuild | 2 +- net-libs/libproxy/libproxy-0.4.15-r1.ebuild | 2 +- net-libs/libsoup/libsoup-2.62.3.ebuild | 2 +- net-libs/libsoup/libsoup-2.66.4.ebuild | 2 +- net-libs/libsoup/libsoup-2.70.0.ebuild | 2 +- net-libs/libtirpc/libtirpc-1.2.5.ebuild | 2 +- net-libs/libtirpc/libtirpc-1.2.6.ebuild | 2 +- net-libs/neon/neon-0.30.2.ebuild | 2 +- net-libs/neon/neon-0.31.0.ebuild | 2 +- net-libs/neon/neon-0.31.1.ebuild | 2 +- net-libs/rest/rest-0.8.1.ebuild | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) (limited to 'net-libs') 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}] ) " -- cgit v1.2.3-65-gdbad