From 487af5392662a736627157cdbe6e79ee6cd8b964 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 30 May 2020 22:44:48 -0400 Subject: [PATCH] virtual/pkgconfig: remove multilib USE flags Signed-off-by: Mike Gilbert --- virtual/pkgconfig/pkgconfig-0-r1.ebuild | 17 ----------------- .../{pkgconfig-1.ebuild => pkgconfig-2.ebuild} | 8 +++----- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 virtual/pkgconfig/pkgconfig-0-r1.ebuild rename virtual/pkgconfig/{pkgconfig-1.ebuild => pkgconfig-2.ebuild} (67%) diff --git a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild deleted file mode 100644 index 1b6aaccd97eb9..0000000000000 --- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib-build - -DESCRIPTION="Virtual for the pkg-config implementation" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - || ( - >=dev-util/pkgconfig-0.28-r1[${MULTILIB_USEDEP}] - >=dev-util/pkgconf-0.9.12[pkg-config,${MULTILIB_USEDEP}] - >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,${MULTILIB_USEDEP}] - )" diff --git a/virtual/pkgconfig/pkgconfig-1.ebuild b/virtual/pkgconfig/pkgconfig-2.ebuild similarity index 67% rename from virtual/pkgconfig/pkgconfig-1.ebuild rename to virtual/pkgconfig/pkgconfig-2.ebuild index 504126fcc1045..cfb5268dfbf78 100644 --- a/virtual/pkgconfig/pkgconfig-1.ebuild +++ b/virtual/pkgconfig/pkgconfig-2.ebuild @@ -3,15 +3,13 @@ EAPI=7 -inherit multilib-build - DESCRIPTION="Virtual for the pkg-config implementation" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" || ( - >=dev-util/pkgconf-1.3.7[pkg-config,${MULTILIB_USEDEP}] - >=dev-util/pkgconfig-0.29.2[${MULTILIB_USEDEP}] - >=dev-util/pkgconfig-openbsd-20130507-r2[pkg-config,${MULTILIB_USEDEP}] + >=dev-util/pkgconf-1.3.7[pkg-config] + >=dev-util/pkgconfig-0.29.2 + >=dev-util/pkgconfig-openbsd-20130507-r2[pkg-config] )"