added latest release (see bug #223275) and cleaned up stale versions

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.26.1 x86_64

13 files changed, 41 insertions, 843 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e35a430b38be..d5046aaf8978 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.148 2008/07/29 08:43:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.149 2008/08/16 00:30:14 nerdboy Exp $
+
+*doxygen-1.5.6 (16 Aug 2008)
+
+  16 Aug 2008; Steve Arnold <nerdboy@gentoo.org>
+  -files/1.4.6/01_all_cp1251.patch, -files/1.4.6/02_all_freebsd.patch,
+  -files/1.4.6/03_all_segfault.patch,
+  -files/1.4.6/05_all_system-libpng.patch, -files/1.4.6/06_all_qtools.patch,
+  -doxygen-1.4.2.ebuild, -doxygen-1.4.3-r1.ebuild, -doxygen-1.4.5.ebuild,
+  -doxygen-1.4.6.ebuild, -doxygen-1.5.1.ebuild, -doxygen-1.5.3.ebuild,
+  +doxygen-1.5.6.ebuild:
+  Added latest release (see bug #223275) and cleaned up stale versions. I
+  tried to keep enough of the older ones around not to leave anyone out in
+  the cold; if you really need one of the above old versions in portage,
+  please file a bug with your requirements.
 
   29 Jul 2008; Carsten Lohrke <carlo@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1a3abb69cc92..4a7a60974ecc 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,8 +1,3 @@
-AUX 1.4.6/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
-AUX 1.4.6/02_all_freebsd.patch 405 RMD160 7856281a3ec84c0f2a6815fbadf781365c93f91e SHA1 20422d9fb4eccf53c885a6c1671588d4d624adf2 SHA256 893e64e08358865d0da55a6b3a3678d38e1dffc8fb0a3498d206488d2e490b18
-AUX 1.4.6/03_all_segfault.patch 494 RMD160 559ecbf45ae967d45d0b062ea5571c7a40a99640 SHA1 540f5e91c86ea7129e6891323d9a6f43c4006b5d SHA256 dc81ce072850deabc53e8b39a77f5834dc8cfff43f48fffc32df44ba0b8414fc
-AUX 1.4.6/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
-AUX 1.4.6/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
 AUX 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
 AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
@@ -15,30 +10,19 @@ AUX doxygen-1.5-qtlibdir.patch 354 RMD160 9c9491d89379f1e68e57722be438ce6af80110
 AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ecf53af750 SHA1 9b0547b64fd9b15406a72b18fe19673f784c50f9 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab
 AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
-DIST doxygen-1.4.2.src.tar.gz 2856998 RMD160 7cb3102b886a75b67591c56e2610b6755d680195 SHA1 3a95a1bc825e34144ecfa6cebd395a69d49fb8c6 SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122
-DIST doxygen-1.4.3.src.tar.gz 2767795 RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 SHA1 96802c63a72c009cb3fbba049dc22bf42fcdb739 SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f
 DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA1 50e04f40b6b69b1897cad789f993a11df0368eb5 SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78
-DIST doxygen-1.4.5.src.tar.gz 2884510 RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e SHA1 cbd01c0f1369cdd078c7bee4646559f805bfb237 SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d
-DIST doxygen-1.4.6.src.tar.gz 2889072 RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f SHA1 b40fb369b38cf82ec06826dc65574953c3ad8a3c SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
 DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
-DIST doxygen-1.5.1-utf8-ru.patch.gz 14581 RMD160 a0237fc0fb52cae3483e15ccbdb0633c5745f8ce SHA1 37f0b6b5e59a779c0bc1e72191ff0c03e38e75a6 SHA256 0c9205193021401cb78ea8e69880ef8ae35a89677f3018ba2cac2acac7065c55
-DIST doxygen-1.5.1.src.tar.gz 2888159 RMD160 bacd34a5a69833e42e116d997c99df03dd837062 SHA1 eac525c670ef3f1f81c3038588b42e111a9ec6a6 SHA256 c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578
 DIST doxygen-1.5.2.src.tar.gz 3599976 RMD160 d30dff3a4625ceb3f31e0fd8c97e2fe3af747d42 SHA1 92749928d041cc9972b6304f170d29019eb148e5 SHA256 496220360b92de6169458b282a8faa32065f71db26d33fb9dc291178fc75381d
-DIST doxygen-1.5.3.src.tar.gz 3617278 RMD160 f5e83a0feae0a53ae5c5733305f86cfa8937dafd SHA1 13bb3c234d1ec429919673b87bd42f849708b808 SHA256 f0423a198c3183c03f88c16fdaec69c65f29756c893d0c688ac2c670f0d83a0b
 DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf SHA1 1a815f7de6b412f7852d57dec9eb50f7c4b03268 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2
 DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b2069b019 SHA1 16b555f5d191cc0f854ae9856c49e4823a51c595 SHA256 b09aebefe212e414282a07301e81316726d5f9b79c0b848474e08bcf346c444a
+DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b SHA1 a478176b9183aef299418e655d6e38b8f8f4e4a5 SHA256 6f5d9ab77a21c7b0e6ebd1524ffa498cc2738ef9a1d8a2ed355117efb3685588
 DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
-EBUILD doxygen-1.4.2.ebuild 3422 RMD160 7f325c58910f0eba6f56cfab2315d81cd5c61565 SHA1 100517f6e83774be692f99d6774be1c5ea641d90 SHA256 757d8e6c77c79f01143eff3c0f285b6095674decdf29c58eb5e94275fd09806d
-EBUILD doxygen-1.4.3-r1.ebuild 3511 RMD160 5d24c2c502de142d9d0780784d1e74c96d545009 SHA1 1cd91ddf4d7cde9e3dbcbc95229972ff346645a7 SHA256 5342b72192e6e0d711a92685367a47595706677fcbd34652330c21b78b08db43
 EBUILD doxygen-1.4.4.ebuild 3350 RMD160 a9a1b8753d7bf8a3bdf798278aa5d42d8aac90ce SHA1 f05c80f2a95bd3a70a61ee6532c0b9884995bb0d SHA256 121ad01801f2b161c281f47b090e10790c53409153f46bee0dc0fd09bfc71d24
-EBUILD doxygen-1.4.5.ebuild 3371 RMD160 668d27afb0d71c26bc335b711a27fb73ff675e04 SHA1 3da847e5f15c8d51f2ec206154416bb3b2a34cf1 SHA256 edf430b2c02dae675f4114ccc66de17b9a2eb2dc92fc28230bd5619fdcb00b5c
-EBUILD doxygen-1.4.6.ebuild 3823 RMD160 c3a03832dbdaf631493220b579d92a32f22a91ea SHA1 469767624b56ce74d51c66d1d7f998abde4efdb6 SHA256 80e4131fa339f54c4f95824d854cc35fe7cb642fb1ff7b8ef0e72b78358b0ea3
 EBUILD doxygen-1.4.7.ebuild 4047 RMD160 93740ad0fbb00934b97901164f59b2ab932db0d2 SHA1 73138b8a4e2dcaa60084bb3e134d83ffd749d7ee SHA256 128ba620e7e2d60879f2efaca7fd229c3d92ce9e12893ccd3cc511462ea35aa3
-EBUILD doxygen-1.5.1.ebuild 4070 RMD160 de3c2c5d2c56004e7d1acd4e39301da2065a844c SHA1 dea940fdf34f230ea1b60828b6f62dd007748d7b SHA256 8a6d724442ec6fa7f9d29c3ac9c6be56484b26766ce137f4f98250a1e6151f1a
 EBUILD doxygen-1.5.2.ebuild 4024 RMD160 ca69977b83468a68c4f46ad3890bc9b54694d74c SHA1 7d43671ac70a9169813cb434a643a83569fdd6e9 SHA256 e37fca6c685339319b201a24b557a42e45a7582798bd139a7f385e781c185335
-EBUILD doxygen-1.5.3.ebuild 4939 RMD160 7fc0f5113775fb5393d7422a3aeb37caebb90edd SHA1 870be2ab3d61312db912c145d23ece7c2da56d60 SHA256 5dc6d58161416a75e655c283c233ed131956442ae6e9fef5f009db16209f7b6c
 EBUILD doxygen-1.5.4.ebuild 5046 RMD160 fc9ad52f3dce5a66493b59ac61898688655b8839 SHA1 70903c01e592cf7a7cfaae46aba7c052633dac5d SHA256 cd3fc6140ad53b04a0f379251bf7d3e97facec5008b22f56656ff3a2a5a43edf
 EBUILD doxygen-1.5.5.ebuild 5092 RMD160 7ef7aa08f917da7b14312fd1252c9a030f77c807 SHA1 d096d17ee6078892558d09da72b8b6c15496d018 SHA256 61fce6bd095752f33f2c9498cbe130d2f41e09e9fcb155231f6897ca89015e88
-MISC ChangeLog 24296 RMD160 b1ea2fb5ecd625efaa3cee91db5fefd97288f440 SHA1 93e193395ab355f124521c5dd1ecca1942a22ed5 SHA256 c891fe9100b89133d02a043a962587069bce1d78d607b626d351059a8e4925e9
+EBUILD doxygen-1.5.6.ebuild 5094 RMD160 4ce65bd48bcca76a3daf5d689bc4040821eb7d85 SHA1 702d6b1354d3c3fb0086ed5806167d5b38e46173 SHA256 c5a5373bd5826f9ce8cd563848ece2bd4bcbeaa23a69e79b43323a8e673c5db8
+MISC ChangeLog 25000 RMD160 2fd6526e9c3516ebd8f8fa4e916bfce319a70d09 SHA1 f287c16af42d66d165a96168f4236c34ed241e37 SHA256 c4d419c55f05fd2ef92184e07e3de1c58d234b2a9f26092c202968ddc767a8f8
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
deleted file mode 100644
index 59954b2751b6..000000000000
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.24 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc qt3 tetex unicode"
-
-DEPEND="media-gfx/graphviz
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/linux-g++/tmake.conf
-
-	if use userland_Darwin; then
-		epatch "${FILESDIR}/bsd-configure.patch"
-		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] &&  sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
-		tmake/lib/macosx-c++/tmake.conf
-	fi
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	make DESTDIR="${D}" all || die '"make all" failed.'
-
-	# 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 tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make 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() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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
-}
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
deleted file mode 100644
index 2b8aa0f26c59..000000000000
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.19 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND="media-gfx/graphviz
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/linux-g++/tmake.conf
-
-	epatch "${FILESDIR}/${P}-cp1251.patch"
-	epatch "${FILESDIR}/${P}-nls.patch"
-
-	if use userland_Darwin; then
-		epatch "${FILESDIR}/bsd-configure.patch"
-		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] && 	sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
-			tmake/lib/macosx-c++/tmake.conf
-	fi
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake all || die 'emake failed'
-
-	# 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 tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make 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() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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
-}
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
deleted file mode 100644
index de4992f0bd8d..000000000000
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.15 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS (on linux and macosx)
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
-
-	epatch "${FILESDIR}/doxygen-1.4.3-cp1251.patch"
-	epatch "${FILESDIR}/doxygen-1.4.4-darwin.patch"
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		"epatch ${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake all || die 'emake failed'
-
-	# 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 tetex; then
-			addwrite /var/cache/fonts
-			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 html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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
-}
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
deleted file mode 100644
index 9b46394d9227..000000000000
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.16 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Obj-C,
-	Python, IDL , and other C-like languages."
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS, CXXFLAGS, 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):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		"epatch ${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PV}"
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# 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 tetex; then
-			addwrite /var/cache/fonts
-			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 html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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 "See the Doxygen homepage for additional language support tools."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.5.1.ebuild b/app-doc/doxygen/doxygen-1.5.1.ebuild
deleted file mode 100644
index 2cffd1905675..000000000000
--- a/app-doc/doxygen/doxygen-1.5.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.7 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs qt3
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	unicode? ( mirror://gentoo/${P}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# still needs patch for Russian text in source files (see bug #112076)
-	if use unicode; then
-	    epatch "${WORKDIR}/${P}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	# use CFLAGS, CXXFLAGS, 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):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-
-	if is-flagq "-O3" ; then
-	    echo
-	    ewarn "Compiling with -O3 is known to produce incorrectly"
-	    ewarn "optimized code which breaks doxygen."
-	    echo
-	    epause 6
-	    elog "Continuing with -O2 instead ..."
-	    echo
-	    replace-flags "-O3" "-O2"
-	fi
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# 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 tetex; then
-			addwrite /var/cache/fonts
-			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 html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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 "See the Doxygen homepage for additional language support tools."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.6.ebuild
index 1dd9ae887026..a93b2fc959d4 100644
--- a/app-doc/doxygen/doxygen-1.5.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.7 2008/07/29 08:43:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.1 2008/08/16 00:30:14 nerdboy Exp $
 
 EAPI=1
 
@@ -13,12 +13,16 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot qt3 tetex elibc_FreeBSD"
+IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
 	virtual/ghostscript
-	!nodot? ( >=media-gfx/graphviz-2.6 )"
+	!nodot? ( >=media-gfx/graphviz-2.6
+		media-libs/freetype )"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
@@ -37,9 +41,9 @@ src_unpack() {
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}"
-		done
+	    for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+	    done
 	fi
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
@@ -69,16 +73,17 @@ src_compile() {
 	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
+	local my_conf=""
 	if use debug; then
-	    local my_conf="--prefix ${D}usr --debug"
+	    my_conf="--prefix ${D}usr --debug"
 	else
-	    local my_conf="--prefix ${D}usr"
+	    my_conf="--prefix ${D}usr"
 	fi
 
 	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
+	    export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
+	    export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
@@ -100,8 +105,9 @@ src_compile() {
 		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
 		    {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
 	    fi
-	    if use tetex; then
+	    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.'
@@ -132,8 +138,8 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/${PF}
-	    if use tetex; then
+	    insinto /usr/share/doc/"${PF}"
+	    if use latex; then
 		doins latex/doxygen_manual.pdf
 	    fi
 	    dohtml -r html/*
@@ -144,7 +150,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 
 	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
+	elog "The USE flags qt3, 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"
@@ -152,7 +158,8 @@ pkg_postinst() {
 	elog
 	elog "Enabling the nodot 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 language support tools."
+	elog "See the Doxygen homepage for additional helper tools to parse"
+	elog "more languages."
 	elog
 }
 
diff --git a/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
deleted file mode 100644
index 0ffed14733e1..000000000000
--- a/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- qtools/qtextcodec.cpp.orig	2003-12-14 14:00:57.000000000 -0800
-+++ qtools/qtextcodec.cpp	2005-05-29 19:13:17.000000000 -0700
-@@ -1321,7 +1321,7 @@
- 
- 
- 
--#ifndef QT_NO_CODECS
-+// #ifndef QT_NO_CODECS
- 
- class QSimpleTextCodec: public QTextCodec
- {
-@@ -1948,7 +1948,7 @@
- }
- 
- 
--#endif // QT_NO_CODECS
-+// #endif // QT_NO_CODECS
- 
- class QLatin1Codec: public QTextCodec
- {
-@@ -2048,12 +2048,13 @@
- {
-     (void)new QLatin1Codec;
- 
--#ifndef QT_NO_CODECS
-+
-     int i = 0;
-     do {
-         (void)new QSimpleTextCodec( i );
-     } while( unicodevalues[i++].mib != LAST_MIB );
- 
-+#ifndef QT_NO_CODECS
-     (void)new QEucJpCodec;
-     (void)new QSjisCodec;
-     (void)new QJisCodec;
diff --git a/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch b/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
deleted file mode 100644
index 16a827dd5384..000000000000
--- a/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: doxygen-1.4.6/configure
-===================================================================
---- doxygen-1.4.6.orig/configure
-+++ doxygen-1.4.6/configure
-@@ -158,6 +158,9 @@ if test -z "$f_platform"; then
-       ;;
-     FreeBSD:*)
-       f_platform=freebsd-g++
-+      if test "$f_insttool" = NO; then
-+        f_insttool=/usr/bin/install
-+      fi
-       ;;
-     HP-UX:*)
-       f_platform=hpux-g++
diff --git a/app-doc/doxygen/files/1.4.6/03_all_segfault.patch b/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
deleted file mode 100644
index 5b62c475cff5..000000000000
--- a/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doxygen-1.4.6.orig/src/doxygen.cpp
-+++ doxygen-1.4.6/src/doxygen.cpp
-@@ -1912,7 +1912,7 @@
-         // variable already in the scope
-       {
-         if (! // not a php array
--            (getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
-+            (md->getFileDef() && getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
-             (md->argsString()!=root->args && root->args.find('[')!=-1)
-            ) 
-           // not a php array variable
diff --git a/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
deleted file mode 100644
index 491e3a22a801..000000000000
--- a/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch
-+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch
-@@ -0,0 +1,121 @@
-+#! /bin/sh -e
-+
-+# DP: Use the system libpng library
-+
-+dir=
-+if [ $# -eq 3 -a "$2" = '-d' ]; then
-+    pdir="-d $3"
-+    dir="$3/"
-+elif [ $# -ne 1 ]; then
-+    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch)
-+        patch $pdir -f --no-backup-if-mismatch -p1 < $0
-+        ;;
-+    -unpatch)
-+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
-+        ;;
-+    *)
-+	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+        exit 1
-+esac
-+exit 0
-+
-+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp
-+--- ./src/pngenc.cpp.orig	2004-01-06 04:40:25.000000000 +0100
-++++ ./src/pngenc.cpp	2004-09-21 09:04:40.000000000 +0200
-+@@ -25,7 +25,7 @@
-+ #endif
-+ 
-+ #define ALL_STATIC
-+-#include <../libpng/png.h>
-++#include <png.h>
-+ #include <stdio.h>
-+ #include <stdlib.h>
-+ #include <string.h>
-+diff -u ./Makefile.in.orig ./Makefile.in
-+--- ./Makefile.in.orig	2003-11-13 04:40:21.000000000 +0100
-++++ ./Makefile.in	2004-09-21 09:04:40.000000000 +0200
-+@@ -7,7 +7,6 @@
-+ 	cd doc ; $(MAKE) clean
-+ 	cd qtools ; $(MAKE) clean
-+ 	cd src ; $(MAKE) clean
-+-	cd libpng ; $(MAKE) clean
-+ 	cd libmd5 ; $(MAKE) clean
-+ 	cd addon/doxywizard ; $(MAKE) clean
-+ 	cd addon/doxmlparser/src ; $(MAKE) clean
-+@@ -18,7 +17,6 @@
-+ 
-+ distclean: clean
-+ 	cd src ; $(MAKE) distclean
-+-	cd libpng ; $(MAKE) distclean
-+ 	cd libmd5 ; $(MAKE) distclean
-+ 	cd addon/doxywizard ; $(MAKE) distclean
-+ 	cd addon/doxmlparser/src ; $(MAKE) distclean
-+@@ -31,11 +29,10 @@
-+ 	-rm -f objects/*.o
-+ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
-+ 	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
-+-	-rm -f libpng/Makefile.libpng
-+ 	-rm -f libmd5/Makefile.libmd5
-+ 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
-+ 	-rm -f .makeconfig .tmakeconfig
-+-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
-++	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
-+ 	-rm -f src/version.cpp
-+ 	-rm -r addon/doxywizard/Makefile
-+ 	-rm -f addon/doxywizard/Makefile.doxywizard
-+diff -u ./configure.orig ./configure
-+--- ./configure.orig	2004-09-14 04:40:12.000000000 +0200
-++++ ./configure	2004-09-21 09:09:06.000000000 +0200
-+@@ -457,7 +457,7 @@
-+ EOF
-+ fi
-+ 
-+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in"
-++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in"
-+ 
-+ for i in $f_inmakefiles ; do
-+      SRC=$i
-+@@ -474,7 +474,6 @@
-+        echo "" >> $DST
-+        echo "all: src/version.cpp " >> $DST
-+        echo "	\$(MAKE) -C qtools" >> $DST
-+-       echo "	\$(MAKE) -C libpng" >> $DST
-+        echo "	\$(MAKE) -C libmd5" >> $DST
-+        echo "	\$(MAKE) -C src" >> $DST
-+        if test $f_wizard = YES; then
-+@@ -491,7 +490,7 @@
-+      echo "  Created $DST from $SRC..."
-+ done
-+ 
-+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" 
-++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" 
-+ 
-+ for i in $f_inprofiles ; do
-+      SRC=$i
-+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in
-+--- ./src/doxygen.pro.in.orig	2004-05-18 04:40:13.000000000 +0200
-++++ ./src/doxygen.pro.in	2004-09-21 09:58:06.000000000 +0200
-+@@ -28,7 +28,7 @@
-+ win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
-+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-+-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
-++INCLUDEPATH                += ../qtools ../libmd5 .
-+ #win32-g++:INCLUDEPATH      -= ../libpng
-+ DESTDIR                    =  ../bin
-+ TARGET                     =  doxygen
-+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in
-+--- ./src/libdoxygen.pro.in.orig	2004-08-25 04:40:18.000000000 +0200
-++++ ./src/libdoxygen.pro.in	2004-09-21 09:58:55.000000000 +0200
-+@@ -189,7 +189,6 @@
-+ win32-msvc:TMAKE_CXXFLAGS  += -Zm200
-+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-+ INCLUDEPATH                += ../qtools
-+-INCLUDEPATH                += ../libpng
-+ INCLUDEPATH                += ../libmd5
-+ win32:INCLUDEPATH          += .
-+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
diff --git a/app-doc/doxygen/files/1.4.6/06_all_qtools.patch b/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
deleted file mode 100644
index 38a4fcbf000e..000000000000
--- a/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch
-+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch
-@@ -0,0 +1,41 @@
-+#! /bin/sh -e
-+
-+# DP: Remove unused code that does not build with gcc 4.0 (#338099).
-+
-+dir=
-+if [ $# -eq 3 -a "$2" = '-d' ]; then
-+    pdir="-d $3"
-+    dir="$3/"
-+elif [ $# -ne 1 ]; then
-+    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch)
-+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-+        ;;
-+    -unpatch)
-+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-+        ;;
-+    *)
-+	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+        exit 1
-+esac
-+exit 0
-+
-+--- qtools/qstring.h.orig	2004-12-01 19:26:16.000000000 +0000
-++++ qtools/qstring.h	2005-12-04 20:09:01.000000000 +0000
-+@@ -163,8 +163,13 @@
-+     bool isLetterOrNumber() const;
-+     bool isDigit() const;
-+ 
-++    // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM,
-++    // so they have been removed; the methods are not needed for doxygen
-++#if 0
-+     uchar& cell() { return cl; }
-+     uchar& row() { return rw; }
-++#endif
-++
-+     uchar cell() const { return cl; }
-+     uchar row() const { return rw; }
-+