8 files changed, 7 insertions, 333 deletions
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