updated to latest upstream release, fixes bug 198954

Package-Manager: portage-2.1.3.19

12 files changed, 248 insertions, 87 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e37abd68e4c1..eccb8e70a579 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.132 2007/09/21 13:07:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.133 2007/11/21 06:17:24 nerdboy Exp $
+
+*doxygen-1.5.4 (21 Nov 2007)
+
+  21 Nov 2007; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.5.4.ebuild:
+  Updated to new version, closes bug 198954.
 
   21 Sep 2007; Roy Marples <uberlord@gentoo.org> doxygen-1.5.3.ebuild:
   Link to libiconv for FreeBSD.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 93157c79ea79..d6c5c9e1a3be 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -69,47 +69,52 @@ DIST doxygen-1.5.1-utf8-ru.patch.gz 14581 RMD160 a0237fc0fb52cae3483e15ccbdb0633
 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-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
-EBUILD doxygen-1.4.2.ebuild 3429 RMD160 fa41161c6260fb6269795f4db773f7c58222e2d4 SHA1 c50ad8bb6637c32c338508858f8141abae0d641e SHA256 79ab53ba00a45234b9cf66b7313e01d2bc97af49c2e9fb0bc41830a5e86fb20e
-MD5 1d3a0f778b1172b3564d0d75d235b49e doxygen-1.4.2.ebuild 3429
-RMD160 fa41161c6260fb6269795f4db773f7c58222e2d4 doxygen-1.4.2.ebuild 3429
-SHA256 79ab53ba00a45234b9cf66b7313e01d2bc97af49c2e9fb0bc41830a5e86fb20e doxygen-1.4.2.ebuild 3429
-EBUILD doxygen-1.4.3-r1.ebuild 3514 RMD160 878a3417efb831d5124c234f9ba93b71d000d3a7 SHA1 40bacf495ae5f62aa895e1b3183ed9afc2f7e8a8 SHA256 ebf60a1bc42e9875ef4174475efeec5fc0b35eb0b7cf64ed4e1a29294893d702
-MD5 3e3f64c8a69c4b3be45027f12a7c5c06 doxygen-1.4.3-r1.ebuild 3514
-RMD160 878a3417efb831d5124c234f9ba93b71d000d3a7 doxygen-1.4.3-r1.ebuild 3514
-SHA256 ebf60a1bc42e9875ef4174475efeec5fc0b35eb0b7cf64ed4e1a29294893d702 doxygen-1.4.3-r1.ebuild 3514
+EBUILD doxygen-1.4.2.ebuild 3423 RMD160 7875cc707aa4f1630617f0f11467096e76fa0463 SHA1 0d9fe043c5a169934a7f4968b5363feb995e71ab SHA256 1a55ebbb3f9b8f3f95682a913870efad5393b4951792f19f86402def08e77041
+MD5 9aa3760511868cfebb65133599ddd36b doxygen-1.4.2.ebuild 3423
+RMD160 7875cc707aa4f1630617f0f11467096e76fa0463 doxygen-1.4.2.ebuild 3423
+SHA256 1a55ebbb3f9b8f3f95682a913870efad5393b4951792f19f86402def08e77041 doxygen-1.4.2.ebuild 3423
+EBUILD doxygen-1.4.3-r1.ebuild 3513 RMD160 306203d9e752a9f1cc92a3f90538ac659b80d436 SHA1 ad7474b40165cde3338a8563de799c60f4107ae0 SHA256 8de55e432d24a20d85338f0706caa01163fb7a64c82f156d16b36450b4a7fb56
+MD5 f4b1477f084a6cb2306a376d512418a4 doxygen-1.4.3-r1.ebuild 3513
+RMD160 306203d9e752a9f1cc92a3f90538ac659b80d436 doxygen-1.4.3-r1.ebuild 3513
+SHA256 8de55e432d24a20d85338f0706caa01163fb7a64c82f156d16b36450b4a7fb56 doxygen-1.4.3-r1.ebuild 3513
 EBUILD doxygen-1.4.4.ebuild 3354 RMD160 76223378e70bfb5e8be21a9104bfe2110f37ec3c SHA1 6fd57936c4c678390113ca58a514b522ac20b58c SHA256 099b2bb2e67e5951f6d552fa23b009695139644541ff99fe8329e7b2c84194c0
 MD5 650f74808adaa75b95e000acd8f9b204 doxygen-1.4.4.ebuild 3354
 RMD160 76223378e70bfb5e8be21a9104bfe2110f37ec3c doxygen-1.4.4.ebuild 3354
 SHA256 099b2bb2e67e5951f6d552fa23b009695139644541ff99fe8329e7b2c84194c0 doxygen-1.4.4.ebuild 3354
-EBUILD doxygen-1.4.5.ebuild 3380 RMD160 10b050fbaf2957b6f6b5b57a61d835bb5ca45752 SHA1 9bd6a02b5f59d794dcdbac6ed4b49823de6be2fa SHA256 cc5953328834b00cd8c79076e1ea35bf3c6a22aaf4a25a5a84c70d0b67687ef0
-MD5 d07e941c3e46f369f00ef2d9efe72a9d doxygen-1.4.5.ebuild 3380
-RMD160 10b050fbaf2957b6f6b5b57a61d835bb5ca45752 doxygen-1.4.5.ebuild 3380
-SHA256 cc5953328834b00cd8c79076e1ea35bf3c6a22aaf4a25a5a84c70d0b67687ef0 doxygen-1.4.5.ebuild 3380
-EBUILD doxygen-1.4.6.ebuild 3837 RMD160 3e1cd17d4e759765f0d3709a058abee918837a7f SHA1 3b9a1538802650cb9f1ca91f20fdd7417cc62611 SHA256 52026ab8ee40832734f99292d45f69406668ca277ced9ede27d4a80d192b6442
-MD5 a2acf2bc000dfaacb1f0fe4579ba6550 doxygen-1.4.6.ebuild 3837
-RMD160 3e1cd17d4e759765f0d3709a058abee918837a7f doxygen-1.4.6.ebuild 3837
-SHA256 52026ab8ee40832734f99292d45f69406668ca277ced9ede27d4a80d192b6442 doxygen-1.4.6.ebuild 3837
-EBUILD doxygen-1.4.7.ebuild 4039 RMD160 64a748dad33f452784cc117a0850ef2e1ff14659 SHA1 4c74d71bc1af518831b10aeae8357c5cf745dfdc SHA256 81bab2c29033cf7f3116803f2057f3bb6e91f21b0626508865ac95aac636941d
-MD5 d812cc166976d56750275cef6ddefa18 doxygen-1.4.7.ebuild 4039
-RMD160 64a748dad33f452784cc117a0850ef2e1ff14659 doxygen-1.4.7.ebuild 4039
-SHA256 81bab2c29033cf7f3116803f2057f3bb6e91f21b0626508865ac95aac636941d doxygen-1.4.7.ebuild 4039
-EBUILD doxygen-1.5.1.ebuild 4063 RMD160 405320bb4954c62db21a2efafe7a5bfe25746057 SHA1 4e9f947ebb67af53b7ebca1b480a40f7afbf614f SHA256 fdeba9ee38d1cadd40cbf0d680ab3970fbf808f419c61fd83147ad01e1ac8f35
-MD5 2d0814d6d13a4faf05439b39aeb2a89a doxygen-1.5.1.ebuild 4063
-RMD160 405320bb4954c62db21a2efafe7a5bfe25746057 doxygen-1.5.1.ebuild 4063
-SHA256 fdeba9ee38d1cadd40cbf0d680ab3970fbf808f419c61fd83147ad01e1ac8f35 doxygen-1.5.1.ebuild 4063
-EBUILD doxygen-1.5.2.ebuild 3824 RMD160 b01a9428a1566a247281cafce41737de721621f9 SHA1 9373079fa818457e81c474b35a2944fcb579c0cd SHA256 8f5836e1533c9b902b0326ac9e4f789c6b397a9f2a39395c7b4815591c056065
-MD5 e129a38cd61d1ccf52a976b7b68a29ee doxygen-1.5.2.ebuild 3824
-RMD160 b01a9428a1566a247281cafce41737de721621f9 doxygen-1.5.2.ebuild 3824
-SHA256 8f5836e1533c9b902b0326ac9e4f789c6b397a9f2a39395c7b4815591c056065 doxygen-1.5.2.ebuild 3824
-EBUILD doxygen-1.5.3.ebuild 4739 RMD160 c5e2858ca6eaa77ad738cd15e8be4e7106218580 SHA1 29ed12b1da5f8e76307100f43a9ea20609ff33dd SHA256 e3af6f061d83cf26a706b9a9b035841e2d80bbbc8b8190a354f7878f765b3423
-MD5 832ad93e882cc0958fc00bd491774bdc doxygen-1.5.3.ebuild 4739
-RMD160 c5e2858ca6eaa77ad738cd15e8be4e7106218580 doxygen-1.5.3.ebuild 4739
-SHA256 e3af6f061d83cf26a706b9a9b035841e2d80bbbc8b8190a354f7878f765b3423 doxygen-1.5.3.ebuild 4739
-MISC ChangeLog 21599 RMD160 ac7f9390faaf9b85b1229ff2af030954fc3b9fef SHA1 b57d97fe06dd46762ca0a83f0e9a125479421dc2 SHA256 0b3484ec9913207c12438be8c12a74e76c720733f51e2511c84159a98051e5bc
-MD5 6478e9377ff18aca49b8a3c30cfdee31 ChangeLog 21599
-RMD160 ac7f9390faaf9b85b1229ff2af030954fc3b9fef ChangeLog 21599
-SHA256 0b3484ec9913207c12438be8c12a74e76c720733f51e2511c84159a98051e5bc ChangeLog 21599
+EBUILD doxygen-1.4.5.ebuild 3376 RMD160 3e9b9ff3c630d92f0ce21678b918783c20cd067c SHA1 e6660b70fd1cfc9964b07f55534b2b58b0d63ab1 SHA256 24ac41ec8a5bcb4424034a1e0b943afa429fcc5518f638dbfdafe954e0cedf98
+MD5 0a7ff010eac0bb8cdccf9bde17d5d6db doxygen-1.4.5.ebuild 3376
+RMD160 3e9b9ff3c630d92f0ce21678b918783c20cd067c doxygen-1.4.5.ebuild 3376
+SHA256 24ac41ec8a5bcb4424034a1e0b943afa429fcc5518f638dbfdafe954e0cedf98 doxygen-1.4.5.ebuild 3376
+EBUILD doxygen-1.4.6.ebuild 3831 RMD160 5617ef43a787b8cac7dbf808c5f40da54f9cd4c8 SHA1 264ef6938aad42577209bf919528bf28f99ef54d SHA256 6e0cc04a74c2aaf45217051c35a1a3bed8cc0d871663fd241904a98da0c85582
+MD5 02eaff9cce5d1cb581b398b7a902762c doxygen-1.4.6.ebuild 3831
+RMD160 5617ef43a787b8cac7dbf808c5f40da54f9cd4c8 doxygen-1.4.6.ebuild 3831
+SHA256 6e0cc04a74c2aaf45217051c35a1a3bed8cc0d871663fd241904a98da0c85582 doxygen-1.4.6.ebuild 3831
+EBUILD doxygen-1.4.7.ebuild 4047 RMD160 3f161f352529858c7e95a4df253e5f2788d055a9 SHA1 f2ce6488bf29c0937c83b090e7a4e23b967c6868 SHA256 2ff7be201f8f688cda8618671420af1afe5635efd080c46df496c7639af49d4f
+MD5 66183927fd84e149f24af076961e63b5 doxygen-1.4.7.ebuild 4047
+RMD160 3f161f352529858c7e95a4df253e5f2788d055a9 doxygen-1.4.7.ebuild 4047
+SHA256 2ff7be201f8f688cda8618671420af1afe5635efd080c46df496c7639af49d4f doxygen-1.4.7.ebuild 4047
+EBUILD doxygen-1.5.1.ebuild 4071 RMD160 657cc50ca98d4a6fea97636387a8ce786bae0cdd SHA1 64b4cfafa42312d61a944a30639b9cf034d04df5 SHA256 59565ed9a82fd37c9220d24d511fa31a032906b50e421c1a8a8baee41f8490a7
+MD5 29cf31cdda7b87b3a6c2532fd349a70e doxygen-1.5.1.ebuild 4071
+RMD160 657cc50ca98d4a6fea97636387a8ce786bae0cdd doxygen-1.5.1.ebuild 4071
+SHA256 59565ed9a82fd37c9220d24d511fa31a032906b50e421c1a8a8baee41f8490a7 doxygen-1.5.1.ebuild 4071
+EBUILD doxygen-1.5.2.ebuild 3832 RMD160 9d3a85bfab1bd258ca31237b7d1f27d70232a9fc SHA1 ecd563e0641bcaa7be542338f15d3785390cde86 SHA256 846b0798edf5d3ee0c3cd4aeb4ddf7bbcf9bc2ed76b4782e38e907f09da2e9a7
+MD5 e74c37e15da93f94cdf132c383871a50 doxygen-1.5.2.ebuild 3832
+RMD160 9d3a85bfab1bd258ca31237b7d1f27d70232a9fc doxygen-1.5.2.ebuild 3832
+SHA256 846b0798edf5d3ee0c3cd4aeb4ddf7bbcf9bc2ed76b4782e38e907f09da2e9a7 doxygen-1.5.2.ebuild 3832
+EBUILD doxygen-1.5.3.ebuild 4747 RMD160 31fd4c687af81273547de091e076133355aaea58 SHA1 a5bfc4fdf1d118afa1f12109dac868962a7a0d96 SHA256 ad270df8ab0f2dde6896e0de82f582d7405061423f9d45cbc16b024e5cd0b220
+MD5 1ac1bd8677b02f637041f948470ebf65 doxygen-1.5.3.ebuild 4747
+RMD160 31fd4c687af81273547de091e076133355aaea58 doxygen-1.5.3.ebuild 4747
+SHA256 ad270df8ab0f2dde6896e0de82f582d7405061423f9d45cbc16b024e5cd0b220 doxygen-1.5.3.ebuild 4747
+EBUILD doxygen-1.5.4.ebuild 4594 RMD160 ea4f773142c8699700442fc8691c00f67f57f0b1 SHA1 55290bf732cb5917fbc7610a7d28dde0ca9617ab SHA256 a8202ee8ded2eb1b63b66f6af8d43e47ebaf6537b2a982d75e8e940160f1b2d9
+MD5 97a66a2e96cabd95d9793a94982e5f08 doxygen-1.5.4.ebuild 4594
+RMD160 ea4f773142c8699700442fc8691c00f67f57f0b1 doxygen-1.5.4.ebuild 4594
+SHA256 a8202ee8ded2eb1b63b66f6af8d43e47ebaf6537b2a982d75e8e940160f1b2d9 doxygen-1.5.4.ebuild 4594
+MISC ChangeLog 21746 RMD160 189d3c0d1bf53a0cff1c8d15c00b1d79ad75dfab SHA1 317d1939231c4102dbb27d8b1c7ecf1b4ffd0444 SHA256 bf9e13d4dd3eea2f9707682cb707fa783171a3317afa1d3bfd3ec00a2f3e8dea
+MD5 50eeba412c53682795d3ae89216efddb ChangeLog 21746
+RMD160 189d3c0d1bf53a0cff1c8d15c00b1d79ad75dfab ChangeLog 21746
+SHA256 bf9e13d4dd3eea2f9707682cb707fa783171a3317afa1d3bfd3ec00a2f3e8dea ChangeLog 21746
 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b
 MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
@@ -141,3 +146,6 @@ SHA256 4497e4957fbd0349ba4d9e6ea8d94904018930db7d9513ff5da5e94445c5703e files/di
 MD5 21d9e38d0271b87980cf30bdf9f864dc files/digest-doxygen-1.5.3 256
 RMD160 6f7295c02dafb2abc40dfe731bb8625ecef1a51e files/digest-doxygen-1.5.3 256
 SHA256 f35cf98d3503e80b9277a8ddde7361217a898784e0ca798bbc6a6ea16c0ed743 files/digest-doxygen-1.5.3 256
+MD5 33c70287523ec6438959f32af40124e6 files/digest-doxygen-1.5.4 256
+RMD160 8996d1b8bbddad7f78db98d835880384ec9fd05d files/digest-doxygen-1.5.4 256
+SHA256 9a6a1aabf2f2b979544886271aa1e2e9e2af87336bfd33e9f8f00b7fdc183fdb files/digest-doxygen-1.5.4 256
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index 78144977f0b0..fa44e817918b 100644
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.21 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.22 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -22,24 +22,24 @@ DEPEND="media-gfx/graphviz
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+		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"
+		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"
+		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
 	fi
 }
 
@@ -83,10 +83,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
-	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+	dodoc LANGUAGE.HOWTO README VERSION
 
 	# pdf and html manuals
 	if use doc; then
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
index 902e65b1aedf..ef260a61a859 100644
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.17 2007/08/25 13:45:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.18 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -23,27 +23,27 @@ DEPEND=">=sys-apps/sed-4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+	epatch "${FILESDIR}/${P}-cp1251.patch"
+	epatch "${FILESDIR}/${P}-nls.patch"
 
 	if use userland_Darwin; then
-		epatch ${FILESDIR}/bsd-configure.patch
+		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"
+		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"
+		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
 	fi
 }
 
@@ -87,10 +87,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
-	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+	dodoc LANGUAGE.HOWTO README VERSION
 
 	# pdf and html manuals
 	if use doc; then
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 60afe15de32d..41efeb841672 100644
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.11 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.12 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -23,21 +23,21 @@ DEPEND=">=sys-apps/sed-4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# use CFLAGS and CXXFLAGS (on linux and ppc-macos)
 	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
+	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"
+		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"
+		"epatch ${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
 	fi
 }
 
@@ -81,10 +81,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
-	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+	dodoc LANGUAGE.HOWTO README VERSION
 
 	# pdf and html manuals
 	if use doc; then
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index a9fda04e74eb..70b82e76ce74 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.13 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.14 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -26,7 +26,7 @@ EPATCH_SUFFIX="patch"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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):' \
@@ -34,16 +34,16 @@ src_unpack() {
 		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"
+		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"
+		"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}
+	epatch "${FILESDIR}/${PV}"
 }
 
 src_compile() {
@@ -88,10 +88,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
-	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+	dodoc LANGUAGE.HOWTO README VERSION
 
 	# pdf and html manuals
 	if use doc; then
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
index 456b91505cc7..1e2eea841b8f 100644
--- a/app-doc/doxygen/doxygen-1.4.7.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.20 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.21 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
@@ -25,11 +25,11 @@ EPATCH_SUFFIX="patch"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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"
+	    epatch "${WORKDIR}/${P}-utf8-ru.patch" || die "utf8-ru patch failed"
 	fi
 
 	# use CFLAGS, CXXFLAGS, LDFLAGS
@@ -40,7 +40,7 @@ src_unpack() {
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch ${FILESDIR}/${PV}
+	epatch "${FILESDIR}/${PV}"
 
 	if is-flagq "-O3" ; then
 	    echo
@@ -96,7 +96,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
 	dodoc INSTALL LANGUAGE.HOWTO README
diff --git a/app-doc/doxygen/doxygen-1.5.1.ebuild b/app-doc/doxygen/doxygen-1.5.1.ebuild
index 359bc52b881a..03f43a8f247e 100644
--- a/app-doc/doxygen/doxygen-1.5.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.5 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
@@ -25,11 +25,11 @@ EPATCH_SUFFIX="patch"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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"
+	    epatch "${WORKDIR}/${P}-utf8-ru.patch" || die "utf8-ru patch failed"
 	fi
 
 	# use CFLAGS, CXXFLAGS, LDFLAGS
@@ -40,7 +40,7 @@ src_unpack() {
 
 	# 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
+	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
 	if is-flagq "-O3" ; then
 	    echo
@@ -96,7 +96,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
 	dodoc INSTALL LANGUAGE.HOWTO README
diff --git a/app-doc/doxygen/doxygen-1.5.2.ebuild b/app-doc/doxygen/doxygen-1.5.2.ebuild
index 4f349aff8631..7dc1c0603771 100644
--- a/app-doc/doxygen/doxygen-1.5.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.9 2007/07/23 02:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.10 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
@@ -24,7 +24,7 @@ EPATCH_SUFFIX="patch"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
@@ -34,7 +34,7 @@ src_unpack() {
 
 	# 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
+	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
 	if is-flagq "-O3" ; then
 	    echo
@@ -91,7 +91,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
 	dodoc INSTALL LANGUAGE.HOWTO README
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.3.ebuild
index 175f95aaba4c..0d0560569f6e 100644
--- a/app-doc/doxygen/doxygen-1.5.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3 2007/11/03 16:39:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.4 2007/11/21 06:17:24 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
 
@@ -24,7 +24,7 @@ EPATCH_SUFFIX="patch"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
@@ -42,7 +42,7 @@ src_unpack() {
 
 	# 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
+	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
 	if is-flagq "-O3" ; then
 	    echo
@@ -110,11 +110,11 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} MAN1DIR=share/man/man1 \
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
 	if use qt3; then
-	    doicon ${FILESDIR}/doxywizard.png
+	    doicon "${FILESDIR}/doxywizard.png"
 	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
 	fi
diff --git a/app-doc/doxygen/doxygen-1.5.4.ebuild b/app-doc/doxygen/doxygen-1.5.4.ebuild
new file mode 100644
index 000000000000..96b10aa9b7c8
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.5.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.1 2007/11/21 06:17:24 nerdboy Exp $
+
+inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
+
+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"
+
+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"
+
+RDEPEND="qt3? ( $(qt_min_version 3.3) )
+	tetex? ( virtual/tetex )
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.6 )"
+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 \
+	    || die "sed failed"
+
+	# 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)
+
+	if use debug; then
+	    local my_conf="--prefix ${D}usr --debug"
+	else
+	    local 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}
+	    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 with qt3 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 nodot; then
+		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+		    {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
+	    fi
+	    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.'
+
+	if use qt3; then
+	    doicon "${FILESDIR}/doxywizard.png"
+	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		"doxywizard.png" "Application;Development"
+	fi
+
+	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() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt, 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 "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
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/files/digest-doxygen-1.5.4 b/app-doc/doxygen/files/digest-doxygen-1.5.4
new file mode 100644
index 000000000000..a83c890e0f4a
--- /dev/null
+++ b/app-doc/doxygen/files/digest-doxygen-1.5.4
@@ -0,0 +1,3 @@
+MD5 10ffe8d445dc1bf7dd69292b266906ff doxygen-1.5.4.src.tar.gz 3762535
+RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf doxygen-1.5.4.src.tar.gz 3762535
+SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2 doxygen-1.5.4.src.tar.gz 3762535