gentoo auto-resync : 28:12:2023 - 07:37:55

3 files changed, 161 insertions, 8 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 2fd01bc5a146..49f527f7e248 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,11 +5,13 @@ AUX doxygen-1.9.7-musl-1.2.4.patch 1126 BLAKE2B 050fa56a7786c557ce03c9275e152f2b
 AUX doxygen-1.9.8-spdlog-link.patch 1571 BLAKE2B 954d701bdcbabf8b9ebb52d4be6a947189661a55cbab72b7651fb956b53778a968c6c88fb2b3967a8bfa5f0951e9fe046e69a8567938a8243558af807d657714 SHA512 7d3d4363313ace1823b4570c94fcd2f8099f6f7ec42d45f4fd341df9071fb9807e03fe5094a12c8fcf86ca8da06aa681ac0b8e1e0bec70fe2555f70cf39c5b8f
 AUX doxygen-1.9.8-suppress-unused-option-libcxx.patch 828 BLAKE2B db41297d3ad3fca9dc5097871185f98c965ccda7e22f8c31e0b9a69fc83c90dfd32125371cb3e42ebb6b0867cc9746b03ef656861aea14dc8d17e1e7ea09780f SHA512 6c6599ddf35720abb3872fed3a82e8796edc4e6623f9e5b3930e600772c6346bab776074fc8edb20d6d9ac7c21d6c0cb86b12295c9b7649322b876bc6737065d
 AUX doxygen-1.9.8-unbundle-sqlite.patch 4510 BLAKE2B afd24516a20c4378a611c836bc51276528a3983ef21db7a036d53e910b8627f5800b871d2cd13c14fc36e04eebee8bca31c40819c9b4051b1007a3ad799351d0 SHA512 548a3e550bc552007116a9bf500e1cf953b23488e825ac2ee55ef90ae001c189e5a85f84b9957c5670be7d83166a5e8df266c6a96f8b195199d45c264b67e846
+DIST doxygen-1.10.0.src.tar.gz 8400410 BLAKE2B dc7882dfb8b023e9250592375105cc79d4744362d96f4518b931ac264259257d27e0f2c5456580f3676bb54cc29fbc2ab3b2ffc37da6441297091c60a38dc13b SHA512 885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416
 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
 DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
+EBUILD doxygen-1.10.0.ebuild 3570 BLAKE2B 771d1cf7d54824e8acd69ff052113b0789611b8366c3a59c14b1002f522a654754d682d55769426554c4c54524c34bcfb7689400480c2a524a2a47169b3a6be9 SHA512 edc9d2eb61a902f78ce7c14a5417165bf40b19b96b584409294f2c3332bf4e077df08a9ac5633b7318e20bf6648d4ce2fe2e195421268cbf035d9b43a122b068
 EBUILD doxygen-1.9.6.ebuild 3238 BLAKE2B aa62cf5aed097af9c3cb92e90f66b79de95c65df3dc89de8236e918daf0ecacf6efee9598d54c85ee71118599168e05782ca84e2e9ac7ec1a9fe68737c32efc4 SHA512 7a2d7d684f873024380e5b1bf5fa3399928feb8dd3eb1ad6af16cc1309706042c4fab818560948fa6c4c0e5d649dc528369693808674d87c8656563eee2c4e14
 EBUILD doxygen-1.9.7-r1.ebuild 3380 BLAKE2B 8f79b57f0033ba8de81fdec1d2a5ad03a81422b2ab377deadd72ef666662fe2ee1fbba8c9152f74c73a23890ac7bbdaa71219c13699a1db3eb7505a417793157 SHA512 92068fac911aa1a7ee91b86a1f365a5a1fa4293826816731eb2658fc45a4cac87817d5c6763bc71c003a19e3a73cc4a818e8c3d791f40b2dbc1de9417ec8c426
 EBUILD doxygen-1.9.8.ebuild 3645 BLAKE2B 4634bdac45681dba20d9b9858e2eaa6f71524c3811da5a033941f6d6c1f3f3e776b7006f7c8b1f6908a277bca120b996a938479e955a5010b60def1d9d69ddab SHA512 bc5ea604e02d3265acc0bddd7f8c6aeed38ff70d43871d08ec645bdbcea4f2ed1cc017677e0294ca74a8d03b7f815af01db322f789a1a8d28d7e8970b3c0da3e
-EBUILD doxygen-9999.ebuild 3487 BLAKE2B 1113fcf67834cb5029d4e3b47f7f5ecf0eec1446fbe1ce78591bdff11849f01bdc43bda032736093245dd91683f75ea5f88b8351bf0610985e5848c4eff7243c SHA512 64d81d3d35b5f3822473aa44d379a87fa89ee3c52b93a02c08b2b600a11760529815f94ded2954ce812c2acaf94cfd79dd756d898750c11d3eff1bc6863e1bfc
+EBUILD doxygen-9999.ebuild 3570 BLAKE2B 771d1cf7d54824e8acd69ff052113b0789611b8366c3a59c14b1002f522a654754d682d55769426554c4c54524c34bcfb7689400480c2a524a2a47169b3a6be9 SHA512 edc9d2eb61a902f78ce7c14a5417165bf40b19b96b584409294f2c3332bf4e077df08a9ac5633b7318e20bf6648d4ce2fe2e195421268cbf035d9b43a122b068
 MISC metadata.xml 1024 BLAKE2B 884363174e8a83eecb926c962185d1f1cc3263ed216b26e149035b47b424b5baf1da222805f5ed04f25b4e97f12c79cface7bd6ce59ca9d37388c696a9a13117 SHA512 12c91be3f02f1ef99db00a48f2dd252f4bab85078f308c921a1a07062d971090f8dd39480b5b72e2bb21f8e2df69bc10c7828c1c91f2f83ce64be50a233eef15
diff --git a/app-doc/doxygen/doxygen-1.10.0.ebuild b/app-doc/doxygen/doxygen-1.10.0.ebuild
new file mode 100644
index 000000000000..5edb5ab3c2ab
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.10.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+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 ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui 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-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+	media-libs/libpng:=
+	virtual/libiconv
+	clang? (
+		<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	)
+	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:= )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
+	"${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+
+	# Backports
+)
+
+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
+		# TODO: Investigate this and report a bug accordingly...
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen. Using -O2 instead."
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# Very slow to compile, bug #920092
+	filter-flags -fipa-pta
+	# -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+	filter-lto
+
+	local mycmakeargs=(
+		-Duse_libclang=$(usex clang)
+		# Let the user choose instead, see also bug #822615
+		-Duse_libc++=OFF
+		-Dbuild_doc=$(usex doc)
+		-Dbuild_search=$(usex doxysearch)
+		-Dbuild_wizard=$(usex gui)
+		-Duse_sys_spdlog=ON
+		-Duse_sys_sqlite3=ON
+		-DBUILD_SHARED_LIBS=OFF
+		-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 0f06fbd71388..5edb5ab3c2ab 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then
 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
@@ -96,18 +96,16 @@ src_prepare() {
 		doc/maintainers.txt || die
 
 	if is-flagq "-O3" ; then
-		ewarn
+		# TODO: Investigate this and report a bug accordingly...
 		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
+		ewarn "optimized code which breaks doxygen. Using -O2 instead."
 		replace-flags "-O3" "-O2"
 	fi
 }
 
 src_configure() {
+	# Very slow to compile, bug #920092
+	filter-flags -fipa-pta
 	# -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
 	filter-lto