gentoo resync : 11.02.2018

3 files changed, 135 insertions, 3 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index cfbf0c1e70c4..eea8becc9bc3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -2,8 +2,10 @@ AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e
 AUX doxygen-1.8.13-NULL-dereference.patch 867 BLAKE2B c8202a4cb59115f0e9cba80bdd3fc1283226bded40f40233a5c0a6f32adaa433c56f662f29441d60fed2a4b1633bc603102d22b56f09f45522ff3f94fdc85335 SHA512 e0dc00095d3955fd171e554d0984a3d41b02643da0fa64c0f2815cc16b8cdbf0645e848507e7f100ac6ffb0e3712ca2bbec7e1a81091177e39555bde0b5e3f12
 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 3754 BLAKE2B bc59c29243c1c5677e13a444dd66938a193629732e339da07f820edba720dd44621740c014ae5185008f8db97d7b32fc5bffc31472a1eea757e331ea9146e021 SHA512 dfc1ec29c888f396c6df7d9c1cc51eb221f76501e6a42ee7f4df2e2579ad7dd195ca432e150aeb534d5331f72b29effccf79bc693b271a4eaadd619780cb688d
 EBUILD doxygen-1.8.13-r2.ebuild 3094 BLAKE2B 4e77532c8bf21831d310af27e1d0025ac6b6530fc4da374a36fa1d7cc061326b36c73805454dd8b2389acea09446a534ad8eae891adcae81c0cefb671241c114 SHA512 ee8eb067c38f8fa24ff5bd4b2fd6da04e4d5b60779ae2eb44d96333e35e18e594b17d81fee700bed68fbb3b125d5d59e8449600c023b3abefc8de9e01ea133f0
-EBUILD doxygen-9999.ebuild 3064 BLAKE2B f31a65d4727ba9756ba92394c0b1945e597983b1044d05f82772f0daff1a947b29821d26a553c68a6c148d0fa892c5d6a1df2e40b5eccc5f4ada15c71d5297df SHA512 f2fa350bd4cb1630589027e2540e367216e8ef3421d63ab48a74c5b8bc2fd5a017871acf146ad9c5a810a9b4d91d650e4193200fe2855602ab08bca356dff71d
+EBUILD doxygen-1.8.14.ebuild 3051 BLAKE2B 1ae3e1b7519fbb144437162c57acef7e8dfa7a1de494ec79f35642316f4952e9e22ad1f708ea9acb17201f6e922abb496b85cb1e2e52affb05e4c72edf273298 SHA512 e8ccf14e86847880252d6384160a5f52fc2acde041daf2da116ec94c2b7a1828c25f2ed312976fd4df6a46a177842d11efaf4a60f35db0de6db5df6c6d255995
+EBUILD doxygen-9999.ebuild 3072 BLAKE2B 3c1ee0ed71e60b85f1f754c61adb91c013edfed7d66a1f45993003df30d4c6073feb540d4c78cc988bd7517583b22ffc773870baf1f108a107c372edea077bbf SHA512 5a046846eb2f7cc163f33b350c6bb1b26c8bf81109d015d9fb9deb32717f6e1ab94ca73488a99d0075f130bc4f91ea66e9b9ae82f6ecd8cccb505a0ad0b27be3
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.14.ebuild b/app-doc/doxygen/doxygen-1.8.14.ebuild
new file mode 100644
index 000000000000..502086e771c6
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.14.ebuild
@@ -0,0 +1,130 @@
+# 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 python-any-r1
+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
+
+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-4.0.0:= )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)
+	doxysearch? ( =dev-libs/xapian-1.2* )
+	latex? (
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml: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"
+)
+
+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
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 1a786a27ff25..9f082f097a2a 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( sys-devel/clang:= )
+	clang? ( >=sys-devel/clang-4.0.0:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype