gentoo Easter resync : 12.04.2020

6 files changed, 194 insertions, 19 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index a2fc64d2e3f3..419c88fc11e1 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,10 +5,13 @@ AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de7
 AUX doxygen-1.8.16-fix-external-tag-files-with-TOC.patch 1968 BLAKE2B 739a9ace2ca96be8b696e7ac24f5ec1303e26f6f02250d5cb8eb26bbf41931905c976ceafd732daedf8260d1e19b4a056a779d984712bcc966c45d8a942ca151 SHA512 a0055694b216a89ccccdc763d02be92fd582f2230bd600062c8043afaca199502a2764eb19570ca0af4db4d43040d4f77e1ed5d5ff006d45747941c654f734ea
 AUX doxygen-1.8.16-ghostscript-compatilibility.patch 2046 BLAKE2B 5d2016db1ff06329347ad653537f00c9e5d0de74cbf07c9b1b988b24f140f7a5db136a6dde2fd1ee4cfa935d99cfc81196bc4ede8d32ae6a0b9b37c87b04c547 SHA512 398db683a53059a051b1a123567e870d9f46fb637716b3665af2fadfbd69de3297f4df5beeb7ed4faa38ef762775b7de0aea91fc00abb938059af693ff8cf75a
 AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
+AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
-EBUILD doxygen-1.8.15.ebuild 3189 BLAKE2B e1cc31bd9a61ac2b13f33919519ee1411805dfe89de013831ce7194ca88bdf1329f00b9c5716e9f84c91c527b632d9d868f8fc4fb96cdd66eb862d97d8424003 SHA512 3653836afac52091fa525db6061713e5f0d3a1c8aef6785b93a120985f6e0e6db1b5818a9288b219d6ddb52b33321c2eddd3848581bfc9a2fc7f687132dadec8
-EBUILD doxygen-1.8.16-r1.ebuild 3362 BLAKE2B fc150f8a64e316f2748e0f8f273ce6ea123eea3d4e1f399dfb9258640449bbddae5f881f9f137e8c91591fa90b91ad4c8eac2f4b5bbfab2b85932db16d6d2f86 SHA512 3ba6b25e61f3013b246ed8ed47f3375899eb241907f4775869f40b8af78b2e671308569b9d6f1d700b999ec57dabbf51aa403339912f71a6e8a8fb2446e41849
-EBUILD doxygen-9999.ebuild 3063 BLAKE2B e01fc81674107aa6fe15df433a1bb43bf1de8530ba132731a6fe4bc8c57b3a062afbf9cbd9af4c0d143101a9072235058390db7da833c0343f175c0ae08894e2 SHA512 e2d761c8bbee9fe6d612dfe920e2573d0a4afc119345a441965b70dafcba18d624107eadca30bc144e9e59ed109dc15f5951e0a677836b275ff688580fa278a4
+DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
+EBUILD doxygen-1.8.15.ebuild 3233 BLAKE2B a93bd53bf77ef393c5bc970d20d381f332011a7372337d1d82d08e6b979924e89d03a23ff79a94d869aeb36591255bcc0e064a497dabe47a247affaefa9b3a1e SHA512 81db790474ec2f7d5ca3402aa2d0d63d1db555ea7d667602651bd2b770b6ff9dc737e71c9551bd97f7a84b2cbf4ef4cb413ff789fb9d845a401df49f5b6265ab
+EBUILD doxygen-1.8.16-r1.ebuild 3412 BLAKE2B e02757346d65321ed8de563357e045c9763dd89b27d70b53c6b51f06e596348c7f80db9029c118651680772164803cb3db6d809c3ebc7816292e49ea087a8048 SHA512 6bc44aa0237b9e5b4990d3e7225f5edde22cafb17986be67e318166df2682a6e41641e172d1163e2b849e308b22e4785fb02d2323c3b1242d0ab09e62c87bf75
+EBUILD doxygen-1.8.17.ebuild 3251 BLAKE2B 793739a8691b948f9988e0ba4e6fdd860b495897a7bf19623edec782e95922d273065157867812e95e664c61d38b5737c158fa67849a3ad3aad752625c87523d SHA512 95e931d09b165e088789d17ccfb6c3577de843c6107b6a8a053ad6d6ac53bf8c36d081feae3c000ef70dcb97367fbae614afd4e5f917c30dc9646ef578613e1d
+EBUILD doxygen-9999.ebuild 3093 BLAKE2B 282ba5466330d3aea8da06bd9d3521a2818a29f2180966755e9a09e1e9b9712b223af389b040463fe6ee6d53e4073bcf6002ad272774e34e6025388ecfeab887 SHA512 1dd80c93528751700397fd8be760f324dafe186700f2c381e9c95ecb788e2ca7326e99c138ebe242bdfccbf951e47b9e7afac305467f7eed4c0127f94c273bbc
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index 494edad1726e..a2b7e8c08367 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -6,14 +6,14 @@ PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -27,7 +27,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
+	clang? ( <sys-devel/clang-10:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
@@ -67,7 +67,10 @@ PATCHES=(
 
 DOCS=( LANGUAGE.HOWTO README.md )
 
+LLVM_MAX_SLOT=9
+
 pkg_setup() {
+	use clang && llvm_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index e3fc34ade516..b8c0b38010ea 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -6,15 +6,15 @@ PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 	SRC_URI=""
-	KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -28,7 +28,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
+	clang? ( <sys-devel/clang-10:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
@@ -68,8 +68,10 @@ PATCHES=(
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
+LLVM_MAX_SLOT=9
 
 pkg_setup() {
+	use clang && llvm_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
new file mode 100644
index 000000000000..e99b4196bcf1
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils eutils llvm python-any-r1
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
+
+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
+	)
+	doxysearch? ( dev-libs/xapian:= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	doc? ( ${PYTHON_DEPS} )
+	${RDEPEND}"
+
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="test"
+
+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.15-llvm7.patch" #666692
+	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+LLVM_MAX_SLOT=9
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_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-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_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
+		cmake-utils_src_make -C "${BUILD_DIR}" docs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index fbce5ffa6dd3..791480437ff3 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.doxygen.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
+IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
 
 RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
@@ -33,14 +33,14 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( dev-libs/xapian:= )
-	latex? (
+	doc? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
 		dev-texlive/texlive-fontutils
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
+	doxysearch? ( dev-libs/xapian:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
@@ -49,8 +49,6 @@ RDEPEND="app-text/ghostscript-gpl
 	sqlite? ( dev-db/sqlite:3 )
 	"
 
-REQUIRED_USE="doc? ( latex )"
-
 DEPEND="sys-devel/flex
 	sys-devel/bison
 	doc? ( ${PYTHON_DEPS} )
@@ -59,7 +57,10 @@ DEPEND="sys-devel/flex
 # src_test() defaults to make -C testing but there is no such directory (bug #504448)
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
+)
 DOCS=( LANGUAGE.HOWTO README.md )
 
 pkg_setup() {
diff --git a/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
new file mode 100644
index 000000000000..285ea16ac96e
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
@@ -0,0 +1,27 @@
+From d7b0a0ef152312b9242cbbe7405ee49310e7909e Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Sun, 1 Mar 2020 11:50:14 -0600
+Subject: [PATCH] CMake: Mark the libmsc library static
+
+With CMake 3.16.4 at least we end up with a shared library and
+subsequent linking fails.
+---
+ libmscgen/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
+index 079fcfc..fbf3f4f 100644
+--- a/libmscgen/CMakeLists.txt
++++ b/libmscgen/CMakeLists.txt
+@@ -16,7 +16,7 @@ foreach(lex_file ${LEX_FILES})
+     FLEX_TARGET(${lex_file}        ${lex_file}.l        ${GENERATED_SRC}/${lex_file}.cpp        COMPILE_FLAGS "${LEX_FLAGS}")
+ endforeach()
+ 
+-add_library(mscgen
++add_library(mscgen STATIC
+ gd.c
+ gd_security.c
+ gdfontt.c
+-- 
+2.24.1
+