3 files changed, 24 insertions, 18 deletions
diff --git a/virtual/pkgconfig/metadata.xml b/virtual/pkgconfig/metadata.xml
index 6bccc2e15269..1012c646622d 100644
--- a/virtual/pkgconfig/metadata.xml
+++ b/virtual/pkgconfig/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<herd>embedded</herd>
-	<origin>kit-fixups</origin>
+<maintainer type="project">
+	<email>freedesktop-bugs@gentoo.org</email>
+	<name>Gentoo Freedesktop Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild
deleted file mode 100644
index dd8d696dcd67..000000000000
--- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for the pkg-config implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-RDEPEND="dev-util/pkgconf[pkg-config,${MULTILIB_USEDEP}]"
diff --git a/virtual/pkgconfig/pkgconfig-2.ebuild b/virtual/pkgconfig/pkgconfig-2.ebuild
new file mode 100644
index 000000000000..8f2feeed5127
--- /dev/null
+++ b/virtual/pkgconfig/pkgconfig-2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for the pkg-config implementation"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	|| (
+		>=dev-util/pkgconf-1.3.7[pkg-config]
+		>=dev-util/pkgconfig-0.29.2
+		>=dev-util/pkgconfig-openbsd-20130507-r2[pkg-config]
+	)"