4 files changed, 144 insertions, 3 deletions
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index bb87d457476b..41ecfdb99c7d 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 979adec1e71a..19b060a3e366 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -3,7 +3,9 @@ AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319
 AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee9021f16e7e119a660d5d8657f320686c0d86c29b5695f367c2af2846e9861bca5a70889b6dd56a9734485527ae504a134e30594 SHA512 f9a1089585f83a09b89c813f51bbb7914fb27be2b3e554148387fd322c88153c2aca1af4215d90b6f2fc9eae25814085fb468f0ef2dacfa092662a4609d52929
 DIST doxygen-1.9.5.src.tar.gz 5251459 BLAKE2B 46ce6c767ec60ba4b4e2d4e343f78b401b142f242e7037ce8877a5316ad5685a7c080045de793aa8fc1334cd593f9ef5f55d1b6259cb8966ce0b804c8860efbc SHA512 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651
 DIST doxygen-1.9.6.src.tar.gz 5293513 BLAKE2B 35d3286b47922776814bb7941c7a1cb27a5a50be35a9f231b1f072333d966630bbf0b97813f56711f71f040a0ceb87e7e1cbee04ca2aa3f035754ba844561697 SHA512 f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
+DIST doxygen-1.9.7.src.tar.gz 5736446 BLAKE2B e0f6e06399a2dda7226fe8fea351a79f19bf71aee51fba0ce113c3423b85aa633ce8d98894e3e49027839c2accc18af87c7f23a1fd37c0de441de42a8a76d307 SHA512 618ff58aa6f0a2eb89f95b570995ea3ebbcda64f502cabcecd9be2967abffb56d0d6747de0c06df422705919757e6af9c6e5a56ca603b1ddf7a09a7ee79b1803
 EBUILD doxygen-1.9.5.ebuild 3275 BLAKE2B 4f665bf1cfb27a6c36e68b6301007c905883b4690eb0fa712c60ea1f1bc1e6edce847896c28cb5ac112fefdf83708739685d881f19cbe1470eb61498b3097b05 SHA512 b59b9ef8ae3fe70b607e22a9a0509974493acaef155a297e704e06081959ff8caf4886efe4ad81eb2db335326de583dee363b301fa96443b745cb000c488f596
 EBUILD doxygen-1.9.6.ebuild 3283 BLAKE2B e0dc3dbb2e4a6d373b7ac2f697cee9463142a670f634f46330e6c18b2e9c78bfac097cfaaaccb62b01a7a25b8f1e22c8776a94631ad87c4ded393e90ee6faf59 SHA512 245af11743de3ffde274e4446a26ac714bbb548ec82448e2af59b4b6385e2eb0e26fe61d2a10669ad4c1be75e7dc4ca47e160efe9c864de1057573916bc3a02e
-EBUILD doxygen-9999.ebuild 3283 BLAKE2B e567ddd998e562f71a18efcd68e11219efb6ee3b6dd288864582fbd20dad7462596c5bf86b8e4008949faf29df00c5568f044bea7ed9c580c0befed467483589 SHA512 f7e3643f7f0fe381f4f4401855f5c52b7d1c498565e6099ac87ff538774d7826c01f064839c087de947718d0a34e1cc58115746f9eaf5e9273cb264c7841d194
+EBUILD doxygen-1.9.7.ebuild 3292 BLAKE2B f7c890a85e88df1ffcc8b0d594c3dc8e35a5a3bf5dab11cff6841716edf18f24365e012c8affb53a2f90b113ffcb32d38e661d0056681adc815645ea9aaf1e19 SHA512 11b08014e9716de0be7c06c3b3ec0ae6beb1d9ebfad97a8c410fda857a6bafaa32c2e43575ee7906a09ffbeab07204999a131aee9a98b0d4861c044c7ac1c567
+EBUILD doxygen-9999.ebuild 3292 BLAKE2B f7c890a85e88df1ffcc8b0d594c3dc8e35a5a3bf5dab11cff6841716edf18f24365e012c8affb53a2f90b113ffcb32d38e661d0056681adc815645ea9aaf1e19 SHA512 11b08014e9716de0be7c06c3b3ec0ae6beb1d9ebfad97a8c410fda857a6bafaa32c2e43575ee7906a09ffbeab07204999a131aee9a98b0d4861c044c7ac1c567
 MISC metadata.xml 1024 BLAKE2B 884363174e8a83eecb926c962185d1f1cc3263ed216b26e149035b47b424b5baf1da222805f5ed04f25b4e97f12c79cface7bd6ce59ca9d37388c696a9a13117 SHA512 12c91be3f02f1ef99db00a48f2dd252f4bab85078f308c921a1a07062d971090f8dd39480b5b72e2bb21f8e2df69bc10c7828c1c91f2f83ce64be50a233eef15
diff --git a/app-doc/doxygen/doxygen-1.9.7.ebuild b/app-doc/doxygen/doxygen-1.9.7.ebuild
new file mode 100644
index 000000000000..b59798ef9a23
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.7.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+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="https://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 ~loong ~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="https://www.doxygen.nl/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch qt5 sqlite test"
+# We need TeX for tests, bug #765472
+# We keep the odd construct of noop USE=test because of
+# the special relationship b/t RESTRICT & USE for tests. Also, it's a hint
+# which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="test? ( doc )"
+RESTRICT="!test? ( 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.9.4-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
+	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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() {
+	# -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+	filter-lto
+
+	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/" \
+				{testing/Doxyfile,doc/Doxyfile} \
+				|| die "disabling dot failed"
+		fi
+
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doman doc/*.1
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 68b22dcb6400..b59798ef9a23 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic llvm python-any-r1
@@ -123,7 +123,7 @@ src_compile() {
 
 		if ! use dot; then
 			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
+				{testing/Doxyfile,doc/Doxyfile} \
 				|| die "disabling dot failed"
 		fi