gentoo resync : 07.10.2018

6 files changed, 33 insertions, 185 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1758a4b78516..f86c74b6ebbd 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,10 +1,7 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.13-NULL-dereference.patch 867 BLAKE2B c8202a4cb59115f0e9cba80bdd3fc1283226bded40f40233a5c0a6f32adaa433c56f662f29441d60fed2a4b1633bc603102d22b56f09f45522ff3f94fdc85335 SHA512 e0dc00095d3955fd171e554d0984a3d41b02643da0fa64c0f2815cc16b8cdbf0645e848507e7f100ac6ffb0e3712ca2bbec7e1a81091177e39555bde0b5e3f12
+AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b5692f3b999bbe1ddf9eeae2e7a75751582e513e9ba2a2ca6f06f50bccc6c939ec211a879111961abb09882bb8e12d SHA512 c43e295cf7b31e7bd4374c105a9f41622dfeca6326de85a9ba62cbe0907cd7526a8393afbea380c5c662235b09aba1460f0b50a9d9cbc86fe0c9830c9dd1ca10
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
-DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
-EBUILD doxygen-1.8.14-r1.ebuild 3065 BLAKE2B 1671edff9b1cd246347ba57cdadf6b94852abff5a2a65fecb348eae4ad4052b204e6fe51ae1231dd260fc53a2048e3817d5cea2b02e9c21477e5d7d1ddfb2ae2 SHA512 684e8c6f3409b840254c6599b87bc67b17ed5e9a41bf90b9112419d0c0a62b6de4316efd1f45e7a1929e1474e40e42bfd1b5b159e4f79b6a55a3d5a55702614c
-EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
+EBUILD doxygen-1.8.14-r1.ebuild 3112 BLAKE2B c67fca40e309eb29b18fc982ff2e90a5eba9358d28ed78a2fd65a80e21a029b7f5f6efc8ea2ee304402acec9f5203960ee14ed4e58a43eff4919f012fca180ca SHA512 a22f0f29b0eaf2a8fefcb6c2cfccd2faa4312c91cfeb35bc05f28902046086baddc5d7e05a972dfaf394508d43c5f0661a646595ef93b7fd791058b1428376f5
+EBUILD doxygen-9999.ebuild 3094 BLAKE2B 38b34c1cdcd21317af407421b426fd35cccbcd5239c32651acbad713d94e92e2e16abaf7b8b2651158f24121a67f882a631dd81db010fe859e6faaf619711b2f SHA512 13e1d112c6fdab0fc7a6b7fed37d6f174da2c4001315d19f57b647f67ebb014fc513f0b580c23afa2cf5eb7fc3f12adee9e76b3b72a5d718a47e03c1dcf0d127
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
deleted file mode 100644
index 980992918892..000000000000
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-fi
-SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( sys-devel/clang:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? ( app-text/texlive[extra] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-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.12-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-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=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-
-	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
-
-	if use qt5; then
-		doicon "${DISTDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"/usr/share/pixmaps/doxywizard.png" \
-			"Development"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-	elog "For examples and other goodies, see the source tarball. For some"
-	elog "example output, run doxygen on the doxygen source using the"
-	elog "Doxyfile provided in the top-level source dir."
-	elog
-	elog "Disabling the dot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index 4c7544e05324..dce8fc8f3c85 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( dev-libs/xapian )
+	doxysearch? ( dev-libs/xapian:= )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -59,6 +59,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
 	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 0f8cc61578a8..34ade676fbae 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,7 @@ 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.11-link_with_pthread.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" )
 DOCS=( LANGUAGE.HOWTO README.md )
 
 pkg_setup() {
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
deleted file mode 100644
index 8d72e8ff6e0d..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Wed, 4 Jan 2017 12:24:55 +0100
-Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
- breathe docs
-
-Protected against NULL pointer of variable al
----
- src/xmlgen.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index fe95c7a..70e198a 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
-     if (md->isInline()) t << "yes"; else t << "no";
-     t << "\"";
- 
--    if (al->refQualifier!=RefQualifierNone)
-+    if (al!=0 && al->refQualifier!=RefQualifierNone)
-     {
-       t << " refqual=\"";
-       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
new file mode 100644
index 000000000000..86e6d7999418
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
@@ -0,0 +1,25 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5c55efae..1ad32b2e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -262,7 +262,7 @@ if (use_libclang)
+     add_definitions(${LLVM_DEFINITIONS})
+     llvm_map_components_to_libnames(llvm_libs support core option)
+     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
+-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
+ endif()
+ 
+ target_link_libraries(doxygen
+diff --git a/src/clangparser.cpp b/src/clangparser.cpp
+index 77151d6e..2ea15ee2 100644
+--- a/src/clangparser.cpp
++++ b/src/clangparser.cpp
+@@ -4,6 +4,7 @@
+ 
+ #if USE_LIBCLANG
+ #include <clang-c/Index.h>
++#include "clang/Tooling/CompilationDatabase.h"
+ #include "clang/Tooling/Tooling.h"
+ #include <qfileinfo.h>
+ #include <stdlib.h>