gentoo resync : 30.10.2021

4 files changed, 176 insertions, 6 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 3018b9bec64d..75889de32588 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,11 +5,14 @@ AUX doxygen-1.8.17-llvm10.patch 1405 BLAKE2B 553891d761117276a7b7d3c8526d902b392
 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-9999.ebuild 3160 BLAKE2B 831bf5ea00542957eca641d8c16f9ec1537c453d393ff4d2a956e1f1a8c9e74dcdca3488856fb95e34c31b8e4db6b47d63c88a1817ad5719fd34c74896b2d05f SHA512 f54e53a5596b23b88f9e134cb269fdf513902ad6b018895c48db75415ee386ebdc26fde9ea0506099ad48124047f4e8483644f234adf072f755be3ce146d0aaa
+EBUILD doxygen-1.9.2.ebuild 3169 BLAKE2B 86b7322b7572c469253051e3ebd86b7156c825458bb2c596b8e29252c89129495b46ef627296f8ae3ad214615c0add82afd210eb402a487d9c0c665f54c1a028 SHA512 17b8e12bd7d15430de20ba2cbbcf1b5bfd4cb24fee31d578621cb347069d1c4e9c09d210453d92ffc7fe9d711f231118496926f02b10aad317d8a03d3e061fe5
+EBUILD doxygen-9999.ebuild 3132 BLAKE2B 2be5f69bb3e7b13f35d8c4a09e219d5c570b8f70d78a8d985b25cb367e833dc022effe2b123c34f96510e46dae66985bf3f4acd5e0e149a369c6ed17fcae6aac SHA512 db26c0da3ae1eb4a739b4559618c1cfd02cfe0d7d07f17bdfaf1f9f727e665fe34306a77783f1c8c9e7b3a2bf41200348b853a9be0df2419eb58ac88fefb11b6
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
new file mode 100644
index 000000000000..2c63853d7323
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake 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 ~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"
+HOMEPAGE="http://www.doxygen.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
+# We need TeX for tests, bug #765472
+RESTRICT="!doc? ( test )"
+
+BDEPEND="sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+"
+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
+		dev-texlive/texlive-plaingeneric
+	)
+	doxysearch? ( dev-libs/xapian:= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
+	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
+	"${FILESDIR}/${PN}-1.9.1-header-dep.patch"
+	"${FILESDIR}/${P}-xml-static.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_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_src_configure
+}
+
+src_compile() {
+	cmake_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
+
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
+	fi
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 4ab0c394c062..e7cf3ed80125 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -11,7 +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"
-	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"
+	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"
@@ -55,7 +55,6 @@ RDEPEND="app-text/ghostscript-gpl
 DEPEND="${RDEPEND}"
 
 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"
 	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
@@ -117,6 +116,8 @@ src_configure() {
 }
 
 src_compile() {
+	cmake_src_compile
+
 	if use doc; then
 		export VARTEXFONTS="${T}/fonts" # bug #564944
 
@@ -126,10 +127,9 @@ src_compile() {
 				|| die "disabling dot failed"
 		fi
 
-		cmake_src_compile docs
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
 	fi
-
-	cmake_src_compile
 }
 
 src_install() {
diff --git a/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch b/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch
new file mode 100644
index 000000000000..a106d6eb5a93
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch
@@ -0,0 +1,29 @@
+https://github.com/doxygen/doxygen/pull/8862
+https://github.com/doxygen/doxygen/issues/8855
+
+[sam: deleted msc hunk b/c we had it in a patch of our
+own.]
+
+From 5c3a4ad2773fc911b341b36b00528603afbe1602 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Wed, 27 Oct 2021 16:41:28 +0200
+Subject: [PATCH] issue #8855 Unable to build 1.9.2
+
+All other libraries have been declared STATIC so better to declare the cmls and mscgen libraries also STATIC.
+---
+ libxml/CMakeLists.txt    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxml/CMakeLists.txt b/libxml/CMakeLists.txt
+index 96c56534f9..596ed90887 100644
+--- a/libxml/CMakeLists.txt
++++ b/libxml/CMakeLists.txt
+@@ -11,7 +11,7 @@ set_source_files_properties(${GENERATED_SRC}/xml.l.h PROPERTIES GENERATED 1)
+ 
+ FLEX_TARGET(xml xml.l ${GENERATED_SRC}/xml.cpp COMPILE_FLAGS "${LEX_FLAGS}")
+ 
+-add_library(xml
++add_library(xml STATIC
+ ${GENERATED_SRC}/xml.cpp
+ ${GENERATED_SRC}/xml.l.h
+ )