gentoo auto-resync : 30:12:2022 - 02:16:21

4 files changed, 147 insertions, 6 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 02309985b38d..f261d04d0249 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -2,6 +2,8 @@ AUX doxygen-1.9.1-do_not_force_libcxx.patch 670 BLAKE2B e618f7acba8e4c7910b8f560
 AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319b45ad6c3f66c937a2a133eb9c76d38455f71cbbc1ee830e5e632ce36ab2a2906a67b1c676d60c02d0696a9da75862ea4197e209b1 SHA512 71cc9c54bc40f6719c64874e2bd9355cda47c87affec7f3e551fae06cb27bd9c569bffec03d2594c2f1a0190c6975123270fb446c62d8c1fac4c2834c7adaf80
 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
-EBUILD doxygen-1.9.5.ebuild 3274 BLAKE2B c54bea1e600e0310ddaad3acf1430e1254500f2ddbd2d47bfa7b58b4ac1433cda785b32ba8f27e37163ca2827fc53ef8c46e9f2af1e266ad59a67126893c7f8d SHA512 2ecb36aac685dd95cdeae54ca2f0c65616d156e62276c8d487e66cab3c857e683c0abcbfa6ae1ce488f74ebde00397c8eb4cb03dea5ffae51c3b7a86a718ec63
-EBUILD doxygen-9999.ebuild 3275 BLAKE2B b6b9fd2af556b70b4efe1bb26a373d3f0d60b5271b823b6cbb987379b96c3f194a68985b3639b7023e50a8be6e064ee13e1f1ef9ab90e12890c79ad81e36f208 SHA512 a9b2cbfb30c4908a08d5c87adef2c7f25fcd9cc9ec51022375c36777f7d995f4aff9caca67c3566ad22c74e50ccb67c10fcf323bf6fdd6279e207384009ed61d
+DIST doxygen-1.9.6.src.tar.gz 5293513 BLAKE2B 35d3286b47922776814bb7941c7a1cb27a5a50be35a9f231b1f072333d966630bbf0b97813f56711f71f040a0ceb87e7e1cbee04ca2aa3f035754ba844561697 SHA512 f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
+EBUILD doxygen-1.9.5.ebuild 3275 BLAKE2B 46b212764dbf10e6e55e819c8973287228b560d0bf319ed1d5a5e9ec693342cdce497b04696e17d26db7747192335f89327f3908e8f140154257b1b5cc76164d SHA512 e14589a078926bf645f7685683e0ea1658adf89928d01768bf412ddff51725329cacae6ee92e075aa50e8253aa8f505c021e1e9b44de7cbbc420e3388ec9015a
+EBUILD doxygen-1.9.6.ebuild 3283 BLAKE2B a88f7a5f318a3b85baaba100e52481128c4f8f2891f95c0ccc1d32116bb4a675ab3625c86eb29d46494b202f8bd6b0b71be1dd07b114db3ba91911bfa6663398 SHA512 b18393fcaf4e95cf03dc14477fbafb7041e6b0a8d5e2699dd635fef42210b384d586aa409fb24e6e1ef5ff1203830941dd535ea89ca86760b0915b405ef61a32
+EBUILD doxygen-9999.ebuild 3283 BLAKE2B a88f7a5f318a3b85baaba100e52481128c4f8f2891f95c0ccc1d32116bb4a675ab3625c86eb29d46494b202f8bd6b0b71be1dd07b114db3ba91911bfa6663398 SHA512 b18393fcaf4e95cf03dc14477fbafb7041e6b0a8d5e2699dd635fef42210b384d586aa409fb24e6e1ef5ff1203830941dd535ea89ca86760b0915b405ef61a32
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
diff --git a/app-doc/doxygen/doxygen-1.9.5.ebuild b/app-doc/doxygen/doxygen-1.9.5.ebuild
index c291cf15ff61..b781168cede6 100644
--- a/app-doc/doxygen/doxygen-1.9.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.5.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
+HOMEPAGE="https://www.doxygen.nl/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-doc/doxygen/doxygen-1.9.6.ebuild b/app-doc/doxygen/doxygen-1.9.6.ebuild
new file mode 100644
index 000000000000..34ed66144605
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.6.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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/" \
+				{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 27307799a712..34ed66144605 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
@@ -13,11 +13,11 @@ 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 ~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"
+	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="http://www.doxygen.org"
+HOMEPAGE="https://www.doxygen.nl/"
 
 LICENSE="GPL-2"
 SLOT="0"