gentoo resync : 05.04.2019

8 files changed, 199 insertions, 7 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 0d5c23e8e632..36fd4b0cae20 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index ba9e2fa57de9..0d0cdb9feebd 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,7 +1,9 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
 AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b5692f3b999bbe1ddf9eeae2e7a75751582e513e9ba2a2ca6f06f50bccc6c939ec211a879111961abb09882bb8e12d SHA512 c43e295cf7b31e7bd4374c105a9f41622dfeca6326de85a9ba62cbe0907cd7526a8393afbea380c5c662235b09aba1460f0b50a9d9cbc86fe0c9830c9dd1ca10
+AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 EBUILD doxygen-1.8.14-r1.ebuild 3157 BLAKE2B db825942d875eed09a34a5fa72f82cf206361f47c4825419c11ff969f88cc56b8a1a3df7074dcb40a9eec86665539174d1560e85f0b87f0f417efe12b89b6a8a SHA512 bc6cbde8c78c47da2dfa5bd41628ceb5aa7e0eb5350b4a36fa945c950ec5bcf31306c73fbfaae15848675c702590c6e21539e8138cd268b51781d693ce76833f
+EBUILD doxygen-1.8.14-r2.ebuild 3232 BLAKE2B 985622bdd74f74b5ddbe658c0516480c0d4a779e23e3919d188a27bce7bebc00eb2cad32277fbe05a60e68861551a26bdf83640ef491600a066780ee71853ec1 SHA512 c9af3b3ed63254c49169777fc8d439caf6799820594c022839672f85113048af2e681b7602dc6a60d92405729a90921f9db7d55cecaa49cc65cf793bf30811ae
 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.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
new file mode 100644
index 000000000000..d963510d4e41
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~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:= )
+	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"
+	"${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
+	"${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
+)
+
+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=(
+		-Duse_libclang=$(usex clang)
+		-Dbuild_doc=$(usex doc)
+		-Dbuild_search=$(usex doxysearch)
+		-Dbuild_wizard=$(usex qt5)
+		-Duse_sqlite3=$(usex sqlite)
+		)
+	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/files/doxygen-1.8.14-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
new file mode 100644
index 000000000000..8680d19dd46f
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
@@ -0,0 +1,25 @@
+From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Tue, 19 Mar 2019 10:42:24 +0100
+Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
+
+the `declname` and `defname` should  also be converted (compare as well the routine `generateXMLForMember`)
+---
+ src/xmlgen.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index 420a653fc..568e48886 100644
+--- a/src/xmlgen.cpp
++++ b/src/xmlgen.cpp
+@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
+       }
+       if (!a->name.isEmpty())
+       {
+-        t << indentStr <<  "    <declname>" << a->name << "</declname>" << endl;
+-        t << indentStr <<  "    <defname>" << a->name << "</defname>" << endl;
++        t << indentStr <<  "    <declname>" << convertToXML(a->name) << "</declname>" << endl;
++        t << indentStr <<  "    <defname>" << convertToXML(a->name) << "</defname>" << endl;
+       }
+       if (!a->defval.isEmpty())
+       {
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index d8709e6312c5..87ee32246000 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,8 @@
-AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
+AUX eclass-to-manpage.awk 11006 BLAKE2B 85303c11796b743fbffdc34004984c1f2278a106730d76400fc333d7fec7c57a676eda2ff4684edfd324ccc2b6b4d759df896c88a3a095fb678f5dd24bba5da1 SHA512 a17ce9bd1233363e5d7899bcc627bdc680a149663d7fc014f5ea989bf1e5da3997d01c55ba42dfaa84e0905e07038168660075b7f5d79973edfc4e964dc2fe9a
 AUX eclass-to-manpage.sh 738 BLAKE2B 719f9ac6a4283e6795f0463073a460f35b65b6d5c020eeb3823527cb559774c2273c374ea1fbf196e4528b55de9feedce6d024c4495e76cc7c4b7cd4079da202 SHA512 9d50ca11215fc69cc6b4ed67891039f24a93d9843103ab0bb8b13f0596fbca7541da0feaa31ab236279a7047cd9fcdd4a8f9d8a249de725d69e45e6c276d49d1
 DIST eclass-manpages-20190314.tar.xz 419576 BLAKE2B baad0d5f9c67b7e4b9646e69e90583a8238590a02bb6bcc200b08f17f56b2ae50a56080526d3398623949ffc91857d944a1035d6b44fba07b17024c2c224b802 SHA512 22f4b32654f459afa8e5057f02c92628cc529f236e48a69f9b346e7bdcf60d12a4cdd71debf96e8d4b3e69b0e497feb9143b385a11d835b43d13c32fa1751d51
+DIST eclass-manpages-20190329.tar.xz 428068 BLAKE2B 630f6ba06bef6e4aed7713776b8a0ce737dcba4441309ed326b6eb87a5515f5fbd2f95db4a12385788a1dbf1ff6bc3c09620f4564c0bba201f48f6aa31520b41 SHA512 8088078334c2b7f35301bd75dc2505a366d030cb1d28bf47c387ba0c727cf5a58e1f279708d4a32ecf47ceec543c287ea5ad8c76ce4bbd9c45f039be2924d7ee
 EBUILD eclass-manpages-20190314.ebuild 1084 BLAKE2B c5ba9cd688ec3c21f734e36feb32e5651a06f09f42e7886627dd92d122ff99a797f55a734a00d79c7ca3464f61f473cd003ad5961a37d50e23cc2908cf623362 SHA512 93fae7b743267e0c32b1bc3317d1f2cda10e2b64d22d01986730ccc2d648c848be970c57f319dcd58265a450a68b120a58943e18c01201a9b866a76911b56982
-EBUILD eclass-manpages-99999999.ebuild 565 BLAKE2B cf44fffbbb4350569de1d1fceec7a98753625c61876e370a11d3aeeac5d659b32aa182ef62ddebbcb1d2b1eb187722493a66750960820b04fc2d877e50f8692f SHA512 4f21ba6eb7f08778339262db1336b3a9bf5fa9c2323f3f5144ff7e72ea9654f2679c11642e3d1073a10d074603407e3bcf9f4c2581973c9da8e2f9309928f2e4
+EBUILD eclass-manpages-20190329.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
+EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild
new file mode 100644
index 000000000000..c567d7c5fc37
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20190329.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 7dfb0d7e0d2a..7ca1b88d6483 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit git-r3
 
 DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
 SRC_URI=""
 EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
 	https://github.com/gentoo/gentoo.git"
@@ -16,15 +16,20 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+DEPEND="sys-apps/gawk"
+
 src_unpack() {
 	git-r3_fetch
+	git-r3_fetch "https://github.com/mgorny/eclass-to-manpage"
+
 	git-r3_checkout '' '' '' eclass
+	git-r3_checkout "https://github.com/mgorny/eclass-to-manpage"
 }
 
 src_compile() {
-	env ECLASSDIR="${S}/eclass" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+	emake ECLASSDIR=eclass
 }
 
 src_install() {
-	doman *.5
+	emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX=/usr
 }
diff --git a/app-doc/eclass-manpages/files/eclass-to-manpage.awk b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
index b40eaf112091..53e05973e16d 100644
--- a/app-doc/eclass-manpages/files/eclass-to-manpage.awk
+++ b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This awk converts the comment documentation found in eclasses
@@ -93,7 +93,7 @@ function xfail(text) {
 
 function eat_line() {
 	ret = $0
-	sub(/^# @[A-Z]*:[[:space:]]*/,"",ret)
+	sub(/^# @[^:]+:[[:space:]]*/,"",ret)
 	getline
 	return ret
 }
@@ -201,6 +201,10 @@ function handle_eclass() {
 		print ".SH \"DESCRIPTION\""
 		print man_text(desc)
 	}
+	if (supported_eapis != "") {
+		print ".SH \"SUPPORTED EAPIS\""
+		print man_text(supported_eapis)
+	}
 	if (example != "") {
 		print ".SH \"EXAMPLE\""
 		print man_text(example)