summaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
Diffstat (limited to 'virtual')
-rw-r--r--virtual/dist-kernel/dist-kernel-5.10.10.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.10.4.ebuild)0
-rw-r--r--virtual/dist-kernel/dist-kernel-5.10.11.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.10.5.ebuild)0
-rw-r--r--virtual/dist-kernel/dist-kernel-5.10.7.ebuild19
-rw-r--r--virtual/dist-kernel/dist-kernel-5.10.8.ebuild19
-rw-r--r--virtual/dist-kernel/dist-kernel-5.10.9.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.10.6.ebuild)0
-rw-r--r--virtual/dist-kernel/dist-kernel-5.4.88.ebuild2
-rw-r--r--virtual/dist-kernel/dist-kernel-5.4.90.ebuild19
-rw-r--r--virtual/dist-kernel/dist-kernel-5.4.91.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.4.86.ebuild)0
-rw-r--r--virtual/dist-kernel/dist-kernel-5.4.92.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.4.87.ebuild)0
-rw-r--r--virtual/dist-kernel/dist-kernel-5.4.93.ebuild (renamed from virtual/dist-kernel/dist-kernel-5.4.89.ebuild)0
-rw-r--r--virtual/imagemagick-tools/metadata.xml5
-rw-r--r--virtual/linux-sources/ChangeLog10
-rw-r--r--virtual/linux-sources/linux-sources-2.6.ebuild43
-rw-r--r--virtual/linux-sources/linux-sources-3-r9.ebuild35
-rw-r--r--virtual/linux-sources/metadata.xml9
-rw-r--r--virtual/mailx/mailx-1-r1.ebuild17
-rw-r--r--virtual/mailx/mailx-1.ebuild13
-rw-r--r--virtual/mailx/metadata.xml9
-rw-r--r--virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild (renamed from virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild)4
-rw-r--r--virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild15
-rw-r--r--virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild17
-rw-r--r--virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild (renamed from virtual/perl-Safe/perl-Safe-2.410.0.ebuild)2
-rw-r--r--virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild15
-rw-r--r--virtual/pkgconfig/metadata.xml12
-rw-r--r--virtual/pkgconfig/pkgconfig-0-r1.ebuild15
-rw-r--r--virtual/pkgconfig/pkgconfig-2.ebuild15
-rw-r--r--virtual/service-manager/service-manager-0.ebuild2
27 files changed, 142 insertions, 155 deletions
diff --git a/virtual/dist-kernel/dist-kernel-5.10.4.ebuild b/virtual/dist-kernel/dist-kernel-5.10.10.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.4.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.10.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.10.5.ebuild b/virtual/dist-kernel/dist-kernel-5.10.11.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.5.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.11.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.10.7.ebuild b/virtual/dist-kernel/dist-kernel-5.10.7.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
- || (
- ~sys-kernel/gentoo-kernel-${PV}
- ~sys-kernel/gentoo-kernel-bin-${PV}
- ~sys-kernel/vanilla-kernel-${PV}
- )"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.8.ebuild b/virtual/dist-kernel/dist-kernel-5.10.8.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
- || (
- ~sys-kernel/gentoo-kernel-${PV}
- ~sys-kernel/gentoo-kernel-bin-${PV}
- ~sys-kernel/vanilla-kernel-${PV}
- )"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.6.ebuild b/virtual/dist-kernel/dist-kernel-5.10.9.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.6.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.9.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.88.ebuild b/virtual/dist-kernel/dist-kernel-5.4.88.ebuild
index 11d6573ded7c..01e3981ccec8 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.88.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.88.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE=""
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
RDEPEND="
|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.90.ebuild b/virtual/dist-kernel/dist-kernel-5.4.90.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.90.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
- || (
- ~sys-kernel/gentoo-kernel-${PV}
- ~sys-kernel/gentoo-kernel-bin-${PV}
- ~sys-kernel/vanilla-kernel-${PV}
- )"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.86.ebuild b/virtual/dist-kernel/dist-kernel-5.4.91.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.86.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.91.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.87.ebuild b/virtual/dist-kernel/dist-kernel-5.4.92.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.87.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.92.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.89.ebuild b/virtual/dist-kernel/dist-kernel-5.4.93.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.89.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.93.ebuild
diff --git a/virtual/imagemagick-tools/metadata.xml b/virtual/imagemagick-tools/metadata.xml
index 3d4429370ed8..61091d555144 100644
--- a/virtual/imagemagick-tools/metadata.xml
+++ b/virtual/imagemagick-tools/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>codec@gentoo.org</email>
+ <name>Gentoo Codec Project</name>
+ </maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/virtual/linux-sources/ChangeLog b/virtual/linux-sources/ChangeLog
new file mode 100644
index 000000000000..a8e1ed02e819
--- /dev/null
+++ b/virtual/linux-sources/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for virtual/linux-sources
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*linux-sources-0 (31 Aug 2011)
+
+ 31 Aug 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+ +linux-sources-0.ebuild, -linux-sources-2.6.ebuild:
+ add support 3.0
+
diff --git a/virtual/linux-sources/linux-sources-2.6.ebuild b/virtual/linux-sources/linux-sources-2.6.ebuild
deleted file mode 100644
index b7e26409ae89..000000000000
--- a/virtual/linux-sources/linux-sources-2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Virtual for Linux kernel sources"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE="hardened"
-
-DEPEND=""
-RDEPEND="|| (
- hardened? ( >=sys-kernel/hardened-sources-2.6 )
- >=sys-kernel/dummy-sources-4.5.3
- >=sys-kernel/debian-sources-2.6
- >=sys-kernel/debian-sources-lts-2.6
- >=sys-kernel/aufs-sources-2.6
- >=sys-kernel/gentoo-sources-2.6
- >=sys-kernel/cell-sources-2.6
- >=sys-kernel/centos7plus-sources-2.6
- >=sys-kernel/ck-sources-2.6
- >=sys-kernel/git-sources-2.6
- >=sys-kernel/hardened-sources-2.6
- >=sys-kernel/mips-sources-2.6
- >=sys-kernel/mm-sources-2.6
- >=sys-kernel/openvz-rhel6-stable-2.6
- >=sys-kernel/openvz-rhel6-test-2.6
- >=sys-kernel/openvz-sources-2.6
- >=sys-kernel/pf-sources-2.6
- >=sys-kernel/rhel7-sources-2.6
- >=sys-kernel/sysrescue-std-sources-2.6
- >=sys-kernel/tuxonice-sources-2.6
- >=sys-kernel/ubuntu-sources-2.6
- >=sys-kernel/usermode-sources-2.6
- >=sys-kernel/vanilla-sources-2.6
- >=sys-kernel/xbox-sources-2.6
- >=sys-kernel/xen-sources-2.6
- >=sys-kernel/zen-sources-2.6
- sys-kernel/vserver-sources
- )"
diff --git a/virtual/linux-sources/linux-sources-3-r9.ebuild b/virtual/linux-sources/linux-sources-3-r9.ebuild
new file mode 100644
index 000000000000..d0570cd53cfd
--- /dev/null
+++ b/virtual/linux-sources/linux-sources-3-r9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/linux-sources-1.ebuild,v 1.4 2014/04/03 01:35:05 tomwij Exp $
+
+EAPI=2
+
+DESCRIPTION="Virtual for Linux kernel sources"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="|| (
+ sys-kernel/calculate-sources
+ sys-kernel/gentoo-sources
+ sys-kernel/vanilla-sources
+ sys-kernel/ck-sources
+ sys-kernel/git-sources
+ sys-kernel/hardened-sources
+ sys-kernel/mips-sources
+ sys-kernel/openvz-sources
+ sys-kernel/pf-sources
+ sys-kernel/rsbac-sources
+ sys-kernel/rt-sources
+ sys-kernel/tuxonice-sources
+ sys-kernel/usermode-sources
+ sys-kernel/vserver-sources
+ sys-kernel/xbox-sources
+ sys-kernel/zen-sources
+ sys-kernel/aufs-sources
+ sys-kernel/raspberrypi-sources
+ )"
diff --git a/virtual/linux-sources/metadata.xml b/virtual/linux-sources/metadata.xml
deleted file mode 100644
index 7fa6422eed58..000000000000
--- a/virtual/linux-sources/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kernel-misc</herd>
-<maintainer>
- <email>ulm@gentoo.org</email>
-</maintainer>
- <origin>kit-fixups</origin>
-</pkgmetadata>
diff --git a/virtual/mailx/mailx-1-r1.ebuild b/virtual/mailx/mailx-1-r1.ebuild
new file mode 100644
index 000000000000..5d82272f8399
--- /dev/null
+++ b/virtual/mailx/mailx-1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mailx/mailx-1.ebuild,v 1.2 2014/05/13 06:37:03 naota Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for mail implementations"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-mail/mailutils"
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
deleted file mode 100644
index 50b9d061035e..000000000000
--- a/virtual/mailx/mailx-1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND="|| ( net-mail/mailutils
- mail-client/mailx
- mail-client/nail
- mail-client/s-nail
- sys-freebsd/freebsd-ubin )"
diff --git a/virtual/mailx/metadata.xml b/virtual/mailx/metadata.xml
deleted file mode 100644
index 3678038a5878..000000000000
--- a/virtual/mailx/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>net-mail@gentoo.org</email>
- <name>Net-Mail</name>
-</maintainer>
- <origin>kit-fixups</origin>
-</pkgmetadata>
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
index ec20f56d2069..cb099b7c0c79 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
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-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+ || ( =dev-lang/perl-5.32.0* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
dev-lang/perl:=
!<perl-core/${PN#perl-}-${PV}
!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild
new file mode 100644
index 000000000000..d9abdd553f97
--- /dev/null
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.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 ${PN#perl-}"
+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-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
+ dev-lang/perl:=
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild
new file mode 100644
index 000000000000..26362095aa16
--- /dev/null
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+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"
+
+# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
+# When bumping this package.
+RDEPEND="
+ || ( =dev-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
+ dev-lang/perl:=
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Safe/perl-Safe-2.410.0.ebuild b/virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild
index b2ef089ea50e..1bce4a7f67e9 100644
--- a/virtual/perl-Safe/perl-Safe-2.410.0.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
- || ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+ || ( =dev-lang/perl-5.32.0* ~perl-core/${PN#perl-}-${PV} )
dev-lang/perl:=
!<perl-core/${PN#perl-}-${PV}
!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild b/virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild
new file mode 100644
index 000000000000..846306fadeab
--- /dev/null
+++ b/virtual/perl-Safe/perl-Safe-2.410.100_rc.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 ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ || ( =dev-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
+ dev-lang/perl:=
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
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]
+ )"
diff --git a/virtual/service-manager/service-manager-0.ebuild b/virtual/service-manager/service-manager-0.ebuild
index 957e04452012..04f765a515d2 100644
--- a/virtual/service-manager/service-manager-0.ebuild
+++ b/virtual/service-manager/service-manager-0.ebuild
@@ -4,7 +4,7 @@ EAPI=5
DESCRIPTION="Virtual for various service managers"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
IUSE="kernel_linux prefix"
RDEPEND="