Apply upstream patch for fixing infinite loop wrt #474716 by Marien Zwart <marienz@gentoo.org>. Drop old

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

5 files changed, 57 insertions, 262 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index baa301f09baf..c10908bee66b 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.248 2013/06/26 08:49:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.249 2013/06/26 10:58:45 xarthisius Exp $
+
+*doxygen-1.8.4-r2 (26 Jun 2013)
+
+  26 Jun 2013; Kacper Kowalik <xarthisius@gentoo.org> +doxygen-1.8.4-r2.ebuild,
+  +files/doxygen-1.8.4-infinite_loop.patch, -doxygen-1.8.4-r1.ebuild,
+  -doxygen-1.8.4.ebuild:
+  Apply upstream patch for fixing infinite loop wrt #474716 by Marien Zwart
+  <marienz@gentoo.org>. Drop old
 
   26 Jun 2013; Agostino Sarubbo <ago@gentoo.org> doxygen-1.8.3.1.ebuild:
   Stable for ia64, wrt bug #471692
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4cfc1c1eaa8f..3fc696a11b1b 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.4.7/01_all_cp1251.patch 683 SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e SHA512 4b449be072c86423e202089f945416f660a704e505c9bf2823750266214ccdcf88784520798a1dd2383ce9cf68d096ae2c599a73acd26aeabedc49aa98009931 WHIRLPOOL 4538085b8b4a022ff0ea94fb0f7212526ff17d81dbeb4cb626427ce06cb5a73ff3ccf6c69ad4b07edb9b3e45f418dc46f77f5bf782dbce3977680fa3f59465d4
 AUX 1.4.7/05_all_system-libpng.patch 5329 SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 SHA512 8fd67518302665a15ddc089152cdb04340eb416d3695b4374a49a6868e45268a8141c426b2b9c9e0f9e1818e28398aa98993cb21621947401bbf890f3d317017 WHIRLPOOL 92299f58fbc00b7187381b2b04d55f2fe6a9c68cd44f73d979254ec3875e2b7b54bced0c16824f328ee91bb34792760b27c1466d2126c58888484cc93fc62bfa
@@ -12,6 +12,7 @@ AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 SHA256 ee4b8c11c8af9bc3dfb365eff06a
 AUX doxygen-1.5.8-kdedocs.patch 854 SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c SHA512 10dc047c049203dad2b4e2d602310d1296498a90cacb5a3599387dc0cbc845b591abe543954960b50bd3fa054c3516fb23789ae450bb8b4cdb45d45bb6130f86 WHIRLPOOL 736c568c5f11cbcf1aa9a7ed840bdcff506c6b162e6da8ccf92950a029de63ef32fd7764b317f155a3871567cee2230e59ba0c53c4af6825a705cfc0975f12ae
 AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 SHA256 3e888815a63ff804053711cf31f25130abc509e9b52cb4263b209764b70b633b SHA512 2b0c28168ab2d173ecf9cad03d5b5c684a0e8d15f80d937836440a72d301d64816ab9c61e958e8eef771c2c2ea6fcc1c8d2a62737ffcfa25f3166e52ce8fe245 WHIRLPOOL 2b5898621ae4868a75e0266e551f2c706e94483e91f9e22a7c68efd5e6d18af32178f5112d3059472bcf520f51907577254fc39191052a2ccb2fcc867140127d
 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
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069 SHA512 2ece20c6882f5f20c7f2958bd0363072fd70e1b56f48c932620377cbe7f50de14ce540c1095e91ccd173ab933af785ac6b27a739c00508f4c8f6ed1e6f1e6393 WHIRLPOOL cdaedd576e8c24547baf3e3835cd5fbd505a86a070a5751ce3fa8369562cdeaed963f469e3bce44820f6afcc1e3e83fb1a2f8401ef301cf95e071405937ba213
 DIST doxygen-1.4.7.src.tar.gz 2928354 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed SHA512 99da7e30c4147a501b3f0e71d03065f42071cd5490f9daaf6025f6b39d486953d59860e83f6535ee7cd12f93d635ab298f4a42da0f8493e80229df85469d4be6 WHIRLPOOL d96f31eed61cefdbe553d9de684e391fecd3ff9623c83964be5777510890e08447734d7f38b5b479fa977ee8990811ee1900ee18f99156a08cc1c6e62101f235
@@ -26,24 +27,23 @@ EBUILD doxygen-1.5.4.ebuild 4600 SHA256 269bd42ab1d0e6fd4e51aaca5377117e0028567a
 EBUILD doxygen-1.5.8-r1.ebuild 5486 SHA256 d0f5300eb97fa3ee4a70394149495bf2ae46fbf3bb20f2fa378857bea2d0fd75 SHA512 5282be489d998fcd2a5cda8af68d0c699c254e7365b12663e329b3941fddf7b282cce19d0eb47c415eba1ae5be6a6d6a8f2320dc6d312cc7e9ff5e5dcd73de2c WHIRLPOOL 765454d84b512f3ab74f06b8e71b23e67c900f4c6a72b74ad7d27223ac29e7b596e3dee4d97424585aabedaec0356506fd4d764c7b12562baf21f9f0f980d5c2
 EBUILD doxygen-1.7.6.1.ebuild 6419 SHA256 0ef4088a125e4a2990403cf1c0210a4a6b9cf542a054623b596aaf97a2f63c2c SHA512 9be0e38e0028e0a1f3071df73458347f608c1a934429218ce0e62f2d66e8e497459df12803b46231a0613f56863fcd500e650471d5cc2a024119e4547f70a55e WHIRLPOOL 055c48f2d2596646945c2a66a86c341f9383ff955d5c1ddde213de3662380e61ef8b8836846ce0070e912429c08c4dbc2b19e491871f7f36b29c556093c4ce8f
 EBUILD doxygen-1.8.3.1.ebuild 6864 SHA256 8c03607cd2d62b85b4773dea72af8ba8b03648e7d719aebdbdec5fff9f0fa5f4 SHA512 29a355657726e41f27584f7c52ccc4cd097b3f52b0025f230bc37f40a460e9dac813613272f2b97c727dfd5355640cff7f7d482cb93cc4abb271c874d92a3e43 WHIRLPOOL b14e1df2c7688c842c5ee6acf2dd9c86a5a52247e7ccca356daa40c84a6f933d33e551423fd1e142f8ec6e8212ab163eb39b9f0f9cbdb4fa511cba765651a1bc
-EBUILD doxygen-1.8.4-r1.ebuild 6903 SHA256 2b6f70ed2e4fac1e0a360ca166f266d17c55f99e376ecffdb9beede433bfce8e SHA512 f5a11438ab6a286b29666b1b08279d8b6e05620dc2e40d6bfb118036e8d46da0346530e7c9838432f656d1c7cce3648c931fe8edf6f302471946301cb1b9b074 WHIRLPOOL 02133ca0a4f2d4b8055d836fa12df344628d76c9a9929bb337083d43f5f5109d1f805a36dd27a4e0221245fe33683654fc18c6a7afcb458804d1ec905ae3fa8d
-EBUILD doxygen-1.8.4.ebuild 6827 SHA256 1da09556fcd3ed89e4379dd42dfe65f9364cabe3ddbc5c986860ee17c0a5a577 SHA512 8636e8188f251e8e4f72c2b9e320c78e317c5b72348ad15dbdc84dedc7757d95c9f01e058d8a7d90c5fee734ee95cb3cd7d202bae788729e3ae191b922e25778 WHIRLPOOL 6f05ed8c4ee8df04a34ad53a1020119b389f2cee96391319e734c992ab27bbc9628c4e041707b463d387f814a38f3a3233761c172bf6f8016177c37c427a804a
-MISC ChangeLog 41679 SHA256 8dafbc8cce44f8e266ad86c7c110fd1936fb7ddfde50ad1fc068e5dcdbe148ee SHA512 9a70319d879f249f503065c262d17b3b7f83a23f65a45e8f474db6b6443acdab5881c100c7d1ab31b55a4e3ea23652089dbcb59145b62c39f25556ee81c6ecee WHIRLPOOL ec61d6994483bc1799bb227aebfe4480bb4b37d12c9237b3349c229da50b05762f19e0b2bc80f0a6792f67616377cf4e4f3deee314becc1da479395cadd74c66
+EBUILD doxygen-1.8.4-r2.ebuild 6955 SHA256 4f3c4cbd397fc5693a63eb7a65a095ea886a9a7492b19b6255f35912e411cbb1 SHA512 8fc412b2ce22db68ee6f3b4edd1b320c7b4fe7b0677608da82071448db36d36bea57c372eb8b9696868f6a1f2541773affc1ff11e02d5c3333ebb959fb89ecc7 WHIRLPOOL 2704c3dc2a1899467d97defd0f641eb63a0231eaf063747c7a11c4b5733cb97d6163889cbcacfe6907b1a897af625d8f99577ea8a81be038a7dc345b7cfeb698
+MISC ChangeLog 42004 SHA256 9ff7abf724c0c93add0eedb7093ead7684af076001a6d34a4f434143a3ce4deb SHA512 4f9f174770725d94b2a47c27afebefebf0c611f67981f5c9b65c09d0ee0bcb0a552625b807bf792fc6bc6a25976af6688fff46ea3412b28166653554c5fe169d WHIRLPOOL faef516f9eb29a3c355b7ca464d34b80316c94d40fe25bdfab53528bf4d88acbf72adefb730c695164ee4be79f30f40badeceb484a80960616ad9fbab775feae
 MISC metadata.xml 833 SHA256 a1612d5400b6e418c45fa45da7b064d391bef410cf31b47b72f2808e7af25b44 SHA512 69c56f20d98619a74f0ab9e19b06b5251a77738e806db61ad3c5fc7874add0163f087d5f074d2d8e1141e5e919c3fd965bce39b23f55d42d28b7726602b25cae WHIRLPOOL fc799fb6c0e8ef4facea0766797a0c1324a012d2f7aa299991687ac2b2c1163bc7d8b2ed9e938317967899a80bc66ecf17ca83470bf1d46442f5d68cf8defa75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyqpUAAoJELp701BxlEWfrccP/j6iavkfox5IIZaiE3azZvRe
-xKjlqTRlsgXetXeal+jCi3pLS5QF2wmgQ7is9lCk9McPzopvf1LWDA2F+u3EIIkQ
-bnsZcA3RdS9szsLpPF2H0SwSAFzlkjen7arpxvDEuJBBPsvraYIWwWWtGsQ6bnFR
-cytZErmULACaKIIBTMxBwUm5ADP/C9sL/6ACccf5iu9Ju4JyCKB1CFBV9GLfV7Dc
-mR3fXK9utAU+2fmLMHWOKTq3ziG4jZi1ZNBSsTnJebNm9rQ4FYwcfyEZWE6a/9RV
-MIr9bwfTSfvKyiRV78IfHfKvyaIRNhYPR4bazEh6jgSpbJy4ZYykKdfEIvKW5zuT
-7Pt3Gth0DEr4SiGhJAqQRfkBt9r+ZnNkdcQ7Dh8ABPZ2a7vRgafQE8wmitJ0LTMc
-/YKEySdGwPfcsR1IEvO6duk/5YDjSs0SbBMbyYtRTm081hC/SC6sKg4zmHMQ0J+B
-e3vF7vLS62kbCZI1s8ygUO9kHHhsIJKwNXUa2bunlxLAqQvDrKWZK+IPDEKCTz67
-Gp6TIsNrxzA24FbI/3Q4yS9W3shNHMxB/VEYhywYKazgVH3dE4aAxEjZD2LE2tPU
-41gjZAVUdWNG/bz36L3D6iih++B91tgYaLatsC/iHZDnpFNQ+eVFmNRk3/M5T7rk
-KUHSvTMqngI+fh9mw6v3
-=rDdZ
+iQIcBAEBCAAGBQJRyslxAAoJEF0huFKJUZL5vtcP/1rNadN98WaQs7bS+ZGBFNrg
+y2NpCsb7pDnhzPT2W5NQ+hscASpmAkaM96tEpDV7z14bhpos6Cf8fkBO4HVTZ8TP
+KFF11jag298ctQ865/0Rl5ZA2M9L30JqRF5rnsFcOq8BArSRqvrzOm0apJUU7P62
+JvX7GwN2DYUeIKwt89qsG1FdN3fTEC5Q6Wp7JxVXEHJda9gg31cqCw7Evpu+GNLu
+DlFjvmn4Ja7PG6TrtznvzcaAZ1lzcd9jvFoS/SYJS/s97toDKbmSnivqp2+eBeeC
+m3f2kKLgNNGwKmbM4/TQ3MXtXNBgDjggWbv3MQdBZk7w36V5x1k9Wl6Q5lsfOlEK
+rOp6YPNmpd0et49YDAMZU8SMqNpslIcil10Ri6pg9YYIU6fs69YO74XOJPLK2Tt2
+nlICGDRKBtnar5R0AJz0fK5a8YD/PvlSKNEOfcN2SRyvaculrgwYPABta5w9yH1w
+Am7ohOlqh+eLDZm4+hiVT4LKpPElBobwJXQU2/KdeUjsSB7IZKvSG8Qs0d2+/F3u
+kfcUnneKXxVb7u38yHU4u55bBaBx6seXrUnWgOu+HDZlxH1sfuiihJCC+zkrjaK1
+uIheLkyRt5B8BhmO7vefTmTFvNeX6yeXqCXoBfvukzLzKv8MmwuwTeyDf73FdhsQ
+vMy5kvClnEZ8T5zyj6DP
+=Az9u
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.4-r1.ebuild b/app-doc/doxygen/doxygen-1.8.4-r2.ebuild
index 5d2e574128e2..61658d68f2ff 100644
--- a/app-doc/doxygen/doxygen-1.8.4-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r1.ebuild,v 1.1 2013/06/04 12:21:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r2.ebuild,v 1.1 2013/06/26 10:58:45 xarthisius Exp $
 
 EAPI=4
 
@@ -108,8 +108,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch
 	epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348
 
-	# patch applied upstream
-	epatch ""${FILESDIR}"/${P}-libreoffice.patch"
+	# patches applied upstream
+	epatch "${FILESDIR}"/${P}-libreoffice.patch \
+		"${FILESDIR}"/${P}-infinite_loop.patch #474716
 
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
diff --git a/app-doc/doxygen/doxygen-1.8.4.ebuild b/app-doc/doxygen/doxygen-1.8.4.ebuild
deleted file mode 100644
index 59720794bcb2..000000000000
--- a/app-doc/doxygen/doxygen-1.8.4.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4.ebuild,v 1.1 2013/05/19 15:47:07 xarthisius Exp $
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU"
-
-#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="qt4? ( dev-qt/qtgui:4 )
-	latex? ( app-text/texlive[extra] )
-	dev-lang/perl
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	sqlite? ( dev-db/sqlite:3 )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)"
-
-DEPEND="sys-apps/sed
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-RESTRICT="mirror"
-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; 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}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		-e "s/all: Makefile.doxywizard/all:/g" \
-		addon/doxywizard/Makefile.in || die
-
-	# 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 ppc64 && my_conf="${my_conf} --english-only" #263641
-
-	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}"
-
-	if use qt4 ; then
-		pushd addon/doxywizard &> /dev/null
-		eqmake4 doxywizard.pro -o Makefile.doxywizard
-		popd &> /dev/null
-	fi
-
-	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
-			|| die
-}
-
-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 INSTALL LANGUAGE.HOWTO README
-
-	# 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.4-infinite_loop.patch b/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch
new file mode 100644
index 000000000000..840baa810520
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch
@@ -0,0 +1,26 @@
+Fix inifite loop 
+
+https://bugs.gentoo.org/show_bug.cgi?id=474716
+https://bugzilla.gnome.org/show_bug.cgi?id=701295
+
+Patch written by Dimitri van Heesch <dimitri@stack.nl>
+
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name)
+         ++templateDepth;
+         pos=nextOpenPos-1;
+       }
+-      else
++      else if (nextClosePos!=-1)
+       {
+         --templateDepth;
+         pos=nextClosePos-1;
+       }
++      else // more >'s than <'s, see bug701295
++      {
++        return -1;
++      }
+     }
+     else
+     {