version bump, bug #536584

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 287 insertions, 7 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index fd6d7d51f0cc..f25155ef0f7f 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doxygen
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.278 2014/12/26 10:19:07 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.279 2015/01/21 15:25:13 tamiko Exp $
+
+*doxygen-1.8.9.1 (21 Jan 2015)
+
+  21 Jan 2015; Matthias Maier <tamiko@gentoo.org> +doxygen-1.8.9.1.ebuild,
+  +files/doxygen-1.8.9.1-empty-line-sigsegv.patch:
+  version bump, bug #536584
 
   26 Dec 2014; Jeroen Roovers <jer@gentoo.org> doxygen-1.8.8.ebuild:
   Marked ~hppa (bug #533458).
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index ca3f26c0fcfd..f71d8d33b0a1 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -13,23 +13,36 @@ AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 SHA256 3e888815a63ff804053711cf31f2
 AUX doxygen-1.8.3.1-empty-line-sigsegv.patch 483 SHA256 d0d3e2f1e1d450b8b31fb9553fcf38d74816c36673ffe455959dacc7f9c01384 SHA512 777e26fe365226d8640eac89c3f11883f7cdca17cf667b32c8f7ed50b2160794620a312c4098e6e53a1af6c799fc9bd067d4846014381189de23bc84210cc752 WHIRLPOOL 072d65e3f619994bfaf170904f3699e40682f2d45a7ad3a600ba871f52ceb2ea1273b3919e008d7070a37f8beed198cf87c81a83babbdf0265e0105ff6a2940e
 AUX doxygen-1.8.4-infinite_loop.patch 570 SHA256 189af23ec4580b84de7227dd91ae9fccb5645bd94fca43f401eb8d9a02d59e67 SHA512 5a5df6399098683c0f507e3120c4d1f8379707b0f24eafa836b7874adb73de65cd12d41f6d635e9dbcfa428ea4da684dbd2428a679529eee0e93c37db73380ad WHIRLPOOL 28667004d6b923981ef03eaba9a5a1913445fe8a13a24fde7f555dd8d7dd7f4fa7cac9162063b7aca87d518e39954fe0a39dc6fbf4d764e11c7cb26e0d1dd04f
 AUX doxygen-1.8.4-libreoffice.patch 1362 SHA256 c73bd1e543b333f2fad202459c3b2bb71d7ebab6aae56d2828696ceda2331840 SHA512 d05d3f7e5dea817e42f45d9c82497877792efe8e09b8579afcaedaf2ccc36649470ed8eb40768ed65dbf625da33128ef512df5ff64ac439bc88a008019b8411e WHIRLPOOL a0593826c5c651912f87347ccb5f4e602efe976613c664ee59739ffee07d548896c80d6d4c8fb52bd756ca63155d099e855baa09dab3cfd94488fef82f973a81
+AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 SHA256 5195bc11afe48641de38f8e5a3574ce93654cb854be97f38bc6322fcaaaddfc3 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef WHIRLPOOL f048801c198d65dff3d2a16eed895c2d9f266034c082b60cdf50f9476e3d79103d3a29d005480a0b7c4b3f6a341e7c5fadca6893d7b817cfd0db09e394c7468f
 DIST doxygen-1.7.6.1.src.tar.gz 4791654 SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd SHA512 614e8b52b32c4ff0a37cabfa2fbd6ea2d79567fdd903eb3e5031e61cd106bb3bfa42ccfdbc6636e5da08bd7a7fa226fb8d9c104b344d16098e9aedc3a601127a WHIRLPOOL f70aa1d0f93746871c5b24538231fac775e849ac88eeff9d1afc0919464bc9c7a27b1391d1aa50624ca11c48f3e2e953a4c41ed7ec5be3ad7972f03510576c5c
 DIST doxygen-1.8.3.1.src.tar.gz 6196887 SHA256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 SHA512 365e553364ad61950a29477d8e751e98f4af9ce4a999c788cd25ce5a58ebbd931960689c4faddabd71cda60174777e41ed814ba633c19287c9f9696e0d7fa169 WHIRLPOOL cab6bbad971b794e07e95bee548ed9b9233b7b420dd96db8d4cb7b68a1b1232546c3976556b043e9a31c2e32e8619a57a0a7a58aa846a4806b9cc08aa1a9bc80
 DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c
 DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182
 DIST doxygen-1.8.8.src.tar.gz 4955485 SHA256 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1 SHA512 f9cdc7b5ce18321449f29ec86d0824f34d22bf41e2007224d266e68520141e8e21553dab2add361795dc23c56845f7e118b11298ecbed061b25ffabf638a79c1 WHIRLPOOL 26497b9ed9d4236d3937ac98f61593747fe1608d41dbec7649524d060adce104355f08d1a8cab19f4c93594034d2245380b3c927e3995515b4bbdcb5614a5f52
+DIST doxygen-1.8.9.1.src.tar.gz 5007458 SHA256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec SHA512 b76d06fc6e22d5e8e2b73814bc99cc0cf75ddf4e5a6ad1bd79832f12ccce5ccc2681777862b9ad0dbfdf1791fd1ce1f0f5ce669a78c7d38f91b0e8d5ebda8ade WHIRLPOOL 3971ceb79619282dbf1409b71d457dbdf8cd67b7d57dc106215442237e16fed8530e637d2d712d1be2dc2d186b29e75a23522b06387913fe2584eebf8b52b44e
 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
 EBUILD doxygen-1.7.6.1.ebuild 6359 SHA256 77b1ba5a9d5967f48c9cb950a25d50e71d43bb251905f9501afd6a3368104f42 SHA512 72f838a959854006c22da313f22011c1d4b59ad5ad4d6b3687b8158936bd03386f2b6b6b5ba8ef31eee85eea76f4c75807c2c3cdebd49d494da3554936e11741 WHIRLPOOL 97021fac09340346e7ddec900f192d24b27fb90e8818979f10527c78dce26c738eda979f1d7ffc8525d1ab37933198fbf5090d02bf284c1352f8ae6dda87164a
 EBUILD doxygen-1.8.3.1.ebuild 6806 SHA256 7b9af6316fabcb62b9a3de3c16004a679d99dabf5a2280194da5f7bf7de65acd SHA512 72eca9669d8c58b8e6b59d31fcfee232eac25ad8eb75e68703993dd5131619a415d02ceb5ef0a87ff975bab741331f3f0e0cf0fbc56e2790ae8c452b07a7a114 WHIRLPOOL 0acdfa9e8d5370e34dd93810229ec9e54086bcd0f05eeaf1350ff97a620e9f3c91cb0c00aa296260f6c88916051384ce893157b4da141c8c64bb02e18ad71028
 EBUILD doxygen-1.8.4-r2.ebuild 6900 SHA256 0b73c23bbc4c79ae68a7cd9517112a714b55e27451692dd15db508a55bad7cba SHA512 a285500d5533e6303187d02d010bfc5fe2fe280fe3edcad1af2c7c9b59ae159d75fc051b0e449f84a8cb6ce415192378d2f833d9cd4e1e255947967ae13dbfba WHIRLPOOL 78f5992636f127577aecf40c2087e9a88976dacb5ebf9023a595580e377d108a74abab012da70eaf467073ba387d5ebb706a9b0a3cc4ce404ab4f08c1b14501e
 EBUILD doxygen-1.8.5.ebuild 6746 SHA256 02e3189216f81689362700fc4a8186f42e88edea589eb58fe44e2c60f90b7421 SHA512 913807cd43147e6ade50be875edff207b7deed13e395d9eca4dcb6eaf7d304c2f0113be342593740229d0b02b133be9bf2b292379fcd18acd71993084f9d0b47 WHIRLPOOL da9d0538a785bfe8ee46a18c33a595a007ed6e05f7a474442e8ff6f8e9e44dbb76d69c54ce3afcbf82d71d217a900d727009c0e8109aa48a6128764902c11eec
 EBUILD doxygen-1.8.8.ebuild 6930 SHA256 e8a0f6066b4c0da4fd37a6205a020cd961a5b0f6069270211ca413704143a0a5 SHA512 9da2589e6cf777e59e08b328124d039fe2d5ed570883c43c80cf47240927519a0854e6c9ffa0de15a2de1b11a6b4fd573544f7a77e1e4e0656db791c150047ce WHIRLPOOL 003fa69ddd3ca8d05bd30dbb993815923922690b35e71069002d43d47af3e9ee012022fe6d08626804b600e4cfb83bf0a6b1757aaa1b066dec14bf71d354360c
-MISC ChangeLog 45823 SHA256 5703a73c2bcc422a51acc520a9e980fb7b747041cd8a698c2c96ec01704c73e9 SHA512 3cbce27d016f43ccbc5150014a0b5cf49c8a7bde3ea4249ca302e7828cf97142f6fe72ae2dcd4e62994caa5adc351b90f4040758100a6e3516153b0188af1f09 WHIRLPOOL 28c486c19746a6a8735aaa58db734578af37086112f9ead0a80afb4ce893e0f3a873009394203a53e7730e7e0e49e975e4700ef1d49e8854b6002dafb0f0ec2f
+EBUILD doxygen-1.8.9.1.ebuild 6926 SHA256 e0848fa11e3d5ebb30af341a987b61adf0b3e5d36b83308145b82d086fd6b201 SHA512 a86428a43be784c56a0c8fa3d5bb466f6c4b4a45dcb2f1c0dfd4a82664d081e1a7bfe573b63076fd606a7e82df4981536c811688102fe69d8c19de0f16f56a26 WHIRLPOOL 2787743727338e7dd73dccea4bb44deb664ed5adc7c9a3fcd52ae53f24159bd38791aac2aebd3a4999edb3c1b9aa5fda0ff51ce970bd9570edda492dc07307ce
+MISC ChangeLog 46013 SHA256 2ba5e376e9a1bec3d3394e3521d3e0dedbbfd161558ee0172ee3fc5fc69868d1 SHA512 abbafc1e799cd78562229976ef6c877afabac339e19de95010c22edafa786aa89e73ecd32455c9f1d920336e7085971bb60514e1cc15aa2963742a54746d9a0d WHIRLPOOL a70865716c0e6c3d64d2b12f6efe0f8d4788d5004c8a9d42a5d73926f84d54b3916c0fbe89422d003d95129c102803c3ae744496780c3cd053997a75eb8f6062
 MISC metadata.xml 807 SHA256 4772ca52089969311afc870c8399b2548df564a6eec5360bb1d4a9bd74625941 SHA512 c1eb3c2271ea8bd83d12e20341c88633d32ce7ac1702537e2ac0c256301bc9e54f2a7625c2776a9af5d3a48e1e06c7dfc5fbb343e2a0fc904100bb1ec6961156 WHIRLPOOL ec05818b69f223ce6bf218f44c3401d1f92e1b294eb9bc5527e0b0f3ef9f178166352e97aacda22d4325690eae814ead2db4c7b9b992bfc432d46d90bac52cf8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlSdNhwACgkQVWmRsqeSphPyeACfctmh5tsy5D2sAhv4EGm6HtDB
-rdEAnR314sj/WKUU4o0gTTRYuVsRt2wQ
-=uk4u
+iQIcBAEBCAAGBQJUv8TaAAoJELhOzYlK7nn/jxUP/0o2hYkvqg5STntQHmG9pGEw
+w9a1AUXNAmkb8i0KtydeEG1vbOAmtPBF3c9XUQa2pp6n31ShK5IZwMu5Ctar6AcM
+DChLL8jhoM3y5oI3xJm4lV+NQFWv9/yVNET9KyFzc9PnnUahzWnaHyT/BTjYSYLu
+fTtgtMNT9qvpNh45btuTRV8wFM3NSOEYzbBWmsJT9zvf/ktfqhZ8oNrVsvvdE7Fr
+XFsL3+rxvynomVqmiz8nKfNeAKN/XDQPWoT2xbTLXw4qrJPe9+Io7WPEGZ9kL2Ze
+q8neCOoL3RCcc7kJPHNEV7aF2JJ9fXln8j/hIp5eObBYufZO+7LY+laLFHzoEJ76
+EaOzisHP/WHbWQKsJ/BPgjh6QJEmlOtLsETJFLdY4wF7llsKyCW+v6enUmgdx8Lf
+8kduotdqlbb6lqvec6wGgvf7PyKbqsaZbuXlc5EZsdbmMd4+ZhUOmRKhh88CBGwY
+qO1mJVZiL0MT3gMAeNHdD1nnJIAsWzITZsySDe5wMrboWwuy6tG8+F+V+adC1ph8
+wXGyvgP2hLYpIPKxvbkD2MVviOGQak4ecdnm36cyqgR3sN2c8MsB4nt7jccreNL6
+iRGpSdg99uPu/73kOaAlx61yqcyjLhOzfmARYZnxQymO44gULWi+s+x2fsn7Iwnh
+2zV705DK2ydQxQFt7FYP
+=zU3L
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.9.1.ebuild b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
new file mode 100644
index 000000000000..14b4102c3f1c
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.9.1.ebuild,v 1.1 2015/01/21 15:25:13 tamiko Exp $
+
+EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
+
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="clang debug doc dot doxysearch qt4 latex sqlite"
+
+#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
+
+LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
+nl nb pl pt ro ru sl sk sr sv tr uk vi af)
+for X in "${LANGS[@]}" ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="app-text/ghostscript-gpl
+	dev-lang/perl
+	media-libs/libpng
+	virtual/libiconv
+	clang? ( sys-devel/clang )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)
+	doxysearch? ( =dev-libs/xapian-1.2* )
+	latex? ( app-text/texlive[extra] )
+	qt4? ( dev-qt/qtgui:4 )
+	sqlite? ( dev-db/sqlite:3 )
+	"
+
+DEPEND="sys-apps/sed
+	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="mirror test"
+EPATCH_SUFFIX="patch"
+
+get_langs() {
+	# using only user set linguas also fixes #263641
+	my_linguas=()
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} "${LANGS[@]}"; then
+			case ${lingua} in
+				hy) lingua=am ;;
+			    pt_BR) lingua=br ;;
+				zh*) lingua=cn ;;
+				cs) lingua=cz ;;
+				da) lingua=dk ;;
+				el*) lingua=gr ;;
+				ja*) lingua=jp ;;
+				ko) lingua=kr ;;
+				nb) lingua=no ;;
+				sl) lingua=si ;;
+			    tr*) lingua=tr ;;
+			    uk) lingua=ua ;;
+			    af) lingua=za ;;
+			esac
+			has ${lingua} "${my_linguas[@]}" ||
+				my_linguas+=(${lingua})
+		fi
+	done
+	f_langs="${my_linguas[@]}"
+	echo ${f_langs// /,}
+}
+
+pkg_setup() {
+	tc-export CC CXX
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# use CFLAGS, CXXFLAGS, LDFLAGS
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+
+	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
+		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \
+		-e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \
+		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
+		|| die
+
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
+		for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+		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
+
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch
+	epatch "${FILESDIR}"/${P}-empty-line-sigsegv.patch #454348
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \
+		-i Makefile.in || die #428280
+
+	if is-flagq "-O3" ; then
+		echo
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen."
+		echo
+		elog "Continuing with -O2 instead ..."
+		echo
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf="--shared --enable-langs $(get_langs)"
+
+	if use debug ; then
+		my_conf="${my_conf} --debug"
+	else
+		my_conf="${my_conf} --release "
+	fi
+
+	use clang && my_conf="${my_conf} --with-libclang"
+
+	use doxysearch  && my_conf="${my_conf} --with-doxysearch"
+
+	use qt4 && my_conf="${my_conf} --with-doxywizard"
+
+	use sqlite && my_conf="${my_conf} --with-sqlite3"
+
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+			|| die
+
+	if use qt4 ; then
+		pushd addon/doxywizard &> /dev/null
+		eqmake4 doxywizard.pro -o Makefile.doxywizard
+		popd &> /dev/null
+	fi
+}
+
+src_compile() {
+
+	emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
+		LFLAGS+="${ELDFLAGS}" all
+
+	# generate html and pdf (if tetex in use) documents.
+	# errors here are not considered fatal, hence the ewarn message
+	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
+	# so we allow it.
+	if use doc; then
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| ewarn "disabling dot failed"
+		fi
+		if use latex; then
+			addwrite /var/cache/fonts
+			addwrite /var/cache/fontconfig
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make pdf docs" failed.'
+		else
+			cp doc/Doxyfile doc/Doxyfile.orig
+			cp doc/Makefile doc/Makefile.orig
+			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+				doc/Doxyfile
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
+
+	if use qt4; then
+		doicon "${DISTDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+			"/usr/share/pixmaps/doxywizard.png" \
+			"Development"
+	fi
+
+	dodoc LANGUAGE.HOWTO README.md
+
+	# pdf and html manuals
+	if use doc; then
+		dohtml -r html/*
+		use latex && dodoc latex/doxygen_manual.pdf
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "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/files/doxygen-1.8.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
new file mode 100644
index 000000000000..cfa56174c5eb
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
@@ -0,0 +1,20 @@
+removeEmptyLines() segfaults on empty string
+
+https://bugs.gentoo.org/show_bug.cgi?id=454348
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423
+
+Patch written by Thibaut Paumard <paumard@users.sourceforge.net>
+--- a/src/htmlgen.cpp
++++ b/src/htmlgen.cpp
+@@ -1022,6 +1022,11 @@
+ static QCString removeEmptyLines(const QCString &s)
+ {
+   BufStr out(s.length()+1);
++  if (s.length()==0)
++  {
++    out.addChar('\0');
++    return out.data();
++  }
+   const char *p=s.data();
+   if (p)
+   {