gentoo resync : 20.03.2022

20 files changed, 142 insertions, 74 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index e73f8ea593e8..43b720b2a3a0 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/abs-guide/Manifest b/app-doc/abs-guide/Manifest
index 41a235c0eda3..c74c08b2ebf1 100644
--- a/app-doc/abs-guide/Manifest
+++ b/app-doc/abs-guide/Manifest
@@ -1,4 +1,4 @@
 DIST abs-guide-final.tar.bz2 1141871 BLAKE2B cd17182f5693a9e20d0549267ab86851da070b2100dd807f8b3c5fee2a0d674c001f36aa8e5e7ce8cd0358400152586c84c3fe5b99bb3eb806372eb5f39aad4b SHA512 76c445da6faa47418e50458bf2bfc0b4c34c9efcc93308c39ec880b894d019bf9a1d2f4a8687d14bd9832872b666769f6f7f74c313520e9770f16724eb3adfdd
 DIST abs-guide.pdf 3358210 BLAKE2B 0d222f7f50d7044e46d7384870c5399468e7ed5e7819edbcfa7aeb5dd30e5d8749068d31ebdb9e707c168e45f027bdac4f7a9ed294f155f26cdc066884e1463e SHA512 8691ddab583e816ca9f0e42d37d45d8c27e74b5b62a5a951c7fe5830679e9288d4d5f98e7ff0746e2ac71e26322c7dc8250e33128b3e77591a1e48e8d415777c
-EBUILD abs-guide-10.ebuild 875 BLAKE2B e2b0bd93d57c868c9f34059d41c129d01d1e45eb0b950ffa2b32a1f55729a83e130c9794d33c868403c0e89de035af17baefa15301867e35c18bc3a25947339f SHA512 16cb1f9ed1c2295ed707763d160310ea82d2a101beb3a1ab0849beaf3e17d748708079bbfd959869e53f945239709a155de0dbfbc56f5ad7840db32191b5289f
+EBUILD abs-guide-10.ebuild 882 BLAKE2B a1bc338b8351ebf38c4fa38f4d1978b2757c733588f34a384a2a547234a2a5eae93753b3cea75ed1a105c71f7ff3c4d3fd2d69bdaac17556739e506650e825ec SHA512 f7c47cde8be166d2f015520b3a6ff1ec704d5f49cd3e0f16e9aa83f55db236f9a53a8eff9699ee2b470ac195b4d90edaf6a8692bcefffbbb9c83a6bdfaf63106
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/app-doc/abs-guide/abs-guide-10.ebuild b/app-doc/abs-guide/abs-guide-10.ebuild
index 228a14be345e..d70f66fa4645 100644
--- a/app-doc/abs-guide/abs-guide-10.ebuild
+++ b/app-doc/abs-guide/abs-guide-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/abs
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ~riscv sparc x86"
 IUSE="pdf"
 
 src_unpack() {
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 165eae5cf130..b5ff9033e251 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,8 @@
 DIST eclass-manpages-20210712.tar.xz 410588 BLAKE2B 776da6b26db95791401d562d3d550e1ab71dc19f54124fa37e78ab2595835fb05e7382b98007e58131698710b978dd87cbc10df1ea98c6ef01ec866418d6f9a6 SHA512 fb2bdc790d96f0662d84eddd01f291b4a3cac638c1e3df8975755e81d2d64dda14b0f60a77387da8544672080711d5047dda777d27a8cf2ded2634c47ecfee4b
 DIST eclass-manpages-20211002.tar.xz 410056 BLAKE2B 6ac900aaa2718d838af7f069766e2e818276c80d1819f38ca0bc09d3815487083dfe64781331d9b0049c474fc6cec9381daea9c7961f14b208cd3372c79b7564 SHA512 bcea1bcae107df73c72c37dd65c5414833ad59e9d6088f806cb06512b53cdbcad10fb50fe23ede02ccfcda17ae86c70879f496929ef0f54aa799179f9ef0d869
+DIST eclass-manpages-20220316.tar.xz 402108 BLAKE2B 6730248793ccb479da966fd20212ee60b9ca75a8eb4bcf9872517fef10821c2fe0232e17707411d2b66366813fc31a5917157239a79002820376d397899ea6b1 SHA512 0d89f02de5812854c75987e1b9718de58f642585ef4a6dea9b907549ff5d52b13d62cbe70fbbfe4339fc5f15f6114505d20f715f7a583c2cebfab4dd27a7ac1d
 EBUILD eclass-manpages-20210712.ebuild 610 BLAKE2B cdccb1eb84fe2b2374aeecb1d0c21015d1d1696b2f7fcc1dd98934d000d510f098d820988b990ad5d452ebf3fc708426204b3efd886faf784d107834a36ef9c2 SHA512 09e6566515f0633cc015d73c71c15b59662a593873dab950aec4686494c9700a2b524b880fc444f9b9730b5313b7cd8f0f41b46d222c2641253c2836d6f694db
 EBUILD eclass-manpages-20211002.ebuild 633 BLAKE2B f20760b77201b4bf01ef0bca69be07befe168ecdc56db196b376e7af300854615971fc10fa5803c295f433170f48e223d61f661198cc5d347beec120792e61b0 SHA512 6946ad2d131971963920eb065ff057be904443b602a25f02f0d80e1ae2c5c4ed1e8b8a48d9bdc558a549598207550989fea1acefe234b58520767adcba906753
+EBUILD eclass-manpages-20220316.ebuild 651 BLAKE2B 37ff24066bc4c9040a853c80a724a000cc168be6941308776b3a7bb25dee7e4f568334df6ee40052ad54b0bf8cf58c590eebf4d470c36b7514729dbd34d9bcd6 SHA512 8692cd5478d21637f9afeec0e82085d1dc98c5fc62b800dc8122099b867e48e552ed25cd065ac0f0b7931c2ae7cda5c863cadd99e94b2027d12c2e473f5dce8d
 EBUILD eclass-manpages-99999999.ebuild 748 BLAKE2B 505ed6b49b874a9f2b57aedcb417ed9fbac61f991cb5904d0acd59c9076c0805dd71aaa60635151b5435df453a7ff3ab2da93d942af9d8939beffffdee9f05b7 SHA512 23b1ab13bbd15f6f98217f3147904f5362c04f5bfa5355b29c3cd380f85fb25308c54772a4539bbbfdb53a5063c273e67d1a1f6f7973a22728a53d128bd94ecd
-MISC metadata.xml 375 BLAKE2B 16669911cd82609028ebc077bfb5bb6272a3c4d20452d4a8dd28abba65ba4b81fe069fdbdd022d0c346abb10cd3adab389555ca82f4717c314d563269935c8b3 SHA512 070886941b879d16f09a20c43b8f0b1681703f9579d22c462a3a63848b395cc8271e1978feb596e5df2752e763d5fc49b2669495dc85c3fbc94739aa47d4e6cd
+MISC metadata.xml 457 BLAKE2B c9db5f0a28c7362c8e659468eaa3c7e0f248ecab7cff3377c2a17a96361a29fbbf2bea81b847f518696bf54b84bfae9814bed90e5a8722d3662af06e558cd376 SHA512 66269ed186bbf2267f5ecd088e27ed5bdec7c5584a088ac94ba30fb283ea4a460fd58dce3083192e8873c340bd95d7b4377017e7489e0594852380cdbfa66ab3
diff --git a/app-doc/eclass-manpages/eclass-manpages-20220316.ebuild b/app-doc/eclass-manpages/eclass-manpages-20220316.ebuild
new file mode 100644
index 000000000000..3f301df02e67
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20220316.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+BDEPEND="app-arch/xz-utils
+	sys-apps/gawk
+	sys-apps/groff"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-doc/eclass-manpages/metadata.xml b/app-doc/eclass-manpages/metadata.xml
index e4aa80f1e0e2..8e0527c16974 100644
--- a/app-doc/eclass-manpages/metadata.xml
+++ b/app-doc/eclass-manpages/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<maintainer type="project">
+		<email>devmanual@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index d9ac0fc00b21..2c18f0e35f7a 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,4 +1,5 @@
 AUX gimp-help-2.10.0-python3.patch 13294 BLAKE2B 86ed2514e95210986e9d108e908abbf89354e3ff2ef314ad4409e42804b59728cac8f4b8eab3d1d431aaf3fc4745774fbf405ebad80c235b69e3583e47132b38 SHA512 b1932670247c793c8bd9c70045fb3f568ff99c964f2bc8ca1e7971f510512b7e476ced5c79b0bbd4e6966c9caf5c75f436926772b36996f5cf3d9e80bcc7ad76
 DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
 EBUILD gimp-help-2.10.0-r1.ebuild 817 BLAKE2B 4ab66b499466301a9b73c3f7f5577682929085f9fc25f02e346043d79ae6a18b9445f3027882edf8bd39107d85a680379410b8d3c395bc97c2b2e6af05533e7a SHA512 1f69d4de0386f537871da622942127f41e702e6893587a30223470f6c98c38adb7a98c06e3d2c4de569016656ba97884fd275d678a7360ca7b7372bdc1410033
+EBUILD gimp-help-2.10.0-r2.ebuild 949 BLAKE2B b2be39a88feba8b2bf0cb07e41c25dd86d22c55587625a2d4dab91e249bcb42a132eeaaaa798dfe632c0e015a92113fb9442c3aa2c94d306428aeceb7aa480bd SHA512 56746a10f4630f04883e7288621a0affd34ab4f805125e2dbb954641120ed8db9fd48c39f4f81a8149ad038fbc109d82ef2dd6b5bc456724488bcbcf91f2bd68
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
new file mode 100644
index 000000000000..886b27a60f42
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1
+
+DESCRIPTION="GNU Image Manipulation Program help files"
+HOMEPAGE="https://docs.gimp.org/"
+SRC_URI="mirror://gimp/help/${P}.tar.bz2"
+
+LICENSE="FDL-1.2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
+	dev-libs/libxslt
+"
+
+# Adds python3 build support, bug 725940
+# patch is from https://gitlab.gnome.org/GNOME/gimp-help/-/issues/201
+PATCHES=( "${FILESDIR}/${P}-python3.patch" )
+
+python_check_deps() {
+	has_version -b "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	econf --without-gimp
+}
+
+src_compile() {
+	# See bug: 833566
+	python_export_utf8_locale
+	# If affected with bug: 677198 then set "emake -j1"
+	emake
+}
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 57c7d01ac02a..1c517230331c 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,5 +1,5 @@
 DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
-DIST kicad-doc-6.0.1.tar.gz 78035248 BLAKE2B 25ff6eb1318d2c55ace2df3b1d553ce9220b035f8de034e583a98eb601c1032856b0efc8b81e0a142483722015878d64e25b05df5a53e5d53df56967dfc23021 SHA512 1027a4f46a855ab34c9e4fb53df1a495d8cb1d27f98263fb574ef25135b0d20ba3a875e2711fcb73836c27f5c0e193aea2dec3e9fa313434785eb0553ca214b8
+DIST kicad-doc-6.0.2.tar.gz 78035381 BLAKE2B f78ce40c35ca39ee10ebd1322ed299d02a7a688f3d47d875420aea3270ba26d644521659ff5c34b395736454e03fc5c64bd345ea30e9b88b63472f21731a2c28 SHA512 f219d5f13a873fa90c105f376c456ac68b5a36eef3eb65fc08e1bc26d6be70b31fa43e4c6cee0371a6a64469c54d4e0721d9e15f19d1e952da3cefd6bbd3e09c
 EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
-EBUILD kicad-doc-6.0.1.ebuild 2043 BLAKE2B fc47f0fc22887cb620cd03115539548676d60378720e79515e0ee3c851f163c0ac957a3bda5c9ab8ce71d97ccefd07f0693503bea96f05ff88e1a2b2b974635b SHA512 cacf92232283d333502373004e9023da5a9e4a6e6978934de8a82c8066e07fc36dcbba7ee63513dd58e24ed68bae2bab3f5526d78249bb5d81120ac4948ed8d4
+EBUILD kicad-doc-6.0.2.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.2.ebuild
index c1aab9b28734..51164ea1dde5 100644
--- a/app-doc/kicad-doc/kicad-doc-6.0.1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-6.0.2.ebuild
@@ -14,11 +14,8 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc-util/macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
diff --git a/app-doc/linux-device-drivers/Manifest b/app-doc/linux-device-drivers/Manifest
index dc6127a12350..ee3ff0bbfbd8 100644
--- a/app-doc/linux-device-drivers/Manifest
+++ b/app-doc/linux-device-drivers/Manifest
@@ -2,6 +2,6 @@ DIST LDD3-examples.tar.gz 77780 BLAKE2B 76774a4c6ce91b7332b4b5fa92b8e2309a24c83d
 DIST ldd2-samples-1.0.1.tar.gz 123791 BLAKE2B 5cbfe4925af42688e10af86d341be6d8cba2c4093f2ce293705f9e72f5b2b65f4ffd5809cea00e1065351aea8314a38b3d2c0eec3c41ac3a55903a9c8b6f8c34 SHA512 c6d1c72f0b71806cc719f758b62f3ee2a5bc1c66b63399f2765c0b4edfb2f89945e1248607faae1a88c9278d74c1edfa42f4c4408d926883b1c82a650ebbdd6f
 DIST ldd3_pdf.tar.bz2 11553208 BLAKE2B 539903963d62cbbf15399726a6dbf795cefc0909d10f0383183dd3ee4408c6616c4548331f3cc9cff2b1c6ded6a84d378278bc4e2774df18bd50980ebc406c0f SHA512 46e9f9c2c4e5ce5d325e071f4638ebee772fb55c7c3c0f4a303a35e7ca3576dfccf655bbbe6ef8cf6be0558a1c84addf6a4b59b6c50b621c495f3b75184653a4
 DIST ldd_book_pdf.zip 6971754 BLAKE2B 161ec5b96bedba16958521b7b8605a515d7152eb75c661b2a66d27adeda6235de30fec437016c4f9fef559c27dfac4a9c4d0bee8b6eef89da3af30a9c745a158 SHA512 f30675ff5279df6c689cf4f936aa6bd50f6aab8254e557a6a3be87217efb2c6bc30de8efd489ea5c86f86ebebe2b3ac119b0965fd567caf757e9d6d67d02676c
-EBUILD linux-device-drivers-2.ebuild 635 BLAKE2B 95c03d74dfef55edccedace697506b56175f774d065f680213adcbdd9c735f975772f46a738b467513fa55f28d81ec43830041421b2771ba1edb1447b5edfa89 SHA512 3adc30efd8b86f48bd463878c1c38e91879e5fa908d1f2800ffbea61da500221cf21a2e122d395db5da9b4d3a7b5291290cbf1082dc17594c95579e2e1294c28
-EBUILD linux-device-drivers-3.ebuild 754 BLAKE2B bbdf72e0aaa76b72abbd8721814b0ad8a42de46f8b5b77086855613ed33c9b008cc62f959656f04a7162577b4a453142fc92edc19b557180eb02613fbedb0ba0 SHA512 6f3ccb319b86b5ece29b007d60b7373600887a7db2917a7fb9a4851511826fb3b1affc94844bbe4b7853dd6450939f4b946829dcec55e10e19cb3b023d2004de
+EBUILD linux-device-drivers-2-r1.ebuild 696 BLAKE2B e0082efa53cacd3942e8d2cb38fa006c426f03c1e2b36705dc1364f70e77f2ce391f40252a4d139fb1b3f6a8156854cac74cb5e864957fd4b1a67d965910364d SHA512 ab65f18a66f47f7b0985f4b0a6eea352ffb68fce03554050a5dac0eec2eded4649edfaf2c0e56b038f9634363e6717950e1ada1a1bca86d7a7d3e4f22f8fd6ed
+EBUILD linux-device-drivers-3-r1.ebuild 670 BLAKE2B eb26100bc566b3423e4bc87cf976b334d4fee69ed1ee9aeae663a31053394acdfaa99d5172b7a12be65529924436ce8fbc2c1adc1088f904b79eac7820a4399c SHA512 d9745831ccf35308f25442dfb04b486fc7a86b91a7f216c265089f500fbd2402a5b95a6ee083f9459b5f6ac8dbfe749261c6031fee4de18e001f014b9dfac8f8
 MISC metadata.xml 190 BLAKE2B d559575e12e34a66fec07e2f63236ea9b6284ca73aafb2471715d08329f5fad685b5e6f81ee446a4377efd3ca5785827306e491391dcf1789a7bafbe2b506a56 SHA512 5ee7503a2f18cc27f052203ffd239180eb796dda5425690a03a43b51a6d09262141d0108bdc64bad0fcdbedad3ea884e4187ab581a63e5ea2e73e057a5eba0d0
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild
new file mode 100644
index 000000000000..02389ad129be
--- /dev/null
+++ b/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="9780596000080"
+MY_PN="ldd2-samples"
+MY_PV="1.0.1"
+
+DESCRIPTION="Howto write linux device drivers (updated for Linux 2.4)"
+HOMEPAGE="https://www.oreilly.com/catalog/linuxdrive2/"
+SRC_URI="
+	https://resources.oreilly.com/examples/${EGIT_COMMIT}/-/blob/master/${MY_PN}-${MY_PV}.tar.gz
+	https://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip
+"
+S="${WORKDIR}"
+
+LICENSE="FDL-1.1"
+SLOT="2"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
+
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	dodoc *.pdf
+	docinto samples
+	dodoc -r ldd2-samples-*/.
+	docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
deleted file mode 100644
index b9f14bca98b9..000000000000
--- a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="howto write linux device drivers (updated for Linux 2.4)"
-HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive2/"
-SRC_URI="http://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip
-	ftp://ftp.oreilly.com/examples/linuxdrive2/ldd2-samples-1.0.1.tar.gz"
-
-LICENSE="FDL-1.1"
-SLOT="2"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/doc/${PF}
-	doins *.pdf
-	insinto /usr/share/doc/${PF}/samples
-	doins -r ldd2-samples-*/*
-}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild
new file mode 100644
index 000000000000..e3bbbd96aeec
--- /dev/null
+++ b/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="9780596005900"
+
+DESCRIPTION="Howto write linux device drivers (updated for Linux 2.6)"
+HOMEPAGE="
+	https://www.oreilly.com/catalog/linuxdrive3/
+	https://lwn.net/Kernel/LDD3/
+"
+SRC_URI="
+	https://resources.oreilly.com/examples/${EGIT_COMMIT}/-/blob/master/examples.tar.gz -> LDD3-examples.tar.gz
+	https://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2
+"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="3"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~riscv ~s390 x86"
+
+src_install() {
+	dodoc ldd3_pdf/*.pdf
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
deleted file mode 100644
index 73d58ce3d6c9..000000000000
--- a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="howto write linux device drivers (updated for Linux 2.6)"
-HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive3/ http://lwn.net/Kernel/LDD3/"
-SRC_URI="http://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2
-	mirror://gentoo/LDD3-examples.tar.gz"
-# original URL is this:
-# http://examples.oreilly.com/linuxdrive3/examples.tar.gz
-# but 'examples.tar.gz' is waaaaaay too generic
-
-LICENSE="CC-BY-SA-2.0"
-SLOT="3"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ~riscv ~s390 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/doc/${PF}
-	doins ldd3_pdf/*.pdf
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/app-doc/mathjax-docs/Manifest b/app-doc/mathjax-docs/Manifest
index a92b51ca01bb..9c70096f737b 100644
--- a/app-doc/mathjax-docs/Manifest
+++ b/app-doc/mathjax-docs/Manifest
@@ -1,3 +1,3 @@
 DIST mathjax-docs-2.7.7.tar.gz 233452 BLAKE2B 280db6c794471d369a17161ad859dc73ddf1494af35114b69356aae41ea52d771f92b0b85ba82df8ed542039af152938f5fda71d752da4410ab183fe6a24ab81 SHA512 25fa97294ae153298d45b449d995c0402c481c6425ea4ebb38dcc509df741aed02d5469a520c8b793b8135b4140a6d1ad6688a42e3cb26004cfd7fcb838c32e6
-EBUILD mathjax-docs-2.7.7.ebuild 832 BLAKE2B dbcd290d36424871a9be49655b06fd0b6459c3e1ca9054febab3a5fe1ae9ea01d0fd7c4d741264220e7a32f8ccca890bff90a42847240abe91cd2ba236a09bae SHA512 4e236457d1703b15c2c69ed2b9ac196b48e8cef8efc3c5a2e4267452b42c78a5d72a17b256538faa6afefca4a49db7124f3401432741408d452017350230ab65
-MISC metadata.xml 1036 BLAKE2B e8313b36816e999c0a3710be229be02a52498d119b3e53144a55e71012294c4a4821e2263e620bc29011fce81e9a41c5db376c880000cc482c2c728fbc674e26 SHA512 8f982ef30fe17e74cd83b6b9d20e3ed3f4a02e74583daab484ee743aa455ce906fe8ffcd56dc3cc40fb9b8e6643a66c431f34cf391d6d74c123150156ef6d0eb
+EBUILD mathjax-docs-2.7.7.ebuild 831 BLAKE2B d687087c19910819a84cb43ca7e758fc0dc017e884415b9da757729968001432b6bf161b1a1c8cbcc1163589322da8b4fc30d440a828886a2fcd0aee8ea7eec5 SHA512 a5ad18d0f34e7e6980f27c384de42d61cc240403d589c1dc4528215fe609fe0618b016c001b3f7e91a78f6f617278eb4068d63d965a05df06fe33542458c43ab
+MISC metadata.xml 1061 BLAKE2B 0998de407f2c70adcedf76215a98199a77ce4d4acb8ad3c68535b671b954d079cb9c9f5601b2f659910b5d89a31eeaf9dce83e4ee62a310703d40186674c6aa3 SHA512 2384de292ed63ffe44d2ecff98a96dabf8a89930db8f6f87378035b47ffc8c81a22a9b272f55b9b9fd2e20c3b55f7b1e562c6d81ccab18d222215a5929fcee82
diff --git a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
index a95494e1afde..cc87a5b9fd0b 100644
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/MathJax-docs-${COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	$(python_gen_any_dep '
diff --git a/app-doc/mathjax-docs/metadata.xml b/app-doc/mathjax-docs/metadata.xml
index 2c67d4cc5913..20d1fbba32f8 100644
--- a/app-doc/mathjax-docs/metadata.xml
+++ b/app-doc/mathjax-docs/metadata.xml
@@ -5,6 +5,7 @@
     <email>gienah@gentoo.org</email>
     <name>Mark Wright</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
   MathJax is an open-source JavaScript display engine for LaTeX and
   MathML that works in all modern browsers. It was designed with the
diff --git a/app-doc/selflinux/Manifest b/app-doc/selflinux/Manifest
index 7e72204a5f02..c9baba610661 100644
--- a/app-doc/selflinux/Manifest
+++ b/app-doc/selflinux/Manifest
@@ -1,3 +1,3 @@
 DIST SelfLinux-0.13.0-html.tar.gz 7379682 BLAKE2B 5baf00233fd69c3d115adef28c0644d0d4e563014c82649d7e4c906189a36543bd30528ea901f8b2b7c849721b220eeccc3787f67b016ca7161515e23fa8871c SHA512 bb7f16006863f958dd24c8f82db5e4538f00fc66f1b2efe7c52ed28d241fdcfdd366e973c91b730118ff485c2343f5a0fac293f080f0d6e86d24fca4beaaab72
-EBUILD selflinux-0.13.0-r1.ebuild 633 BLAKE2B 9eca101f1c252d654043164e6c340d33e06d9679817b1d5508ec701facd28d7ed481c79a85c1aa6397e71273a4acb7f2972f3f2a9d3c92ef6dadfb46604e9415 SHA512 2e7c4563d0017c6a483b66cb163dc40fe9454d350c17b7eb8eb0dca2fb075d3bd1475fac89b2897f061eeec3ea9a8a53eb5da0bb5f4acc827578b311597c8241
+EBUILD selflinux-0.13.0-r1.ebuild 640 BLAKE2B 7f824108782e3d15f1e8b05b2778feefa687f89d752e4f5528d2758c6a313e9b496d0fc1d5217505e2de2df818f418db77b9b0e72fc63b439ca0c2f1a008b616 SHA512 ae32ec8dc086d20e13c40080b531c5b2cd9fd452cab80143aa3afcc28c8075e80adc66435149aca8c409c45060c640f2f3d2dc2e6e7a396fad8cb3b8517107eb
 MISC metadata.xml 271 BLAKE2B 44df3fd0e44f46778e082bab060cf5e8fb74bebf024038f1746fcfb70e6b46f586b1f3fad51b0bad26f3318988ce0e6f455096803450f9d103721d6d06825363 SHA512 c195df8f35b5a3f7fedf70fab6561abfc50ea9df57cb009748b9f3ed62fa853ab26345eeb611bb3bcda2831f0f5c9cfb2d676576103c7d25d5ad0413f8b75285
diff --git a/app-doc/selflinux/selflinux-0.13.0-r1.ebuild b/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
index c78288d47e3f..dd4b11186f89 100644
--- a/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
+++ b/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
+KEYWORDS="amd64 ~arm64 ppc ~riscv x86"
 
 HTML_DOCS=( "." )