gentoo resync : 05.12.2021

21 files changed, 186 insertions, 347 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f8da3cbc87bb..73ddb4ff7dfe 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index 85407d0391b7..07d7e04e59f8 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,3 +1,5 @@
 DIST cppman-0.5.1.tar.gz 3596049 BLAKE2B 0189da1413720c00c89a0685b83231aaf0c54e19c84ede164e892e7f8855b7b1ceb1baee11866fd99d150e9c031ccea88bcecdda816fb8e53d58b918a000e04a SHA512 3248d9795d3a379f13e43d5e0753f62a0412dcf3760b8dec6a176f08cb71c4983065c7d27eb15ffed4cc77264e66a3f7d9fe5757a8c7a582741751bcfd1b2fd6
+DIST cppman-0.5.3.tar.gz 3614734 BLAKE2B 3b764be07c19ad026e20f6b0f1ac6709ef0fba6042225ce53d6aeb627bc80fba4c4775f9c4d9fa7e75f5d5fbc847dffab1eecbca9f55eab0c447b9d6b9f0f401 SHA512 4e89c8e4ec4b8fb7f577ae83ac77198fb2a56f85550b9efa2b534c1e3d25f45be7932e0cfe663d51b5ff2846668022386af0b018056bcc25c5a1b2e5d32eb111
 EBUILD cppman-0.5.1.ebuild 832 BLAKE2B c64a69b8ae5cf44ea58c802db2e9512917040eac97b77e2eb7072c7cc251e4037480b8b1f19c2d24dc29634f5627f5f8b4b51a19b2e348037e9549e0c1c4613c SHA512 36b376de497a3edd84544782b5ed88296fb2c8428bcb9875cafbd353cd56e44fd2b41dd400b89a3a017f05dfe2ed7b446eab9e06125ec3d6cbaa92582ca8c5ae
+EBUILD cppman-0.5.3.ebuild 834 BLAKE2B 9da4eae575959f1c40536f3ad29535db89f86e73d98c3a0fc26424fa5a31221dc1dcda455414e7508be1fd3a15101b506e23ec625fc3d2b1d6cc7011bd602b36 SHA512 d8e5feacf73c01ba28acb8a2d2ad6a98b58e96722ab448c656c653369c2a7f61862bd376766f9eb7e7f5ca115de0d525dc744eab803f72ae0c676dd5a0f3ee0f
 MISC metadata.xml 248 BLAKE2B a87b1be47eefb8ebe51c333f62a16d35f6eb4612f6b4d20e4e35acf58205053662132eddf5d4bb14407a6291ab1aeb0cc4ab36e0006d49949ece6e55d3e4f55a SHA512 895858a7a7c2ca44e867b32936853822c39cb84185e3eea417b9c7452be1d13495f7635e5289d5b499a12c1cf76c9c3c49cfb5e57635820f94ee84b34f262320
diff --git a/app-doc/cppman/cppman-0.5.3.ebuild b/app-doc/cppman/cppman-0.5.3.ebuild
new file mode 100644
index 000000000000..0366039efb90
--- /dev/null
+++ b/app-doc/cppman/cppman-0.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
+HOMEPAGE="https://github.com/aitjcize/cppman"
+SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+
+RDEPEND="
+	sys-apps/groff
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+
+	# Don't allow setup.py to install documentation directly
+	sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
+}
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 75889de32588..04746dcea151 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,18 +1,12 @@
-AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
 AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
 AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
-AUX doxygen-1.8.17-llvm10.patch 1405 BLAKE2B 553891d761117276a7b7d3c8526d902b392392eae65943b834a23e21b10d4a38c1d7500716ccc1edfa4246be6180eee8dad0c7bb87b5478b837936a9a61ea110 SHA512 17f996a39c1d59fc5a21090f8de1b5d351ef03144b2dde38ac99515193a0e99d1865ce4950b5711d645cea545df56be8f9a4e2af1e93be01806ca3ef9f81a3bf
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 AUX doxygen-1.9.1-header-dep.patch 866 BLAKE2B 4cded0759877e2d152e67b627f633998f3b2e21b5a90e30f9aea80c401748c9d8e888ed277210ec6d4631500a804f9fa098e1c3a389c03553421f52013003d62 SHA512 9de1235d5a0462ac0909cf2fbc665b65fa3462ea24a67cacfacd309b36cfed8f296bd970b990116aa80768c516aed02023009954faa724a82d4ebc5fbc5a04ea
 AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319b45ad6c3f66c937a2a133eb9c76d38455f71cbbc1ee830e5e632ce36ab2a2906a67b1c676d60c02d0696a9da75862ea4197e209b1 SHA512 71cc9c54bc40f6719c64874e2bd9355cda47c87affec7f3e551fae06cb27bd9c569bffec03d2594c2f1a0190c6975123270fb446c62d8c1fac4c2834c7adaf80
 AUX doxygen-1.9.2-xml-static.patch 983 BLAKE2B 3c4e6dc68abe6c6a6e37ed1af5b41da00698ee31fe044fd98a55d29859e07412ed2e46f1706f4409d108e457c86b19daf497743594fec7bbde2a208de7ba7c5d SHA512 a7bb90fe1a3f3e9853f67ce9f754f2b26d07a0d23c33b10626b0a639623959be4b97fbb690cf5b6db3098e87cfbb54db7ce376306e0ac599defe00963bc38f49
-DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
 DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
 DIST doxygen-1.9.2.src.tar.gz 5076037 BLAKE2B 7b21b228a2049f3048fba744d94066524a0fca37335a7ffd2616fd62a8a7d8d9d28d0bd506245c63771264a279a21f327e5386a9b4c490eea7f79ddd9583b566 SHA512 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0
-EBUILD doxygen-1.8.17-r1.ebuild 3251 BLAKE2B 5150b5cecd1eabc5c771d9004285cf6b98908e2db4883444058f4cdeacad6b4cd99c26a1a2aa14c8725cd49bcdde7bec7a04efe45c001a9742bd254d3cf8a0dd SHA512 23cf468712f22035743c0cd485c113b880a1e3882aa399805d08c7133c42a01267f881b04c5964f014d093d4eb96b697bd164a04fd67ae833c92231ba9bdc1df
-EBUILD doxygen-1.8.20.ebuild 3162 BLAKE2B bacab3a64f0117ca35d768fe7206ef8abf79653b40a012a49d0ad63a415246820d750515c445ce9e74735760c890a8784fbea73291e46223777cab9cde2671ac SHA512 796eb3462c38aa0cf8069597eaddcf734f83d2eb3abadd31911de9834b1450d7ad43e2b808e188094bced55050a0d7cba6403e9a1baeb1ab9c33e1dc1e2f14f2
-EBUILD doxygen-1.9.1.ebuild 3187 BLAKE2B d09943766569177abe90a4785f3062d9ffbef68f80f0fc863ab0315d3257f5bc2cbb78fac6ff4f4a42bd3e92871102c314c9159390086b707fd3b67f890b55d8 SHA512 b0ab56eb65af20ccbde47e2def2a586a07d097a1195f55ab359eba5eb93020148a263e041a0239496492bbaaab90c2425dffa5bb140c83f8704bf1a4646715f2
-EBUILD doxygen-1.9.2.ebuild 3169 BLAKE2B 86b7322b7572c469253051e3ebd86b7156c825458bb2c596b8e29252c89129495b46ef627296f8ae3ad214615c0add82afd210eb402a487d9c0c665f54c1a028 SHA512 17b8e12bd7d15430de20ba2cbbcf1b5bfd4cb24fee31d578621cb347069d1c4e9c09d210453d92ffc7fe9d711f231118496926f02b10aad317d8a03d3e061fe5
-EBUILD doxygen-9999.ebuild 3132 BLAKE2B 2be5f69bb3e7b13f35d8c4a09e219d5c570b8f70d78a8d985b25cb367e833dc022effe2b123c34f96510e46dae66985bf3f4acd5e0e149a369c6ed17fcae6aac SHA512 db26c0da3ae1eb4a739b4559618c1cfd02cfe0d7d07f17bdfaf1f9f727e665fe34306a77783f1c8c9e7b3a2bf41200348b853a9be0df2419eb58ac88fefb11b6
+EBUILD doxygen-1.9.1.ebuild 3254 BLAKE2B ee5cb6421d2ad609eaf3f6a5dc96cb29ef052a26d8324f93cf25aea9cfc2d548869d6a08da070702259fd29d1478eebe177bd2f550de81412311bfd543cec15a SHA512 1a68e73060c27c291674c00eb216d9f673430399b5858eb96f89ceef6728a7d36689954c7369e8c913f95889fe5fa6db752ab60217ee0f55930a62e08b50e802
+EBUILD doxygen-1.9.2.ebuild 3237 BLAKE2B 40b71ef08cc01f187636c362826eb246e6170899ae7acb40d4be0b6fe92cca53d8a7105cda908fb74a56f1a323cd1d44f157b15874d98940dddadc8390bbabbc SHA512 e69570262070b863fd37d96ef65042ad691b4d05c35b4b1e768b59da8f4b9ec91eb7186147ec9e51a572ef1d5a4654f60fe61876fb5d400d728ff52e68dd03ae
+EBUILD doxygen-9999.ebuild 3200 BLAKE2B 2f7bf2191f70d53805d13caecfe560898847060620302e395adb5591683f8f8089ccbd4d871d495521f39395b39fec0a663d20b66dba43e4ecf72fec5772685d SHA512 22eb87e98c134baa3f497b53e554bba6a6582642b2d510611513515af1eb9746dcb20b434cee7b1838be2e2222fd04d4f9301d76f1bc55bafd9fcef234d37213
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
deleted file mode 100644
index 7043af44c3fb..000000000000
--- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-	"${FILESDIR}/${PN}-1.8.17-llvm10.patch" #730170
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.20.ebuild b/app-doc/doxygen/doxygen-1.8.20.ebuild
deleted file mode 100644
index 0c452edeb2b7..000000000000
--- a/app-doc/doxygen/doxygen-1.8.20.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index 95d0c7502afd..7904f496c1dc 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -11,7 +11,8 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
index 2c63853d7323..38d94a9243b3 100644
--- a/app-doc/doxygen/doxygen-1.9.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index e7cf3ed80125..026efedfeee1 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
deleted file mode 100644
index 861c79a6b0d9..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CMakeLists.txt	2019-04-04 06:51:41.509647160 +0200
-+++ b/src/CMakeLists.txt	2019-04-04 06:52:08.413646804 +0200
-@@ -263,7 +263,7 @@
-     add_definitions(${LLVM_DEFINITIONS})
-     llvm_map_components_to_libnames(llvm_libs support core option)
-     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
- endif()
- 
- target_link_libraries(doxygen
diff --git a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
deleted file mode 100644
index 2b2ca0ef733f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
-index ae52cab..04b9293 100644
---- a/addon/doxyapp/CMakeLists.txt
-+++ b/addon/doxyapp/CMakeLists.txt
-@@ -14,7 +14,7 @@ doxyapp.cpp
- )
- 
- if (use_libclang)
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxyapp
-diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
-index 2387f1b..c880c3d 100644
---- a/addon/doxyparse/CMakeLists.txt
-+++ b/addon/doxyparse/CMakeLists.txt
-@@ -14,7 +14,7 @@ doxyparse.cpp
- )
- 
- if (use_libclang)
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxyparse
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3f4767c..d6891a6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -310,9 +310,9 @@ if (use_libclang)
-     endif()
-     include_directories(${LLVM_INCLUDE_DIRS})
-     add_definitions(${LLVM_DEFINITIONS})
--    llvm_map_components_to_libnames(llvm_libs support core option)
-+    llvm_map_components_to_libnames(llvm_libs support)
-     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
--    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxygen
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 641594c14ac0..7f2081263af8 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,5 +1,7 @@
 DIST gnucash-docs-4.4.tar.gz 62534210 BLAKE2B 0c3cdc3ccdf1cfb7a54e44dcde9ea10672cb312e6d6e083ae9bb65bc52b044e8559647a8491f6fa762d9bb84c33f22dd9cacb3a862548994bdc7c56b3e634aa9 SHA512 60e34af3fdb144fefc835d6497fd442daad1417c4e40f8b4fd8f66a37cd0cfa1d789aa03de435d4654ee2368a4b85e9b0cfba8eeef61829e0ca190a453a9abdc
 DIST gnucash-docs-4.5.tar.gz 71420078 BLAKE2B cf4cf6f62e0ce1c5f868f91b6452a531e14a4fb85c801a941e5b19a9a3e61593a248cc79c753e23d9fb40809f27194117d6e73c7723f9454c2c2d0658fcd77e0 SHA512 27fcb649ad813d2aa148b8a910a6d35fcb47e79b0c36e6b2456d733f8f969686234e090d128ccb4a2227c71385dfa9d9236606a3e9354923e128644ee0be137f
+DIST gnucash-docs-4.8.tar.gz 74862559 BLAKE2B da0496a5762bd3a7437272e1118f53e2dbb218bc8c8e960134ece3b10909c5673109e76dd195cdde320bd47849d43ad1068d21857ab288b57ff3d179fafe36ce SHA512 61be5ada80748350f5d72068a6c19cd5a5db6cd8b4500ed16febe5f53586d929b4843ac6b51ced78b381e26c8948beeb1cc48593d5263f906ba5b8f3fda47d2e
 EBUILD gnucash-docs-4.4.ebuild 1285 BLAKE2B ecb63537a38a0bd44cc87e34d238b1f173330799aad9fad0908e940957dddff0305edbda67b0b06fac239776e375aecd3261e3f2765dec0cf6a94e965050247d SHA512 df0ed95b0f06a82ff9fda6f39229d8693676ea57699c9f1ef17ce19bb5e2801f342577e72c4e3cbd56c206b4e008f959147c3188b625a57c92c0cb3fe996f8ff
 EBUILD gnucash-docs-4.5.ebuild 1287 BLAKE2B bdcff301ee1ec3e3927bc7209579451b3ac63d76839c855cdb570902a0d87940686d7c197bcc5d88e2edd0e34e481d21bf6f6c4683a8c3d1664a17fae7f62710 SHA512 f128c1a98619845b0371acce1817f8d4c381e277d707d1ac154fd54364c5073a4afb14478f163cffc35c43860cab9cffe0eb825c746af6020b954ba32c6c4b39
+EBUILD gnucash-docs-4.8.ebuild 1273 BLAKE2B 20aac6ac13a87728e2ab22503455898f77a1d51db5a177c1dc73aff85b112fe87ea9364ddb43cc1da65abebaf0a70eafeea3b7df825d8a66102055cd4165cdef SHA512 c0c02b1052aa75cdd201ab2c9cc9345ac66f57106bb39b65c29540316dcbb32273cccdcccb81d2fdff639e186bd6d3199aa30d1ba4ec64508baa439949d4c9d2
 MISC metadata.xml 331 BLAKE2B 135ffc2e8c3d03d13b165c798ad9d3448742cb7688c19972129462ac85e204b3e010197e076b37c5f92b956d53f30f5709dc25ccb0e15bddbffd5ea4e50f6f43 SHA512 52feb0565aa146f33ffe1024d8becbae1d3db8ba938028bb2af946877c93f278174811107f219d3786433e2b551f93417cb448febe71793f672f9b9d526d1830
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.8.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.8.ebuild
new file mode 100644
index 000000000000..48bcc3936345
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-4.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake optfeature
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="https://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in manual guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ja|ru) # Only guides translated
+					if [[ ${doc_type} = "manual" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake \
+				-C "${BUILD_DIR}/${doc_type}/${my_lang}" \
+				DESTDIR="${D}" \
+				install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "generating PDF files" dev-java/fop
+	optfeature "viewing the docs" gnome-extra/yelp
+}
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index be3a49716e6b..737f4f30c7d6 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,3 +1,5 @@
-DIST kicad-doc-5.1.10.tar.bz2 74201837 BLAKE2B 6e9810c1efc46c52c4d7f4818c8a5cf438bdde82971074cd8d59a1cf81431d77d3d09877666dba8d9c3af8a2b0bcb643352db0b9f95ec60b1c3325f0f2adc667 SHA512 2795bafe835c94ea169484e997cb57a0e8b419e6e7b28324f96602940e5d66762cdf594ec6503cb8718707d6dfddde2070aadc8e97888c0bf455ea56f625dd43
-EBUILD kicad-doc-5.1.10.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
+DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
+DIST kicad-doc-6.0.0_rc1.tar.gz 79671406 BLAKE2B 7ab224ea2ec376c6c073018bc97f932e4097bed205ce8d92ac6b9db5db85fafd6de97a41026d890d3c38073cf410be0490f5e81f97e77c7e63d53a55ddc67527 SHA512 b8dc91daa72f46c2311675a3a4a4317fd2da5c877317e49e4f43ae85f9e1ac859405a3ec35a5fa6fa400825ea5b45350565803efdbf459f5c87844d534cf9bee
+EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
+EBUILD kicad-doc-6.0.0_rc1.ebuild 1867 BLAKE2B 0dbade7efe07859da30b7b51ddb40114902116bf5e9795422adb09c4aa418a86d1c3c723dc4eb582595a31cdb4bca98223d2df8227f1ce00887b751b7c7bb8a7 SHA512 10584407d37ecde537e2046dd17659560c1eeeeb2c6f9cea3f70e9207fc64fab550a27d92588a8466205a4005fa5ff558be9b6d5948975c6616371e3ad87e637
 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.10.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
index 86c28051d6d2..86c28051d6d2 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild
new file mode 100644
index 000000000000..9bf5e27bb2a0
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# 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"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +df once asciidoctor-pdf is packaged
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
+	)
+	cmake_src_configure
+}
diff --git a/app-doc/mathjax-docs/Manifest b/app-doc/mathjax-docs/Manifest
index d530bdc321a1..354fd7c43eb8 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 768 BLAKE2B 7982903b81c6224e7417db11aa3a3a2ec2ecfbb9f588585df1c310b2c9c58af8bf10c3cdf68efd284683bbe77e281d771c358be8ce2085d9009f1942c30ed868 SHA512 fb7b90c4ce4602b9edc8f5309e3eae4d277474dbe578f01a379008f679a4d3e98d3c02af95e183ab9ab8eb00e7f53f68ce862ef6e86978d2ba2e5b44c9890e0d
+EBUILD mathjax-docs-2.7.7.ebuild 780 BLAKE2B eff55f3abbb2bea2d131153b7ab5d961af0a2e3595b51fdd09ac0a2117167b469dab97e4c7ba31973231ecaf26d542be3a9780223659c6ff01f389e0d84e2afc SHA512 febe3ac299746811bae75715ed6e2177c65aea2616a30b833c8218cef374cfaba65c71f3e298848146607e3b2b3c3a200d418b56cee2235272ad10d86b46ff58
 MISC metadata.xml 1036 BLAKE2B e8313b36816e999c0a3710be229be02a52498d119b3e53144a55e71012294c4a4821e2263e620bc29011fce81e9a41c5db376c880000cc482c2c728fbc674e26 SHA512 8f982ef30fe17e74cd83b6b9d20e3ed3f4a02e74583daab484ee743aa455ce906fe8ffcd56dc3cc40fb9b8e6643a66c431f34cf391d6d74c123150156ef6d0eb
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 efa529306357..27fcd974bf7b 100644
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/MathJax-docs-${COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/sphinx
diff --git a/app-doc/vilearn/Manifest b/app-doc/vilearn/Manifest
index 990770eee4c3..ee0ae0b35f2e 100644
--- a/app-doc/vilearn/Manifest
+++ b/app-doc/vilearn/Manifest
@@ -1,3 +1,3 @@
 DIST vilearn-1.0.tar.gz 15687 BLAKE2B af683e8e6e560f53ebad6b7764d3a57d5722d5eb77f8e7cd582e81a3421c3fa8d52770b8ef665bab4989a549c2637d9649d7d31178235e02b36e65af761f7e04 SHA512 5bb53d6eece6025eb0c3dfb90badba12ba3996658af63cac09773c1db455dd7211014a3b3c5f8bd4bb6a709303ee1d6d370805401ca5807ac3c171f774ec91ee
-EBUILD vilearn-1.0.ebuild 567 BLAKE2B 475fab7404a51e969647f78ae8355cfc7abd7c2ffb05fca7447ee7af8bb83717170d871a419edc3be748719dcf9033f27440e9b59efe61c5e418f3d79d162c25 SHA512 dfe7b819adb1965b72611611d421ab5b45e977b520ddf1263ab8e80c4bb8a21a1a69eece4df89a52b9c575bf9f30732c411edf4522710fdf9de85636703e5d72
-MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
+EBUILD vilearn-1.0.ebuild 588 BLAKE2B 32e938f803fb3af6c04d98f31ad91140ca0a6645e270cfc07cf403f4c02d60f17e3b4524a1444b1b65e66d2678416d25b2fcd5f069578621dac5a937dbb1128e SHA512 d23bda8ca491236c6bd88a20dbbb4975b6b2b0d2d47e152bbe8dc4a4797fe3e7a6b1026bba85230ccd584ebaa3317a58f412598d93db006b548596371d1722e7
+MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/app-doc/vilearn/metadata.xml b/app-doc/vilearn/metadata.xml
index 9a97f3478d31..987ce1bc2ed6 100644
--- a/app-doc/vilearn/metadata.xml
+++ b/app-doc/vilearn/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-doc/vilearn/vilearn-1.0.ebuild b/app-doc/vilearn/vilearn-1.0.ebuild
index 4aebafc4f7ce..7b8ab4ab0ef9 100644
--- a/app-doc/vilearn/vilearn-1.0.ebuild
+++ b/app-doc/vilearn/vilearn-1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="8"
 
 DESCRIPTION="An interactive vi tutorial comprised of 5 tutorials for the vi-impaired"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -14,15 +14,19 @@ IUSE=""
 
 RDEPEND="app-editors/vim"
 
+DOCS=( README outline )
+
 src_prepare() {
+	default
+
 	sed -i "s:/usr/local:${EPREFIX}/usr:" Makefile
 }
 
 src_install() {
-	dobin vilearn
-	doman vilearn.1
-	dodoc README outline
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
 
-	insinto /usr/lib/vilearn
+	insinto /usr/lib/${PN}
 	doins [0-9]*
 }