15 files changed, 555 insertions, 7 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 829eb5bf8d53..a08ff49aa59b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index aadc6e12a55a..e65b0b7bb5a6 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,7 @@
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 EBUILD apparmor-utils-3.0.3.ebuild 2270 BLAKE2B 09acbd071d8251fd216b9b88a0dc291958bf44e07c8675d7b33ba213415b10fabe52219098f3d3f55ad661cdffc9cd9c662bd152289b8f9e025c9fadf11d122a SHA512 6b794dedd327ed36a33d9dca9964425a1d19983137c563b1eaadb80b4b8ae8b290aa6e0d6dc39a4a76ccb7b91e34873d5d698d35b9b7b053eb706890ef7d22d7
 EBUILD apparmor-utils-3.0.4.ebuild 2277 BLAKE2B 8cdd90cd222e428b77ffee60f0151f53e53d0b6f2129080ea66d484640e3bbadd03960e520bc87c05ba93b1631d0c1a3ed8b8799f6035282f7bca62fbddf2cf2 SHA512 b2d6d3d0e25a041eaa545ea95a1364e11d14d3364bf21942026db92b4a8e571b97845bac2e9716335da9712f1337b0816a6dee69eaac84a0edb06ca162f5a7f1
+EBUILD apparmor-utils-3.0.8.ebuild 2279 BLAKE2B 54eb3be433d0086742bcdd2bb124c3c1d4f3f7cb3d64c3c3401f872f45fbd9cb7757cb0f0201dcfec4469c83cf0b5f97a26f8bcc6fdedb0dc272ede743b3bb76 SHA512 c351ec8c6fe643ff733b729744d2c88f6df1606ad5fb9c4360cee69d7e89f09953fb70dfa8bdea92eacb364065683c7ade090003472c1874b79b6a23a8a6f0f7
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
new file mode 100644
index 000000000000..0ef73bf6738b
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	dev-python/notify2[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2 --version=${PV}
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index c6fcd731f5b2..283ee1c43ceb 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,11 +1,14 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
 AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548
+AUX apparmor-3.0.5-makefile.patch 660 BLAKE2B 63facdbb0e13bd5ea6a9f0c1d17a8b472a50fa8aa9f6f98ff45cfb51d01e6d55750ec2a4d1133b87b6c2767d5e44d2ad90b462e0ee41be1854d9da8590f96a68 SHA512 a21573d34329535f268380f86470278b749b2ae440d33f96da2ae5b101bd0d75973e15dfe66d0166b2ee90c3aa0d67ba278be4d7227f08cfa03a6dab8a2f445a
 AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf47a509bdc41a93c886bb6cac60a126d9495e0825f9f76dd927b9b84a84154fc55f84bcfc9c934095b SHA512 06da247b62d6e612e0c48610c8c2e7831b9030659106482c8000758e591f3ce42b175210336b903e07b20eb5ef2cc3eb592424b06fe933449964e9c2262ebf35
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 EBUILD apparmor-3.0.3.ebuild 1763 BLAKE2B b08f4e025cb7866350dcca9c57d94996e3ec507eae470a5c9611004c5514127c6e719cca5e4abcf5e6f8df7ae599a40a8f2d410e631dd91e8ff35febeef548ee SHA512 296eb06895512c14a600ae078b4c6908aefc4668e3b5095f970e254203613b0e11a151de7869804c06ba76212da8bbc2b82e80e70028a549603daf99641a0f61
 EBUILD apparmor-3.0.4.ebuild 1864 BLAKE2B 401c21b50f4c7fbd3efb0e0b9ea22e90063d640cfc881260b05921d7f7fa2949d3f5a5620871c574d02b7fb85e4d0ed27bcab2fa4f294c48f2c932f775a0e12b SHA512 4b2f7147e987329afe14623b07c2528765c87e07b25b2fb3c12f92c5622a04e4e3cb3a4036df3255772b186ccd9fac500ae83ca36cdaf20faf6690cab7e0e38d
+EBUILD apparmor-3.0.8.ebuild 1866 BLAKE2B a474d097be7e5d4c2e45277dbd0de0e9995a98cbcb8abf55db37adf31acfbd4737308798bc1b0aca335311d4df1729047bddb25f60195e6615ba7f5fb38455b3 SHA512 b335de4e50168544078306c5dc3b152491073481e825ea818ebb4a37e0a6be29f07a0c11c30e96d358c64453f388a885e5f6e14ad40b21a3bf9e88540ff2cac7
 MISC metadata.xml 504 BLAKE2B edf9792c3f360d289cb22c814eaa900cd6acc6237a58a1b793920d149fd3b647f9918a4f61ad319d986352f539858558f4bfab88e4673661263520f3e5b9f1c0 SHA512 7f2bd6a32991df3e64456ad5fea24002ddd1e2b111dc6107700676f488432994cd917d20fa0b1c169e1c4b43b0ac0b2935d52813174391df8fa2c805b27f2e89
diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild b/sys-apps/apparmor/apparmor-3.0.8.ebuild
new file mode 100644
index 000000000000..dfcaed9d635d
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="doc"
+
+# Was restricted previously b/c needs apparmor support in kernel
+# TODO: add check to ebuild
+#RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		CXX="$(tc-getCXX)" \
+		USE_SYSTEM=1 \
+		arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake \
+		CPP="$(tc-getCPP) -" \
+		DESTDIR="${D}" \
+		DISTRO="unknown" \
+		USE_SYSTEM=1 \
+		install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch
new file mode 100644
index 000000000000..5d4dd9c57e12
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-3.0.5-makefile.patch
@@ -0,0 +1,18 @@
+* Avoid installing empty /var/lib/apparmor
+* Install rc.apparmor.functions to Gentoo-appropriate location
+
+--- a/Makefile
++++ b/Makefile
+@@ -407,10 +407,10 @@
+ .PHONY: install-indep
+ install-indep: indep
+ 	install -m 755 -d $(INSTALL_CONFDIR)
++	install -m 755 -d ${DESTDIR}/usr/libexec
+ 	install -m 644 parser.conf $(INSTALL_CONFDIR)
+-	install -m 755 -d ${DESTDIR}/var/lib/apparmor
+ 	install -m 755 -d $(APPARMOR_BIN_PREFIX)
+-	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
++	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
+ 	install -m 755 profile-load $(APPARMOR_BIN_PREFIX)
+ 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
+ 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 171483cf5050..c6df14c60128 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -3,5 +3,5 @@ DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b
 DIST gawk-5.2.1.tar.xz 3411420 BLAKE2B 5dbbfe92ed4c11a38b2f995e9267dd2e392a9f393af1c63aaf3c5dd6d1681c01db900e05a118831125f914fcffe2218de7f30891ccc6f64abc5f572aef5feeff SHA512 f81da3e61987d1460326dc79fdbabacfd4660219bf66ec8ba18877500fd24e160761e401a5b868067f82bec46a6a808098f3f6a1f4c8b710e439cd3f99ffa56c
 DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c56c2eca80b219ba8519c927ab55b7f569d55054b0499f7bf37d3413b97e9d3cf36f5573f9ecd4855663064e SHA512 97a9cfb069f235bef31892ec6e5c56ee6a8733129ae3d02e871d5407de4d7a6140fc0a87001b2b21e3cffd714d1b4d164876de47144dfdce6dea92c670ed0217
 EBUILD gawk-5.1.1-r2.ebuild 2762 BLAKE2B dc12406f53b61c3a99cfd3dfbbe0a430b4746920a78be5fb611b8d6c61a8de5e82ff2002d3b8c3d90562d408d26453ada810f60ceb4bef961875b677c8079e64 SHA512 96941cc2cf82f799bca38f8707b9cdce9764a817e5fdd950fd91be3de00f5ae6fee2660a2fd77b7effd9d42263a33ce40927525f076c2140a83d84b3af7fb887
-EBUILD gawk-5.2.1.ebuild 3163 BLAKE2B 6db3e5ed3bcb67114fb658df07e7e98e556bba3780e1185e8420eca420214b8de24800fae7ce1f3a708b0b8a61d880b5ec204073428613537f337c9cf5fe31d1 SHA512 b47425e0b3b35decfbf6d2872787ff65feda06f7a06c0218c9da25b4e34974b935ee6abca616a7910aa86ded51330f604a8c6ac3a52c2f8fd12f4d4bc02cd154
+EBUILD gawk-5.2.1.ebuild 3362 BLAKE2B b5e46502da02bf6b4ffc73f0f04139c025a02cd571697474d6d627041f5f3841073a8e4ba608d28c27e5177f02c82d0b804b7adecdff84bcf877ffc10ca50c7c SHA512 238f649dd06ec7d16b40889d6c95b2b210d4323bcb15d2e287f3b2fc885611a35935411b56b3b36f83e7e3f4b783d73c739b128c9ca30b792402706db794b86f
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.2.1.ebuild b/sys-apps/gawk/gawk-5.2.1.ebuild
index 53a5f8031952..097387e8a4a1 100644
--- a/sys-apps/gawk/gawk-5.2.1.ebuild
+++ b/sys-apps/gawk/gawk-5.2.1.ebuild
@@ -34,6 +34,9 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
+# While tempting to enable mpfr by default as e.g. Fedora do, as of 5.2.x,
+# MPFR support is "on parole" and may be removed:
+# https://www.gnu.org/software/gawk/manual/html_node/MPFR-On-Parole.html.
 IUSE="mpfr pma nls readline"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 98a437e83be9..d986f7ee2dfa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,7 +6,7 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
 DIST portage-3.0.41.tar.bz2 1119737 BLAKE2B 6c6d1fa11f16362505e321eb530d233cf73a7e1cc7dab2fc88ad40701c16835e08a7d16a408381e2f717ac5f48d46344e57b9b5296be4eba0a7583540c6a81aa SHA512 046621ee59b2b1b374a63091028ed3462b1212960b337e8e034c739d5c51d5ae1e7b491c88940199e710081409e38778749a5c86576cf5bb6c59b1890dc892b5
-EBUILD portage-3.0.38.1-r4.ebuild 9166 BLAKE2B a16bc125979b171a567935314d6895c371fa90394e7366dc4af678541817cdd8cd44ac1d30005953298b936db059fe226b47678d5cb0eb2610c0e871a39204b1 SHA512 bd647fbe3f7255de375a36b5bc843113fcf1505de5d9851b088546c94ca85d369e84647af7d8eb3115e5c0fab61616ab0aff6fb3d5691bc1d1ac20c4f0a61e23
-EBUILD portage-3.0.41.ebuild 9132 BLAKE2B d524733f6b74a913a63434f4a4483b04f37ed7304a5ce14dc4dc97fcbc39d6583645e6e2c5e19846f476914b9e658071353d45bafc863fe9509fc5c7874fcd64 SHA512 a6d02faaeeb2840831acd9f4a5c8d45e7e5d5666250fa11660223578fd3ae802c003acee41a77e02bcc5f7a34315154c147ea02d67f4466080ea93496693a87a
-EBUILD portage-9999.ebuild 8380 BLAKE2B 4fe3b5d204bc48a037b47b96a3ef07699ba6f46fdcf21d861c9123c53f406ee9f55ca15fc7d4d361defec55f3223c172ed611a7368f7087caf886b5bad53dc18 SHA512 8cd9e1d18b15d5f70c5d8b21c4b23362d68b32f59fa739f70f3d60b6aa54ae1d5bbf22d61b1ea174aaff97c9006e3b7c36ddc92d55bff77afdd0968a1ae2af52
+EBUILD portage-3.0.38.1-r5.ebuild 9166 BLAKE2B 08cd16f97004d6957f74368105f0284ffb2bb563ba14c2c07ff82b52a1f219d21ceeb9ac29f0b3db22a4bbc7b32aefdb6593b9f640ef96e03cd8cf18b3233755 SHA512 3804e8b9fd0d39c1334ac7b8da6005a63fe9702d8182745b6953f64da251e5eb367797b9da8ad906d80f1b5436b00cd6da57b94d514b1cab117dc11e4df808ec
+EBUILD portage-3.0.41-r1.ebuild 9132 BLAKE2B 05ff0d35daf6660b24b665d189954246c0fcccc7be1000b981be013e06e2dd0d94385387ff39859e8321ec2cc903ac9486ca1c0f958975d0b477548d0b930ed0 SHA512 72fe7520842f125e26715e8fcac2b0a3b7e52b595e1e549fe78d6c9f029239713ce8b5e4270172daa594c9e4ed1f3d16c0d676e073b5ea6e78093a8aa1d3dfe4
+EBUILD portage-9999.ebuild 8380 BLAKE2B a5086b7a5d23fc4e3c4bd3d5c314f01c94866e956b003c9b17bb2fcd7f1e4120d9d4eb98066abba2103fcc692ebed3dc3bfc022d0cdcb29e1ba1851a97fe80c0 SHA512 64d0ba17919fdea6bc72c8c4e4a3e7c974f8c7c694b60f9befc9fc72a3fbbeca27ced69ad395647f4f8505223a2d107e7a8adcc37c373128e8fef9f21191841e
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.38.1-r4.ebuild b/sys-apps/portage/portage-3.0.38.1-r5.ebuild
index 24229a75876e..2f21f269366b 100644
--- a/sys-apps/portage/portage-3.0.38.1-r4.ebuild
+++ b/sys-apps/portage/portage-3.0.38.1-r5.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/portage/portage-3.0.41.ebuild b/sys-apps/portage/portage-3.0.41-r1.ebuild
index 8f52dc905c7d..7c0dd5a89947 100644
--- a/sys-apps/portage/portage-3.0.41.ebuild
+++ b/sys-apps/portage/portage-3.0.41-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 5cb014dee233..f44665dcdb56 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 492e95aa38dd..2a741fe160d7 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,5 +1,6 @@
 AUX 0.88-ar-ranlib.patch 545 BLAKE2B c0b9b9c67e7e9682cbf1aefd194c0a590bbe17592a242bd7e140cd0e3cd201197f3cedb2d79cbaad2a647da0c804944f6b4dc84f7f373f7f2d94bffb3c133871 SHA512 9788fff2aaa01f24ae101a1fd45512218dd5032946614eb73ab033d839b21ce9fa9ff967593eb7add15ba4735dd5656e67f79beaaee720d2a2cae1fe8889b7e9
 AUX 0.88-bigendian.patch 458 BLAKE2B 940a5aba8b3aa103d8cf2e64ce3d9dd09464f1fe643f6ca194198db3d2dd4ed23205cacc9ab05e1551b04542c582d6ecb54acd65b83116231daeb9cf7ca6e22e SHA512 042d2810a8fc968cc8b456216465a349bbde19402a26a64204fb3c9bd2621dfda8ceed1283b11812df8d33ba0eb2f4133de289306ef906060b9a9f5775db3918
+AUX 0.88-implicit-int.patch 4481 BLAKE2B cd53ad86b84061e10839a9a3b56f579b85dd5370abf65da737fd5140f3b5f9a79b4fa990d16cbd7650a35b7a9905b0b064015028e6fec45eb411421e1234d043 SHA512 ba99d51350a758b56271a2e1e0fbb93262ad09345173124053668c789a40cf41abbab296a55dd7521a58c8e80eabe0f7450d003b4d0b0c3a4a50c09b5dd3dc70
 AUX 0.88-large-responses.patch 772 BLAKE2B 6c1cfc91d76094a282e4cd2a4084e52409b3a4193dff8f89fdb477ef54fcb2bd102b082128eed906422ca87f7a1ef0ea018ea1e9ad297c4390395ad7a1e049f1 SHA512 d429065d9fa232207e21c6fb1c2359b0e7d35ac0142ed28ee6b00e150b0b3c5756e7eb684ee1b8aea35236986bdb046eff529e127c9c09994c4ced41370c26b7
 AUX 0.88-protos-ipv6.patch 2127 BLAKE2B fbef8e74c8ea24246db9d09e26c4b3e4af50ce8ff43ea3efc8f3203d7760d53012d46cd6546efc3ce88cac349e3083bc680429338300402c968d35d1813ac1b9 SHA512 953b3a53246ad16636276f679c84c5f1b86f3dc49a910017fa9c05b175d25a184ed870a920437f4305e2b54021ee2aa2a1d6fa8b7e8d5a367bbc060617b3eb8f
 AUX 0.88-protos-no-ipv6.patch 671 BLAKE2B d0c052a53833d9034b92d6ace244aad487c30c17fec5778b9df474aed9de194e92061f496216c50667da41b9dbbf88c8ef439ebbdb0be3c4001fba16425ef3f5 SHA512 56557365c1951e437b6a6b0b8c80d865adc16e2d1fb464a85b367af2d43fbce99e64a6e5a6c8fd4aa0cff53025db6c1ed25458f96316b3c51189d20c5688c0ed
@@ -11,8 +12,10 @@ AUX 0.88-uint-headers.patch 3100 BLAKE2B b3ae425066a313b58cbd95a977b3dd08134b469
 AUX tcprules-Makefile 168 BLAKE2B a2fcda7ef405c4c588d7b97815f21e8188d7f0d8d28a8dd28e52c58aaa32d314c3c2ccb8bfc3b24948aed8a679af3974bbc0d446a0ad7eafc115d0a4c578b26c SHA512 b119ef421dee61a939cb05407481d5a9c109c88cca86271c045d27a5c1b22f2cb73cd28d541d17bca6b13ab6f50c568be95fa8d4554a11a7b29653947a006a18
 DIST ucspi-rss.diff 1828 BLAKE2B 1ac6f97791425b2ad4f912f4773f60d85494c52417d28ef9b8059dd78850637b5d2f70ccdfdeebc60fdb5ad0f02fa681dab7fcb1ec752a96928f1061b7d3a611 SHA512 643514c57570fc0b4e817b07e6d26e831cec5b4657c3d1b9948bd90267fe370a340b911897d575eb94192e24ba71a03ac68ceb2774ef7c0e7ff819c5b4285bc3
 DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57b900045ea71b4557c3f788662c16c579bea90c42a4213c45e6348ed78517e93198407eb3787e2edbd1719ce844dcb5c2d5 SHA512 58e38f9437b03aab121c5c1b9260806b5abd5a72bf22d14468955d6ff7ad2fb2ab285cb7a37b5dc3a568389aa02b8b3ecff0026b49a097ea86cfd340f2b38000
+DIST ucspi-tcp-0.88-ipv6.diff20.bz2 22088 BLAKE2B faa6cf37b828241fe8b0365aadc912465ed811b28cd6a02eef638afe5d8ec2d18a0635e756c4e5ed65e5dc13d49afee37a255e229f2cb2713628e6e8eb57d6ec SHA512 f8d3ae49adec2b6a643458958679b712e803b0e4609b4395ff9c4fd13b5a29b6f9fc35aee59f2928b892908d37ed83b708c67346a4a42ec21e05e7782bff215b
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B 888ce733f7f4e86c3706c5009c77e67ca398f50511dfdf3b14ecfb98bb02d33619d05f40135250d909b19688530ecd10e24cb2dce822756a3cd2b46cb6a3c519 SHA512 7c222bd080916fcdac32f551d29a79c89dc81eb442ec7119d93f6de97a54c594946718aab584234ba43f2e2c9d41970875437c96e5933da78bb5292e75116c40
+EBUILD ucspi-tcp-0.88-r19.ebuild 2167 BLAKE2B bdeec5502bffd2fbb409a608ba0906b599bbf0b834d8c5aa8a316d525dedb166b6cc81adc95f749ee1f3a5bf67fd7feb29368f580e0f2bc2f27d7d5569050f60 SHA512 cdf05c029c3c5700e8df64313659a781ea43b5064c04a138d1bb357ab06c6acc982f71fd76df93aba0ec20e02ba9f2e9950fb9d567e50d8cb8d7fa93c8d43158
 MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
diff --git a/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch
new file mode 100644
index 000000000000..8c4bbf327800
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch
@@ -0,0 +1,272 @@
+--- a/addcr.c
++++ b/addcr.c
+@@ -1,7 +1,7 @@
+ #include "buffer.h"
+ #include "exit.h"
+ 
+-main()
++int main()
+ {
+   register int n;
+   register char *x;
+--- a/argv0.c
++++ b/argv0.c
+@@ -1,7 +1,7 @@
+ #include "pathexec.h"
+ #include "strerr.h"
+ 
+-main(int argc,char **argv,char **envp)
++int main(int argc,char **argv,char **envp)
+ {
+   if (argc < 3)
+     strerr_die1x(100,"argv0: usage: argv0 realname program [ arg ... ]");
+--- a/auto-str.c
++++ b/auto-str.c
+@@ -11,7 +11,7 @@ void puts(char *s)
+   if (buffer_puts(&b,s) == -1) _exit(111);
+ }
+ 
+-main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+   char *name;
+   char *value;
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,7 +1,7 @@
+ #include <grp.h>
+ #include "exit.h"
+ 
+-main()
++int main()
+ {
+   gid_t x[4];
+ 
+--- a/delcr.c
++++ b/delcr.c
+@@ -1,7 +1,7 @@
+ #include "buffer.h"
+ #include "exit.h"
+ 
+-main()
++int main()
+ {
+   register int n;
+   register char *x;
+--- a/fixcrio.c
++++ b/fixcrio.c
+@@ -127,7 +127,7 @@ void doit(int fdleft,int fdright)
+   _exit(0);
+ }
+ 
+-main(int argc,char **argv,char **envp)
++int main(int argc,char **argv,char **envp)
+ {
+   int piin[2];
+   int piout[2];
+--- a/install.c
++++ b/install.c
+@@ -138,7 +138,7 @@ int mode;
+     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
+ }
+ 
+-main()
++int main()
+ {
+   fdsourcedir = open_read(".");
+   if (fdsourcedir == -1)
+--- a/instcheck.c
++++ b/instcheck.c
+@@ -101,7 +101,7 @@ int mode;
+   perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+ 
+-main()
++int main()
+ {
+   hier();
+   _exit(0);
+--- a/mconnect-io.c
++++ b/mconnect-io.c
+@@ -19,7 +19,7 @@ ssize_t myread(int fd,char *buf,int len)
+   return read(fd,buf,len);
+ }
+ 
+-main()
++int main()
+ {
+   int pid;
+   int wstat;
+--- a/rblsmtpd.c
++++ b/rblsmtpd.c
+@@ -191,7 +191,7 @@ void rblsmtpd(void)
+   _exit(0);
+ }
+ 
+-main(int argc,char **argv,char **envp)
++int main(int argc,char **argv,char **envp)
+ {
+   int flagwantdefaultrbl = 1;
+   char *x;
+--- a/rblspp.c
++++ b/rblspp.c
+@@ -165,7 +165,7 @@ void rblspp(void)
+   _exit(0);
+ }
+ 
+-main(int argc,char **argv,char **envp)
++int main(int argc,char **argv,char **envp)
+ {
+   char *x;
+   int opt;
+--- a/recordio.c
++++ b/recordio.c
+@@ -142,7 +142,7 @@ void doit(int fdleft,int fdright) /* copy 0 -> fdleft, copy fdright -> 1 */
+   _exit(0);
+ }
+ 
+-main(int argc,char **argv,char **envp)
++int main(int argc,char **argv,char **envp)
+ {
+   int piin[2];
+   int piout[2];
+--- a/tcpclient.c
++++ b/tcpclient.c
+@@ -70,7 +70,7 @@ char ipstr[IP6_FMT];
+ 
+ char seed[128];
+ 
+-main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+   int fakev4=0;
+   unsigned long u;
+--- a/tcprules.c
++++ b/tcprules.c
+@@ -90,7 +90,7 @@ void doaddressdata(void)
+   if (cdb_make_add(&c,address.s,address.len,data.s,data.len) == -1) die_write();
+ }
+ 
+-main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+   int colon;
+   char *x;
+--- a/tcprulescheck.c
++++ b/tcprulescheck.c
+@@ -34,7 +34,7 @@ void found(char *data,unsigned int datalen)
+   _exit(0);
+ }
+ 
+-main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+   char *fnrules;
+   int fd;
+--- a/tcpserver.c
++++ b/tcpserver.c
+@@ -323,7 +323,7 @@ void sigchld()
+   }
+ }
+ 
+-main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+   char *hostname;
+   char *portname;
+--- a/trycpp.c
++++ b/trycpp.c
+@@ -1,4 +1,4 @@
+-main()
++int main()
+ {
+ #ifdef NeXT
+   printf("nextstep\n"); exit(0);
+--- a/tryip6.c
++++ b/tryip6.c
+@@ -2,7 +2,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ 
+-main() {
++int main() {
+   struct sockaddr_in6 sa;
+   sa.sin6_family = PF_INET6;
+ }
+--- a/trylsock.c
++++ b/trylsock.c
+@@ -1,4 +1,4 @@
+-main()
++int main()
+ {
+   ;
+ }
+--- a/trypoll.c
++++ b/trypoll.c
+@@ -2,7 +2,7 @@
+ #include <fcntl.h>
+ #include <poll.h>
+ 
+-main()
++int main()
+ {
+   struct pollfd x;
+ 
+--- a/trysgact.c
++++ b/trysgact.c
+@@ -1,6 +1,6 @@
+ #include <signal.h>
+ 
+-main()
++int main()
+ {
+   struct sigaction sa;
+   sa.sa_handler = 0;
+--- a/trysgprm.c
++++ b/trysgprm.c
+@@ -1,6 +1,6 @@
+ #include <signal.h>
+ 
+-main()
++int main()
+ {
+   sigset_t ss;
+  
+--- a/tryshsgr.c
++++ b/tryshsgr.c
+@@ -1,4 +1,4 @@
+-main()
++int main()
+ {
+   short x[4];
+  
+--- a/tryvfork.c
++++ b/tryvfork.c
+@@ -1,4 +1,4 @@
+-main()
++int main()
+ {
+   vfork();
+ }
+--- a/trywaitp.c
++++ b/trywaitp.c
+@@ -1,7 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-main()
++int main()
+ {
+   waitpid(0,0,0);
+ }
+--- a/x86cpuid.c
++++ b/x86cpuid.c
+@@ -5,7 +5,7 @@ void nope()
+   exit(1);
+ }
+ 
+-main()
++int main()
+ {
+   unsigned long x[4];
+   unsigned long y[4];
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
new file mode 100644
index 000000000000..af7bfc881cea
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmail toolchain-funcs
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="https://cr.yp.to/ucspi-tcp.html"
+SRC_URI="
+	https://cr.yp.to/${PN}/${P}.tar.gz
+	mirror://qmail/ucspi-rss.diff
+	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
+	ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff20.bz2 )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="ipv6 qmail-spp selinux"
+RESTRICT="test"
+
+RDEPEND="
+	!app-doc/ucspi-tcp-man
+	selinux? ( sec-policy/selinux-ucspitcp )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PV}-protos.patch
+	if use ipv6; then
+		eapply "${WORKDIR}"/${P}-ipv6.diff20
+		eapply "${FILESDIR}"/${PV}-protos-ipv6.patch
+		eapply "${FILESDIR}"/${PV}-tcprules.patch #135571
+		eapply "${FILESDIR}"/${PV}-bigendian.patch #18892
+	else
+		eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch
+	fi
+	eapply "${DISTDIR}"/ucspi-rss.diff
+	eapply "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+	eapply "${DISTDIR}"/${P}-rblspp.patch
+	eapply "${FILESDIR}"/${PV}-protos-rblspp.patch
+	eapply "${FILESDIR}"/${PV}-large-responses.patch
+	eapply "${FILESDIR}"/${PV}-uint-headers.patch
+	eapply "${FILESDIR}"/${PV}-ar-ranlib.patch
+	eapply "${FILESDIR}"/${PV}-implicit-int.patch
+
+	eapply_user
+}
+
+src_configure() {
+	qmail_set_cc
+	# The AR/RANLIB logic probably should get moved to the qmail eclass.
+	# See also the patch above for generating the "makelib" script.
+	tc-export AR RANLIB
+
+	echo "${EPREFIX}/usr/" > conf-home || die
+}
+
+src_install() {
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
+		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+
+	if use qmail-spp; then
+		insinto "${QMAIL_HOME}"/plugins
+		insopts -m 755
+		doins rblspp
+	fi
+
+	doman "${WORKDIR}"/${P}-man/*.[1-8]
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+
+	insinto /etc/tcprules.d
+	newins "${FILESDIR}"/tcprules-Makefile Makefile
+}