gentoo resync : 15.12.2017

4 files changed, 31 insertions, 70 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b0a96c07ce9c..02006ee878c8 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,10 +1,9 @@
 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.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.12.src.tar.gz 4880613 BLAKE2B db2337a17d0b1a5e17a25c61514efb055e27f19d698aeb715c92eb4c3635b1d8a4d8b67c6c62d443b4c8613eedf2e564371cd6d5d512bd2be54219936ecfc309 SHA512 12fb5f19d0de382c7510b7c517d7c781a1e6e11720c7d9ecfd81d29d5ed030984e8d55ffcc25cc52703020e880edad341136e2795a2a36a842fc275b31ae203d
 DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.12.ebuild 3705 BLAKE2B 5b2a4408dd07a19857f30c25ddefb50fb2fd5ab7c4f17fe7403c154c2473aad64d08e2e79eb64c61458787d87e7cf66f3191916c2ab5286809dc200fc000c9ce SHA512 51f076be1a73db3202b91dd3ab6a4bc52c8caa34c3097dbbbdb488277d01c70c8da842375e91f7ac7d81843434ba1d8fd727543bf299eca7c20ab0d8dfa05d52
-EBUILD doxygen-1.8.13-r1.ebuild 3735 BLAKE2B c6ccbdf8f41f31efaa8d2d12ed0cc44c78416f32738965dde04b604c95fe867bddb65e365fccfd922b9074775c70f3b4e8c5199449a684e39ac1cf09c082ab21 SHA512 de69fb9b6074006adbf3aedfe1bc68d069b6bbef374710eed59a3744b1676f34a36471059bc5d8f7bb13d90eb95f456b468eb272a4d980a1af4feba8e4120fe2
-EBUILD doxygen-9999.ebuild 3705 BLAKE2B 0252e035a6c99948fccf354f229171bb0c5057c2a79752bda26d6e9ddf36e0887ad86aac74368ae63e0bc716ee9e062c3f9c769960d148693698895a7cf7d310 SHA512 6acefb6feced1386cef88b01ab6a0a963f38e8474dad552b34ba21398932afb92eb8fe179d45b7ee4669d66a507dc139b24e1a132e64691f851610eed1714654
+EBUILD doxygen-1.8.13-r1.ebuild 3739 BLAKE2B 4672631e26aa8262f4765b64d73f3e4912c62aa907615b28187fe42fc11be9523efbd179bac263330e328c15b9d4209b8834ae653e24e1d218af337aafbe2d8a SHA512 0bc03569d7724ebcf20c7b1391e31fd1d534f985ea9ca949fb1767a6e1772a44241cc68c4fce28ce5317eba7cc6bf702362b3b900b6d67bf4acb25254afe4b19
+EBUILD doxygen-1.8.13-r2.ebuild 3079 BLAKE2B 4272490f2520b15c5db00365d3d6e163efee9ac206ce504569942af06c71106df223e0b4ae23310d3b811ac0524c1ef323522b626f1ebcf3eac76b19fefbfd18 SHA512 4d4dd7d8fa57ac51001b62df61d8b08eee28d3fc657e9f3cf0f53b0aa543352ac2ec10b3e028390c02575ff5a2b09b325356a1e7651a34cfea42179a9a73af8f
+EBUILD doxygen-9999.ebuild 3112 BLAKE2B 32d3fb177b449276a268bd45ec328c3838aaf8fa3602bf94fba57819b7ce17de924e80cfc43298818f12ea9a789c9d5720801c27b13dbd35adea800e80089e87 SHA512 355135bea8bcdb43f7e3e392dda142b07ece2c04c1bae527a4d727a417f2cf93d65b1d82fd6e01bd0cca63c2519026ed7f887856c464f49d010105adc84fd256
 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
index 2eb0f614972e..15d66c90ae29 100644
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
 if [[ ${PV} = *9999* ]]; then
diff --git a/app-doc/doxygen/doxygen-1.8.12.ebuild b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
index 78d2e3148ac3..b2518d915d84 100644
--- a/app-doc/doxygen/doxygen-1.8.12.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
@@ -2,19 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
+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=""
-	KEYWORDS="alpha arm hppa ia64 sparc"
 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"
+	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/"
@@ -33,10 +31,17 @@ RDEPEND="app-text/ghostscript-gpl
 		media-libs/freetype
 	)
 	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? ( app-text/texlive[extra] )
+	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 )
 	"
@@ -53,7 +58,8 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${P}-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch"
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
@@ -81,12 +87,13 @@ src_prepare() {
 		doc/maintainers.txt || die
 
 	if is-flagq "-O3" ; then
-		echo
+		ewarn
 		ewarn "Compiling with -O3 is known to produce incorrectly"
 		ewarn "optimized code which breaks doxygen."
-		echo
+		ewarn
+		elog
 		elog "Continuing with -O2 instead ..."
-		echo
+		elog
 		replace-flags "-O3" "-O2"
 	fi
 }
@@ -121,30 +128,4 @@ src_compile() {
 
 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() {
-	fdo-mime_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() {
-	fdo-mime_desktop_database_update
 }
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 70af58f7ee83..03c4cd449ea9 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
+inherit cmake-utils eutils python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
@@ -34,10 +34,17 @@ RDEPEND="app-text/ghostscript-gpl
 		media-libs/freetype
 	)
 	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? ( app-text/texlive[extra] )
+	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 )
 	"
@@ -118,30 +125,4 @@ src_compile() {
 
 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() {
-	fdo-mime_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() {
-	fdo-mime_desktop_database_update
 }