10 files changed, 297 insertions, 10 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0a85030e2e70..f91f18aa33be 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 23455a3b9a99..7d26ce0d6824 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,7 +4,9 @@ AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb79790188
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
+DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
-EBUILD iproute2-9999.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
+EBUILD iproute2-5.19.0.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
+EBUILD iproute2-9999.ebuild 5790 BLAKE2B a4e4aef64a28dcde07729a71a30ff13b7d4a332dcf364e4aa5e6f32f63273574d4585826718cb15b087561690498efd56a1014233c60e3016a3d6eabdf62da68 SHA512 0277f4ea772b15af385e4bff0b84d751f5db3593c85148bfe7be149eea50514831c7d840b41d2c5ee89e234a056c57bbef33526a7a4c14e21ec9ab90e5ff571e
 MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed
diff --git a/sys-apps/iproute2/iproute2-5.19.0.ebuild b/sys-apps/iproute2/iproute2-5.19.0.ebuild
new file mode 100644
index 000000000000..b3c0b0e984dc
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.19.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	libbsd? ( dev-libs/libbsd )
+	nfs? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			-i ${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly. Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null || die
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
+	popd >/dev/null || die
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	edo ./configure --libbpf_force $(usex bpf on off)
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
+
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	if ! use libbsd ; then
+		sed -i -e '/HAVE_LIBBSD/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers, bug #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, bug #144265, bug #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	HAVE_LIBBSD   := $(usex libbsd y n)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die # bug #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	if use split-usr ; then
+		# Can remove compatibility symlink in a year: 2023-05-28.
+		# bug #547264
+		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+		dosym -r /bin/ss /sbin/ss
+	fi
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug #47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index c0e45a9ec79e..b3c0b0e984dc 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eapi8-dosym edo toolchain-funcs
+inherit edo toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
@@ -196,7 +196,7 @@ src_install() {
 		# Can remove compatibility symlink in a year: 2023-05-28.
 		# bug #547264
 		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-		dosym8 -r /bin/ss /sbin/ss
+		dosym -r /bin/ss /sbin/ss
 	fi
 
 	if use berkdb ; then
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 352bb919e597..852e0ea09fe2 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -1,3 +1,4 @@
+AUX iucode_tool-2.3.1-limits-include.patch 200 BLAKE2B 7ed386d5431c1fe46a50f80752b8274901cd6d8b74d945d4728361af48c867aa3ef6455ff67dcf2d730f8130b6a0de8649822ab5861557c8855dd71d28b01aee SHA512 ef7ae958326efcbfd0235ceb2e428181cc63b324dedbd74444f2319dd3aa0120da3755d9089ab7c2f515eafe01ec45e6900b15f06495af73ee8908342b8e2e5f
 DIST iucode-tool_2.3.1.tar.xz 153380 BLAKE2B 30dfc28e1dd4e0241cb7cfeb18bba746bb85c341a1627e21a5db4965271c26fcfe33f036c2008207bc9fa6c2f32bf2b857e78c9bf23739817d5c5c487d6010cb SHA512 2c7f72eaf509f9daa482ec5f8eb86a45ac9fa84fa856678fdf9ad056e19532e3734e04656d9dbebbd3a774d69f4c861c1340bbe67b1c6c60d61135705980e7d6
-EBUILD iucode_tool-2.3.1-r1.ebuild 425 BLAKE2B 6095ad603d5cd2340db5c23aac6c1ae0fc16d4c4617151e8b70717c47a4ad4dc1d8d83bb4bee4261b16d49b1c58d000b56bc3ff6f540e22462fc2463a02c6d01 SHA512 0fa65c955d746f9cc7725c38093a92d536cf1a176f4ebbd60306c722c5bc4eca22b1d154eaded3d69f816891b82e30dffa80cd2ad8997f9bc58d6bc24b824dc2
+EBUILD iucode_tool-2.3.1-r1.ebuild 550 BLAKE2B 5da72ea8207de1c1b8727f24233fac41ec8675e38a8894310b2fff51adaf1367c77699fc856f884fbe0489703f940aced6251d247e246a4fb54cfea6597cf0e3 SHA512 1f0009cbf9cdd5153a3965b431ab853fd50b4e866652cf2a676a65f484ce570b16624c9f5153e85bf04b4c2e65f2405c112309ab323f3c0597462a317da24502
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch b/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch
new file mode 100644
index 000000000000..965bf740e3c2
--- /dev/null
+++ b/sys-apps/iucode_tool/files/iucode_tool-2.3.1-limits-include.patch
@@ -0,0 +1,10 @@
+Fixes build on musl.
+--- a/iucode_tool.c
++++ b/iucode_tool.c
+@@ -29,6 +29,7 @@
+ #include <assert.h>
+ #include <argp.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <time.h>
+ #include <cpuid.h>
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
index cdaff636c174..b6c3cb20991d 100644
--- a/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
+++ b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,6 +10,12 @@ SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
+
+RDEPEND="elibc_musl? ( sys-libs/argp-standalone )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN/_/-}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-limits-include.patch
+)
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 7c16c54a6635..b2531e39d4bf 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcore-0.12.11.tar.gz 625613 BLAKE2B f9bb17286cf30714d9f6f47ae6286031e418fd5f420e8921e1f1ed546cb1f293772e8d6e11ea2f4af8046d82fd166abb7c27f640f7f105c13a73d9ce19ccc52b SHA512 b98804603a9d14562efd56d01fa0b17ee1753d25b8c108d0d12eb47b103787f5fa7170f9924b473996817f31c31c40b5920db597974438cdc43215f5f83e43db
 DIST pkgcore-0.12.12.tar.gz 625488 BLAKE2B a1492b642447b8bf8fff6eb7cf85cf8d1355984afeb9d385383574327e3636aad7f9e7932a44a55649a64126b90d68de60e3653affb2753916fd439d15edcde9 SHA512 fe813d7e0be7b7ca0686ce4047211dc2a08e49d3b041ea6935e3cc905e1c8cf8f15fda2d4c0852bfaa191d898d774999b85bc9b440a5c32d438e2a8157caafbc
+DIST pkgcore-0.12.13.tar.gz 625121 BLAKE2B add4e54c9d92570f4a4e9dad1af45f7c10e4fa48a312f1dd07b24bede5bf796d523d0a8b8d069234e92db5cf64bfb2911c57e5161ebdb7325bfb336237066b73 SHA512 26267f8ac2c79408467a20decd5fa5b12c075269b3bec155f185349186d920b5273ad1666879ac59caf08af022c2395fe737e2d51f26f9674996767bfbfb9bc6
 EBUILD pkgcore-0.12.11.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
 EBUILD pkgcore-0.12.12.ebuild 1314 BLAKE2B 0c25604a650425cb14d18af92b6575116683f494f047b004d141e248d5e601e455e21856ce39153817a4ef243a137fd23353e5280da1df813cdedbe03a0b9be3 SHA512 8267788607dad3aa06673d4c67131bb096ea7b0aa18065fa72132c83c1019208feb31f5171fa9e3bc1eabb195a939e5ff31943fa47aec856fe87e5076c6cdb59
-EBUILD pkgcore-9999.ebuild 1314 BLAKE2B 0c25604a650425cb14d18af92b6575116683f494f047b004d141e248d5e601e455e21856ce39153817a4ef243a137fd23353e5280da1df813cdedbe03a0b9be3 SHA512 8267788607dad3aa06673d4c67131bb096ea7b0aa18065fa72132c83c1019208feb31f5171fa9e3bc1eabb195a939e5ff31943fa47aec856fe87e5076c6cdb59
+EBUILD pkgcore-0.12.13-r1.ebuild 1314 BLAKE2B ed50837daa6a1bc4891c60b96509c00fa2997bff94b03ca7fc2278483381240b3a5c0ec5b3edb6fa47ad6a26a3264a7ee6340efa95ca7feda3283f1e32bf4078 SHA512 68e126e282abe0d5ff5a9cc4b20534691d8f1d115791060b62e84f1eee2f7acf087e2ba121db53241e901bdd36a156b6b503be4d1abe83375fa4454a2bfb6ea8
+EBUILD pkgcore-9999.ebuild 1314 BLAKE2B ed50837daa6a1bc4891c60b96509c00fa2997bff94b03ca7fc2278483381240b3a5c0ec5b3edb6fa47ad6a26a3264a7ee6340efa95ca7feda3283f1e32bf4078 SHA512 68e126e282abe0d5ff5a9cc4b20534691d8f1d115791060b62e84f1eee2f7acf087e2ba121db53241e901bdd36a156b6b503be4d1abe83375fa4454a2bfb6ea8
 MISC metadata.xml 484 BLAKE2B 9f4ccbb77a4ee434a2370f0b6567025f8f0a9047d3ff795b5b3306c6ca458ef991d096cf83c024a3f409984e1d1f336bfe23c3841ef89c0cda702d61693c73ae SHA512 afc2dfe76697093b6b303b8ab8f413c8bd514a02b1e44a45924cca6e99b435a98b0c9b1dfe662e4054f846f8ba1fde262d6fd1ed858d90e651761b51b6adccfe
diff --git a/sys-apps/pkgcore/pkgcore-0.12.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.13-r1.ebuild
new file mode 100644
index 000000000000..533d30e95bf9
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.13-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 0919b8f2c070..533d30e95bf9 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -28,7 +28,7 @@ RDEPEND="
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.11[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (