gentoo resync : 04.01.2022

8 files changed, 145 insertions, 35 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index e24dce9a96ed..773db12e3d6f 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 04746dcea151..9a8637c22e46 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -6,7 +6,9 @@ AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319
 AUX doxygen-1.9.2-xml-static.patch 983 BLAKE2B 3c4e6dc68abe6c6a6e37ed1af5b41da00698ee31fe044fd98a55d29859e07412ed2e46f1706f4409d108e457c86b19daf497743594fec7bbde2a208de7ba7c5d SHA512 a7bb90fe1a3f3e9853f67ce9f754f2b26d07a0d23c33b10626b0a639623959be4b97fbb690cf5b6db3098e87cfbb54db7ce376306e0ac599defe00963bc38f49
 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.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
+DIST doxygen-1.9.3.src.tar.gz 5152094 BLAKE2B 1dabbed1058544159cf369fa1728410545d51857f053d43202fc2b1b19a7fda887fad711efa88770eac98ee7da7cf6fe3d13b03c0525db680b5f5f87f4c16fba SHA512 a4a3efac6897d9aeabc4a1eab6530883da782cdd8461c96b47a82f89328a877c91916d3a338706a8232270732efa37e9f05440cb4034976622e35f301aa1659b
+EBUILD doxygen-1.9.1.ebuild 3029 BLAKE2B 7168bb04f96402375d33bba911be7ec0c3c311ed29850a9ec8d698805d89cdaf8a1f15ebf7c3d0a640036584bdfe92607d92fb60ced5bd377d72173bc1f2a4f6 SHA512 f8fa1e53596554c2f3c935f18e7e5569ab841f331799264f8e5e6680ada1eb8e0592040abe590748b2314cd0b280b4cdbf8447dfd1c29148aad224acf7787d8b
+EBUILD doxygen-1.9.2.ebuild 3012 BLAKE2B 760c9211b7114c81cb3411e7b00aa40ea45fe275f783af0699d9d9074cb5b0733ee7dc35657101b0f944f8d4c6336b69fad5f7391727b288d2775844ed9dc03b SHA512 c2922b787f1939ee33a214e0154e463f4122940999fffc02fa29af98a59ec23adab74968826549fb4e77f2c8dd81996905ecd6988c654accec7a79788467cf5d
+EBUILD doxygen-1.9.3.ebuild 2865 BLAKE2B 8a753e312bb1329643ddb12a7ed0bcb853f2ca3fd967bdf0ede741ce91e75470a0207bb1d832e9817a7fdfff5b2b6f6d0bcdc630beac6240e1c8370afe2a05ba SHA512 fd0cdf6fb437265b32656e0e5d342209f2f722b520dae47565c800ecd9e3215f2836371168129e9342202821adf7f7136c8f9dff43e623104f43c9d82aa6e5fd
+EBUILD doxygen-9999.ebuild 2975 BLAKE2B 22111db285cf2d5142ade0856732fecb0fad4b2d7825f8284f4cde29a7491d17acae5fb8513f8e0f15f9d92f43a3e93524d2d874ab0b285f409ec7330574378f SHA512 18d07bb9a0e6d320a1dfa9a904c6850a45081092de07f72b6468042346dcc731acbfd458bd31f82734bbb7ce61933eba2bed279daf924e1c51cf989423823b69
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index 7904f496c1dc..8715b2f004ce 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,14 +73,6 @@ 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
 
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
index 38d94a9243b3..b5102bf38fb8 100644
--- a/app-doc/doxygen/doxygen-1.9.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,14 +73,6 @@ 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
 
diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild
new file mode 100644
index 000000000000..e8365dcf5a2d
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 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"
+	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"
+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.9.1-ignore-bad-encoding.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() {
+	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 026efedfeee1..6fba773dae02 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -72,14 +72,6 @@ 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
 
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 737f4f30c7d6..14f294aa4d19 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,5 +1,5 @@
 DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
-DIST kicad-doc-6.0.0_rc1.tar.gz 79671406 BLAKE2B 7ab224ea2ec376c6c073018bc97f932e4097bed205ce8d92ac6b9db5db85fafd6de97a41026d890d3c38073cf410be0490f5e81f97e77c7e63d53a55ddc67527 SHA512 b8dc91daa72f46c2311675a3a4a4317fd2da5c877317e49e4f43ae85f9e1ac859405a3ec35a5fa6fa400825ea5b45350565803efdbf459f5c87844d534cf9bee
+DIST kicad-doc-6.0.0.tar.gz 81338236 BLAKE2B 949d07a1b16635ad5be1a4855bc0c530a85c5d674096e8d1ae48e250e56168c2cb203d71a882e64c1816f0eb7c4ad1a0233be70bcbac185b2b8bb1e99b85dc66 SHA512 1f327c407b0ae88d1f13266571d978fd18fded857e63f1a56a10aa518da6ccb72e85a35215a51f4c91382f61445d141d837244699e932f411f6522bcf26290c3
 EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
-EBUILD kicad-doc-6.0.0_rc1.ebuild 1867 BLAKE2B 0dbade7efe07859da30b7b51ddb40114902116bf5e9795422adb09c4aa418a86d1c3c723dc4eb582595a31cdb4bca98223d2df8227f1ce00887b751b7c7bb8a7 SHA512 10584407d37ecde537e2046dd17659560c1eeeeb2c6f9cea3f70e9207fc64fab550a27d92588a8466205a4005fa5ff558be9b6d5948975c6616371e3ad87e637
+EBUILD kicad-doc-6.0.0-r1.ebuild 2043 BLAKE2B 40b1af5d17b368497a74c83b55834e97783d7caa1bfc7702795bbf531afb8914b57ebdec5b27d086419df29b2a9fcc28bf7d3143031907b54360baf3b9915664 SHA512 3773c5a2a2cd3b1d1654c3ce018be0f5a12c06821352c4c5d06c26d3268ae2c802f86ce22791084907d3cf83180f062a18d3c5cfb9fd097c89628f89d20f7901
 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild
index 9bf5e27bb2a0..a3020d2a2df1 100644
--- a/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
-# TODO: Change default back to +df once asciidoctor-pdf is packaged
+# TODO: Change default back to +df once asciidoctor-pdf is packaged?
 IUSE="+html pdf"
 
 LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
@@ -53,9 +53,13 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
+		# May not always work?
+		# https://gitlab.com/kicad/services/kicad-doc/-/issues/808
+		-DADOC_TOOLCHAIN="ASCIIDOC"
+		# Note: need EAPI 8 usev here, not pre-EAPI 8 behaviour
 		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
 		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}/help
 	)
 	cmake_src_configure
 }