14 files changed, 67 insertions, 541 deletions
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 2e15cb9d2e38..098ebf7a3769 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 05235b9a3607..ba7cf9ac39ee 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,17 +1,9 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
-AUX doxygen-1.8.15-link_with_pthread.patch 1119 BLAKE2B 3c4dbb0440134d96e7879f4d18869eeffb06a43726dd6ce0441fc1f4bc4664088ebc185f38c1685adf3ddcff1de45a9a0b11e38206c9592c42cb7d45c2ba3f60 SHA512 fc7623892cdfc0fd93a9470ed7c29723b53f690618d86bdb9d4afd387af7dccd36c8b6a54b86d46c464a7960aa557570589e874cbd0ad825a379493143610e77
 AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
-AUX doxygen-1.8.16-fix-external-tag-files-with-TOC.patch 1968 BLAKE2B 739a9ace2ca96be8b696e7ac24f5ec1303e26f6f02250d5cb8eb26bbf41931905c976ceafd732daedf8260d1e19b4a056a779d984712bcc966c45d8a942ca151 SHA512 a0055694b216a89ccccdc763d02be92fd582f2230bd600062c8043afaca199502a2764eb19570ca0af4db4d43040d4f77e1ed5d5ff006d45747941c654f734ea
-AUX doxygen-1.8.16-ghostscript-compatilibility.patch 2046 BLAKE2B 5d2016db1ff06329347ad653537f00c9e5d0de74cbf07c9b1b988b24f140f7a5db136a6dde2fd1ee4cfa935d99cfc81196bc4ede8d32ae6a0b9b37c87b04c547 SHA512 398db683a53059a051b1a123567e870d9f46fb637716b3665af2fadfbd69de3297f4df5beeb7ed4faa38ef762775b7de0aea91fc00abb938059af693ff8cf75a
 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.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
-DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
 DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-EBUILD doxygen-1.8.15.ebuild 3233 BLAKE2B a93bd53bf77ef393c5bc970d20d381f332011a7372337d1d82d08e6b979924e89d03a23ff79a94d869aeb36591255bcc0e064a497dabe47a247affaefa9b3a1e SHA512 81db790474ec2f7d5ca3402aa2d0d63d1db555ea7d667602651bd2b770b6ff9dc737e71c9551bd97f7a84b2cbf4ef4cb413ff789fb9d845a401df49f5b6265ab
-EBUILD doxygen-1.8.16-r1.ebuild 3339 BLAKE2B e1961eb2643f4d171593a854da3360eba8029617100e879b93fbbee3a666edc209b60b4ab0b997f93188ce838a407e78b360e5a7d09b6c6e12e546b5dccefa0a SHA512 722ea09c9a797dc5ed60b4b198764202ec114357155ed4f30ae89a32506019df3b2f7db95da04f16044ce9c256a30ad9161d86dbf653886d8ef58012fcc5351d
 EBUILD doxygen-1.8.17.ebuild 3229 BLAKE2B bbefd6742c5dc0d21eca4636aa57f189c4cc150cb50211d0e7a80137348a811697dd89622dfe7b281417ebd9ed0397d8a03fb284e6ff92c7b29ad8216c6ca483 SHA512 b15e9ff7a4730d34dfc94bbc25a667d58a2a8db91434b3989b08393b896a1473f1c4cfbf1309253adf794c50515a2553ddf2ae593553536b130727f165d6f705
 EBUILD doxygen-9999.ebuild 2892 BLAKE2B d9fa09ab0c9ea4d8771ec6e6a4f290aab7ca37ded9281469a1035e3d3fda477d60f7241f0ac8f40ada6ca643b308b2048c11477d5bfd737f20983bb4031bef00 SHA512 6781ed49e6a4020ab732b7ff69aead2127660d51f37150eec6c97a4231d3c266c7dc51f66918f52ed35f5b37e9d1ec376dab75a046872efb206fb1ef5661f7ad
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
deleted file mode 100644
index a2b7e8c08367..000000000000
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 latex 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
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-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.15-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-LLVM_MAX_SLOT=9
-
-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)
-		)
-	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.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
deleted file mode 100644
index 5ad7097b6d4f..000000000000
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 latex 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
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-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.16-ghostscript-compatilibility.patch" #695710
-	"${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-LLVM_MAX_SLOT=9
-
-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/files/doxygen-1.8.14-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
deleted file mode 100644
index 8680d19dd46f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 19 Mar 2019 10:42:24 +0100
-Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
-
-the `declname` and `defname` should  also be converted (compare as well the routine `generateXMLForMember`)
----
- src/xmlgen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index 420a653fc..568e48886 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
-       }
-       if (!a->name.isEmpty())
-       {
--        t << indentStr <<  "    <declname>" << a->name << "</declname>" << endl;
--        t << indentStr <<  "    <defname>" << a->name << "</defname>" << endl;
-+        t << indentStr <<  "    <declname>" << convertToXML(a->name) << "</declname>" << endl;
-+        t << indentStr <<  "    <defname>" << convertToXML(a->name) << "</defname>" << endl;
-       }
-       if (!a->defval.isEmpty())
-       {
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
deleted file mode 100644
index 54c0a96e5e1a..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/addon/doxysearch/CMakeLists.txt	2019-04-03 18:43:47.995610511 +0200
-+++ b/addon/doxysearch/CMakeLists.txt	2019-04-03 18:45:27.730609191 +0200
-@@ -18,6 +18,7 @@
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-                       qtools
-+                      pthread
- )
- 
- add_executable(doxysearch.cgi
-@@ -27,6 +28,7 @@
-                       ${XAPIAN_LIBRARIES}
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-+		      pthread
- )
- 
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
---- a/addon/doxywizard/CMakeLists.txt	2019-04-03 18:43:59.139610364 +0200
-+++ b/addon/doxywizard/CMakeLists.txt	2019-04-03 18:45:14.151609371 +0200
-@@ -102,9 +102,9 @@
- )
- 
- if(Qt5Core_FOUND)
--  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
-+  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread)
- else()
--  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-+  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread)
- endif()
- 
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
deleted file mode 100644
index cc0704b440f6..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Mon, 9 Sep 2019 13:28:28 +0200
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
- broken index.qhp
-
-Ignore automatically generated anchor names when importing a tag file.
-
-Upstream: https://github.com/doxygen/doxygen/pull/7250
----
- src/tagreader.cpp | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp
-index 56dbe7df9..d79d9b5c5 100644
---- a/src/tagreader.cpp
-+++ b/src/tagreader.cpp
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
- 
-     void endDocAnchor()
-     {
-+      // Check whether or not the tag is automatically generate, in that case ignore the tag.
-+      switch(m_state)
-+      {
-+        case InClass:
-+        case InFile:
-+        case InNamespace:
-+        case InGroup:
-+        case InPage:
-+        case InMember:
-+        case InPackage:
-+        case InDir:
-+          if (QString(m_curString).startsWith("autotoc_md")) return;
-+          break;
-+        default:
-+          warn("Unexpected tag 'docanchor' found");
-+          return;
-+      }
-       switch(m_state)
-       {
-         case InClass:     m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
-         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
--        default:   warn("Unexpected tag 'docanchor' found"); break; 
-+        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
-       }
-     }
- 
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
deleted file mode 100644
index 55445fa19dc4..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 12 Nov 2019 11:42:22 +0100
-Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56
- -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
- _form0.ps. Check your installation!
-
-@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
-* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
-* misuse / unnecessary use of `--` and
-* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ).
-
-> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
-the -- isn't needed and is what's causing the first problem
-and file control is the new bugbear
-
-The suggestions have been implemented and test / docs works now with old and new version.
----
- src/formula.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/formula.cpp b/src/formula.cpp
-index 534f56ac..3d8e6ce1 100644
---- a/src/formula.cpp
-+++ b/src/formula.cpp
-@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
-       // used.  
- 
-       char gsArgs[4096];
--      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
--                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
-+      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
-+                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
-                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
-                     formBase.data(),formBase.data()
-              );
--- 
-2.24.1
-
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index ac514cb0a34e..2f1ca158e1fa 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,9 @@
 DIST gnucash-docs-3.8b.tar.gz 71058053 BLAKE2B 0a69db02faf6487f2ecc1b5f9a788fb50cec65ff7db53ca9ec6048510156f094c0ce457d1abb4a9a6694060f68780c0336de41dbd0736ad93055cce81b3a66ab SHA512 3c30e88412e17960006517fb7c341220159c45760ca28c79c27c66551451c8ec14e000757f4d9a78c923e10d437351e38dbedaf0a1f3b11bbf5b87d80cb230fe
 DIST gnucash-docs-4.0.tar.gz 62498230 BLAKE2B 39d711267a7ec0d45915659db8557fd2871c295aba82601c34878f56c5a24b0f56ffa68a4597e464050e3e59f62411ae6f5efc0870bea2fa46f313f58ed3826b SHA512 4aa4510b86a6bf3a217c9809b73166c0ce777b9f5a506c15f51ca80a0aa45b93e774e1b7c07571ceb0aad6b6df67a4f268d5498874d23653cb0c94620f491d1d
 DIST gnucash-docs-4.1.tar.gz 62496616 BLAKE2B c1868c5a639c12fbc77dd8c46d504d9aa66574d577068c781f5c652ac3b385bffb61aede88953f0c9e89369b71d92ee94c7aa553b91e0adcfbb99b43244ce8b4 SHA512 dc63650ed989eec273ab720f802bdcbfdd3041bc4f6bedd02a4575cbc337eb2f264aa05986ecc99e4c7d3007827b213a0f306e3ae38821950dee17bb21b10615
+DIST gnucash-docs-4.2.tar.gz 62497632 BLAKE2B 764387cbbc1d072ac3e245a86b78eb484cfa05371dcf4c17d0441bf08e00f85523975c50a88ecde24e9d949572228a723d53fcce7df397553b0e50145be28686 SHA512 e54082dcd7f92d7ca3f31cea5968ecd4167dc9e1e12f23d8684af3e2af4c696d8afed3cf477df771bb11da125ee5887d09ead1edff961ca4bedfb58fd61efdf2
 EBUILD gnucash-docs-3.8b.ebuild 1358 BLAKE2B 4abd2b5b72ac0e1caa7a6191c49d08a7390dd348d21c5bcc5716deb77e94d1fe361a9a7f1edb1f4ab2efa0f5632706de1cad47d721d257fb1732566a31ebcf96 SHA512 8b14c904744631998045641d2b429a61444ae7510feadd629da206ef73dc9e9e1d04234af3e92caeca6e510f58bb52eadd5f39e0cbece050210dfc09198b6afa
 EBUILD gnucash-docs-4.0.ebuild 1360 BLAKE2B 9b1ad2c3c66b80aeea946c6ab8fdd0d7434ae68f4d98eb38b28269442917d51838c571634774c36a2a0c5fc4a5010916f580d416a8f1a2d3f6d7e59d649958cd SHA512 b96c389704240d71671d0405f7d9c9958ae7b59005188a6992b1b5d45bc1e6a61be692743b233ad10869a6c1580105af0c0da40dc6e6f007870271612fd1b194
 EBUILD gnucash-docs-4.1.ebuild 1367 BLAKE2B 0e0bb4ed0af46a1e10e7365ba5dbf9a33cf91fbc65e93fc7c438e03f54c04530ebf8ac6e283ce38b48c46c6bbda798903cd0f5ccd303ceb8301144db1c40e597 SHA512 c397fc4a1c18451afc82f46bc473891f34c4ec7b88cb13963f89468999a97777ae91aebdd2a56a37049bbb5605ddbec34d3628265dc69d24bd2dfc2cab0b403d
+EBUILD gnucash-docs-4.2.ebuild 1343 BLAKE2B c46ac8fa92d1ec0de53af5d87e7a3933a0dfb9b98dd5e3bf9679866b9cb84019c04116a4e512711124099c82d33dc2ae2c715ea0a456eb99b3a9e3b5bbac447a SHA512 d9a6f39428961e0926016f467f4c9b4ce59a8f2cb4c42aa834cd398c6e01a98b0de6255b3fd7135f16dc77e1376380f34ee12ce51ee497be18f029973be8cf58
 MISC metadata.xml 330 BLAKE2B 17393892e962f0d868534c6908a6f6f09c4237cfdf81530b81e572f0fdac64495378d545ca214afc451a6323b97c71328aa1c6a8eda81773cb1d77c358e11bd1 SHA512 fa496247f2026343323b8ff8664fb8018316ebcbf14b88b1c99a649805cefe962d773c4d2aa35b266db2942b78d1fc450f200dc065fac48ebfb2113b5d6e8a98
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
new file mode 100644
index 000000000000..c9d4be30803b
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools optfeature
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://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 ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; 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 "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index c147661528b3..0aaf11f90040 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,5 +1,3 @@
-DIST halibut-1.1.tar.gz 956743 BLAKE2B ba96e2847d57fd6736e7d3a3245527045fe0765c6fbcc857d3af1daf4d249ac81b5442d0ff1c9a00a153b970d83dbab59ab9430ff6cd53d7164cd7aeb4441c22 SHA512 01b0563ebb3678dc1ff1cef1d752d5ebffed70ef73a10d8266d84da3b4401006b686104bbe3e1984ebd3a54254f16d008011b3be8c29a3b9f1e3a033d61cdb15
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
-EBUILD halibut-1.1.ebuild 665 BLAKE2B 8507499b6f4279423a56b4947d15fc4f3ff2980cc27627a05fbb3c16b172ea0926f0716f308ba152367d39e1f1dd473cbfca1e549a451e4d058d30fa132d4459 SHA512 65d94c72c620267775fd55ce0d17652c1eccc83501df919b8591cd5b7a36e182f124b2332f075afddc3128b3f3fe40c80ee0af6a4dbea98f5293a2a363cf7739
 EBUILD halibut-1.2.ebuild 850 BLAKE2B 7b224fda43aef3ced94758cc7cb7262925b19d19e109fe51c72f629401bd8aa518f42fe8279f12048fba57197503503898d6cb6dc7d116bf6e5e050d85e63898 SHA512 d1e38ef45fc876a9484b8cc005f77c98a72db671b4c35aebd5392268817e0d7f4f798f321f4a5113273a6763beb262d2fdde4e11739ce05f6d86c2874ee5d4f4
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild
deleted file mode 100644
index e5cc35e2aa70..000000000000
--- a/app-doc/halibut/halibut-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LFLAGS="${LDFLAGS}" \
-	emake -j1 \
-		BUILDDIR="${S}/build" \
-		VERSION="${PV}"
-
-	emake -C doc
-}
-
-src_install() {
-	dobin build/halibut
-	doman doc/halibut.1
-	dodoc doc/halibut.txt
-	dohtml doc/*.html
-}
diff --git a/app-doc/php-docs/Manifest b/app-doc/php-docs/Manifest
index ee9ef710228c..b8c1b47a2a7a 100644
--- a/app-doc/php-docs/Manifest
+++ b/app-doc/php-docs/Manifest
@@ -1,22 +1,11 @@
-DIST php_manual_de-20101029.tar.gz 6041947 BLAKE2B 9ae8dcc78048854ba75362bc6df7c728b6ae3d373e71e679e4993e38b74ae3b23dcb572196de6fa159305803ddef316f279c89fa49954391f4f9c83c23ed805a SHA512 8952ea2d9abce15b23a9e045003caf4101b991439e088d3fb8cc7318e5a46d85d0e76be944d3e73124ff759f9b69fe52ea6f7b566eafbce16b0ca400968a95bf
 DIST php_manual_de-20190203.tar.gz 13299458 BLAKE2B e652510e09d0c19e42aa4726099ef6e7c2abd49f12224599ca0e03727ee85f83bb8dfd51228c594de53a36fdf205074165325502f429d79c02f122744e034960 SHA512 ad41113cdd2bd81f3646b6ba66eaf2b7453ab4adda69c981e12e24f35cb06fefb6654e393e243c752e93fb7000704514fb7c2091220de2137c6beeaa16701157
-DIST php_manual_en-20101029.tar.gz 5973968 BLAKE2B b522a91f11e063062d0f286864fe6fc29d01b251a1f5fb10ceb59e9de22fa50a3ef7ccf26083ccc5afdb9caacfdf7c201ab05dcd13ab1a3f262125d588b28fb1 SHA512 548e279a1da43d9560f207aa5dfa756e304f1ce03da867c017e3cd20b6af7706cdea7d1337450294d14b676ce6d8adf84e1fbbf41c60e936d1b95c2d8a4d43db
 DIST php_manual_en-20190203.tar.gz 12680692 BLAKE2B f0257b0abf587384be484a51a8c2963aa6ee8dd9a6c4ebcdb01a601b962a85bee3305f4880a2ce3e42d3ed75a50d85e8cd1e3363eb1d5a8888737e1fe56810cc SHA512 cbb57dd10362739a5677540d7a92c4c7210abb90a8356a52d2080100beceb2fdcaadd554e2aa7b71be17221f9a40d0881db2308900b05542578d540ff6933fad
-DIST php_manual_es-20101029.tar.gz 6205922 BLAKE2B bc553e853d5e71a1dd2630d49c9c7e1c652b6d39a4cde597090693cea8c8b44e19a020282d03cd1c1cd416feb52f29ad9b790845e5ad6df9259bfe695e9c13a6 SHA512 5af13dad3b3a9a42404227e04b1912276b68c3021b20f0efe3b4ef16d06f1b669b0c392e3ce697b7796a54bca94b2a6ea73872751bb540c5be722faa1ba19c6f
 DIST php_manual_es-20190203.tar.gz 13014398 BLAKE2B 61c66758b1a67e2edc6ba1b8485ebd273c5dcc3739b2e1536f695ec062f50faa7e2c82a1f033af8e39853f398a03ead0c8982493d2647c9c101bba2b2a439594 SHA512 55e7866ca091c1413a1da70e8a089e850821c9965d4be25311e17aa5ba66bd7df49f73f9ce7c0cf470344e5065525e18a5e89968256c6cecd60c53d952570eb4
-DIST php_manual_fa-20101029.tar.gz 6074998 BLAKE2B de3c8a2dd220d52399e96e626e25b4d111e42598f8dc813970dbbc2e4b28d05de7134f97d4a2e67064461df378d7c14ff9ef7b901c4939e8c61eb2bcf05d8ed3 SHA512 68b39bdccf7d8ef852022a1985a66ca50585299bed0278fd4156ec06000ce3035324b533f1ca7d8fe7936893359895b3faf422c5c53c9f91a062fc541c88abf9
-DIST php_manual_fr-20101029.tar.gz 6020868 BLAKE2B e4c8604f246c1b2e7526012ecfaa0d6e35b5770308ac2a02b2523cf04afae0ff87d62f6bd8abcd97f3e1194a56eaaed33f0b26f33a97ba87b68226d430c27114 SHA512 fea86a4694145d1740e9b0a49cc0b68e845f6c7bb261a3a9b9a92e088fce6d1c05dbab89381865b54af899122463052c83afc906db639c0cfd10b9640a3f58cd
 DIST php_manual_fr-20190203.tar.gz 13342232 BLAKE2B cda7de6c46ae6cc91d18237f75c5a27aa314f2b22deca23a31d60bae4b2cb1ab33dc64a9ac79e40d530ca3ae138c79c94e4504b0cb42579b79817280695fd1a9 SHA512 53f4efa55760cebf667e1349f5ee36133e0fbb10408478b2b5c2e7bdd06a922e5cc82d4fac5664c76967060be1b9b26d595a0377e7bc63dd44558972c9a70e8d
-DIST php_manual_ja-20101029.tar.gz 6363287 BLAKE2B 2d2f63635d53784101ca11769bb17c05af3e07ca0e51db4dca706af8d0c31ad553124f79ce889066ba06711e2e90a87307934a90f91fe4329ad555a988da6577 SHA512 7ed2f6096db23392ffae2ea050d9f6770174c733631c5c684a0f2199f40984a7f7333ee74295fbfebee2202666cf2a017a8a1ed89201245b3cef4edcb468097f
 DIST php_manual_ja-20190203.tar.gz 13651500 BLAKE2B 1bdc64ed3ddb28d26d8b6bdfc4fcfe422fd093ccf430fdee9cd30fd12d686b20c52c6ae59b7c3ad9cf55615d7f19b107422b1ba5d8204dd3225660cca740be91 SHA512 7b5b2e639d735edd090540bceb515997924a632b5e499787d340931d972b960495c3f501550e26f5746dc378424369dd5e8b6bef24bd0198e1aefaecd695cb21
-DIST php_manual_pl-20101029.tar.gz 6049947 BLAKE2B f037e98866e770f6843c018a14b8a46e61d3142580838621ab1b621c39b1262482f494c35fb4559222559bc2f1b2232c3d9e1ecbbae19cba20e3df45f83e6d1a SHA512 093c3e5707ae9ce6afc06f40b753d012d74640f76d85b1f3c24009b423f5a29a3a67d62cfd7cb1af1389f002d71312f1f735cdd31792074b673989b0efdd6b1f
 DIST php_manual_pl-20190203.tar.gz 7753987 BLAKE2B e3cb6c4e47a7a9a48de802db7dbba078853c66fa479ae439de2691580968cf9b5f5ab2f53847b405c41ded1f28cc2ede018fffeaa77f4b58a9a0a3a20723b16a SHA512 211c41be210437215337592fecefa18e63fae4f97dc5fd3276bb76c0314a7f3a6d536283d4bbe3ce22d62c12c9476eec7b13fbec739dc2fbe5e43834f8a1a5b3
-DIST php_manual_pt_BR-20101029.tar.gz 5460583 BLAKE2B 8424deb291898420cb6616caeed530e4c326a00bda1f205267ddb11db7adf2e5d2bf2d0f2f81110f18ff6bcecb2ddde2a11fee25e248a25c9d028e7f9de350df SHA512 c31c3b2f67865cb23bf4364a48c23c19ef82a6bd96d65b8fa0b718bc9e0e13e8b8444d5ff9b0d74a92d0be97b58f5757a7a4127b979f194849eb6ff31624ad51
 DIST php_manual_pt_BR-20190203.tar.gz 12165474 BLAKE2B 33216276fb42933fab079d08038465d00efce47f1018ab355fac8f7be95dbc190ce31bfb6d7c0c0edf0b06f067df54dbe213f4413bbdb4786e31bc2984c94f9e SHA512 00d1182362259ef1e0656ad7e8c042d63660237d6fee7381f73a359b7d92d7f7d5bbdd64fddb2a4b4d586d9f8ab29b5bd98acbade6bec27bdbd7a018c30d0174
-DIST php_manual_ro-20101029.tar.gz 6073830 BLAKE2B afb5996faa33106b626e1926a3f1b4c4981af80f97ca4ae30f4feb5ead2d19980e1e2c6d5cfd5779fa3bec1b2956e9bdf8c385c04bed4a6a08feb6124837674d SHA512 5ad32026dd2369479dcb324e4fc02da9199b2d977f4fde22ffbb08830cc7f91066fd45d7fbdfbf2df758e07c838aad4f6c9cf7193474a613e6461b30290e75af
 DIST php_manual_ro-20190203.tar.gz 12964568 BLAKE2B 3426d209332eb3d37084c86b0c5e94b78e2866c01d3a4c8567df47d00881184f60a93c2d96779fe814e8ddda0657f67c57b14e14a064ef81d1597ac40a35880c SHA512 3a55136311184c74f001f85bff7a79d8e268dc851d86ad07ddda9c83d8c9de5c3470feccde6a0d2cd4141f11902e68c80c3164ff96a18316d3a3ddcc983b0d50
-DIST php_manual_tr-20101029.tar.gz 6089215 BLAKE2B 0d162bf3213caa82be98e812bb7487ca1121aa33a94c4bb0131e7ed462f3b2032ff6415e9df90f2716dd6326bdb8a405e556186b296de897d316cf8417131cf5 SHA512 181f8f79be6a1e9d510b935b27f8ed88f410044ddfd7ac80e1ff69bc48f79c3b4d78457e5bf009962f9e68e38605a614a161ae3c46c836ef6aa360cefc08626a
 DIST php_manual_tr-20190203.tar.gz 12617835 BLAKE2B 413586ed07b331251106f75773cc75be5eda338d436d87254d0e373bd708620bd78280b8f97ca56784805385d2eddf85ccfc6c67a14eec336873c76bdb072986 SHA512 02d045a59cd426d963668841660c9a5a08814cb8c72dc3a39be2add9da6107bab9897c968520f6dad036ec78d8b0e3f85b9df1f2cdc5a1cafc223c9fdd717551
-EBUILD php-docs-20101029-r1.ebuild 1431 BLAKE2B a56d3f21a19b03294421be08d67c52f11fae9c2d6602d68802a5cf717a9fd39d3962ff0e8bbad770dda3d91721d3b70f242f99237946e7b7b4eb2c5a2f071903 SHA512 782dab07406e570c6959b8fadce3382b4c3fe44330f0eb5d5e941c93eed158965ed453528e90a310174c9fb38d20e1af21179dddf040c1dc422af40b5c39e597
 EBUILD php-docs-20190203.ebuild 1434 BLAKE2B 80a76ef83b26fa43825e31d2ebb92e588d72b6a5954781ed66d18ab1f394f16a49c9eefaf9e14bbdc0e25b012c3111ede8752861ef05136936df6e56dbc635fe SHA512 e32d25689b698c7f4421beeeace4d3960ab7fe320cd3f053f80ac0a28b4e35e709c3f1d9b767eab6c64b37e3a64f6045d4d39b0f20141d9ee41eb95fadb15541
 MISC metadata.xml 257 BLAKE2B e3c820c3fca86ae3d3882be99d1ab7a1da63f4f22c6ccd7e00717a3ec941459cbe5720ee2f28ee5731318ac081f6777cd64480de8b5c3953fc11c9193c0deb3f SHA512 ee4118f53c1fd95c499caa6eb3a0c523ae216df68698b601e96cd812be4483540b05eca8bb23b7377a54ab5ecb05a049ecc3027d89651bfef009f0015cfdc7e6
diff --git a/app-doc/php-docs/php-docs-20101029-r1.ebuild b/app-doc/php-docs/php-docs-20101029-r1.ebuild
deleted file mode 100644
index 1b0750078565..000000000000
--- a/app-doc/php-docs/php-docs-20101029-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="HTML documentation for PHP"
-HOMEPAGE="http://www.php.net/download-docs.php"
-
-MY_PN="php_manual"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RESTRICT="strip binchecks"
-
-LANGS="en de es fa fr ja pl pt-BR ro tr"
-for lang in ${LANGS} ; do
-	IUSE+=" l10n_${lang}"
-	SRC_URI+=" l10n_${lang}? ( http://olemarkus.org/~olemarkus/gentoo/${MY_PN}_${lang/-/_}-${PV}.tar.gz )"
-done
-
-REQUIRED_USE="|| ( ${IUSE} )"
-
-# Set English to default
-IUSE="${IUSE/l10n_en/+l10n_en}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	for lang in ${LANGS} ; do
-		if use l10n_${lang} ; then
-			mkdir ${lang/-/_}
-			pushd ${lang/-/_} >/dev/null
-			unpack ${MY_PN}_${lang/-/_}-${PV}.tar.gz \
-				|| die "unpack failed on ${lang}"
-			popd >/dev/null
-		fi
-	done
-}
-
-pkg_preinst() {
-	# remove broken/stale symlink created by previous ebuilds
-	[[ -L ${EROOT}/usr/share/php-docs ]] && rm -f "${EROOT}"/usr/share/php-docs
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-
-	for lang in ${LANGS} ; do
-		if use l10n_${lang} ; then
-			ebegin "Installing ${lang} manual, will take a while"
-			cp -R "${WORKDIR}"/${lang/-/_} "${ED}"/usr/share/doc/${PF} \
-				|| die "cp failed on ${lang}"
-			eend $?
-		fi
-	done
-
-	einfo "Creating symlink to PHP manual at /usr/share/php-docs"
-	dosym doc/${PF} /usr/share/php-docs
-}