updated with patch from bug #210237 and added latest release

Package-Manager: portage-2.1.4.1

11 files changed, 337 insertions, 20 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index b9a4040bc823..48db95ae95ac 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,17 @@
 # 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.141 2008/01/24 20:30:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.142 2008/02/16 20:24:36 nerdboy Exp $
+
+*doxygen-1.5.5 (16 Feb 2008)
+
+  16 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/doxygen-1.5-qtlibdir.patch, +files/doxygen-1.5-system-libpng.patch,
+  doxygen-1.5.2.ebuild, doxygen-1.5.3.ebuild, doxygen-1.5.4.ebuild,
+  +doxygen-1.5.5.ebuild:
+  Updated with patch from bug #210237 and added latest release.  Fixed
+  broken config with hack for lib64 path for QT and back-ported patches
+  to several previous versions (tested on both 32 and 64-bit machines).
+  Closes bugs #209977 and #210237.
 
   24 Jan 2008; Christoph Mende <angelos@gentoo.org> doxygen-1.5.4.ebuild:
   Stable on amd64, bug #203652
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4878a2f016ef..c248c7011204 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -11,6 +11,8 @@ AUX doxygen-1.4.3-cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f22857
 AUX doxygen-1.4.3-nls.patch 1019 RMD160 e8899cc8c20ee501c57106c065926624c28669a1 SHA1 086b81341bd81e6b589356896ed9379663226496 SHA256 44a603217bb38844bdb7ed13396fd3bfd96e36763952354c10e706dab788e5c7
 AUX doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328ddb SHA1 230823cec84a2ea7bc0986f1f22f52856a522848 SHA256 a7a0ff21dbff292e389d7c5a6ce26b7059ea8bf3aebc2187a78b88afc3f49b41
 AUX doxygen-1.5-legacy-patches.diff 7242 RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 SHA1 bb564532f157e72436e0c8ecbbed163d96db3674 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114
+AUX doxygen-1.5-qtlibdir.patch 354 RMD160 9c9491d89379f1e68e57722be438ce6af80110cd SHA1 7a26ec0fdc2dd22f97c1fd2acad21188137c71b2 SHA256 602038066a93ffd163c7f18b15362a9f2443bb7e842675d7de81bf5026ca9c2e
+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
@@ -25,16 +27,18 @@ DIST doxygen-1.5.1.src.tar.gz 2888159 RMD160 bacd34a5a69833e42e116d997c99df03dd8
 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-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
 EBUILD doxygen-1.4.2.ebuild 3423 RMD160 7875cc707aa4f1630617f0f11467096e76fa0463 SHA1 0d9fe043c5a169934a7f4968b5363feb995e71ab SHA256 1a55ebbb3f9b8f3f95682a913870efad5393b4951792f19f86402def08e77041
 EBUILD doxygen-1.4.3-r1.ebuild 3513 RMD160 306203d9e752a9f1cc92a3f90538ac659b80d436 SHA1 ad7474b40165cde3338a8563de799c60f4107ae0 SHA256 8de55e432d24a20d85338f0706caa01163fb7a64c82f156d16b36450b4a7fb56
-EBUILD doxygen-1.4.4.ebuild 3351 RMD160 61ab79ff85a8f782968231670bcac6caeddaaa58 SHA1 64aedaee457b91a7522fc00ce2ee2b1bc0f858e2 SHA256 8606205305ff73df3858277ecf2b9c152cd91605a07514def09e8e38c0603cd9
-EBUILD doxygen-1.4.5.ebuild 3373 RMD160 eed86b4e57630cf74314dff8b704a497735178ac SHA1 e891955c773cf519e0a7293ecc9572867770ddd0 SHA256 ff085bf82a810dbcdb88a33f63ce2eaa12c0afe76b134b51005ef061ee265e8c
-EBUILD doxygen-1.4.6.ebuild 3831 RMD160 5617ef43a787b8cac7dbf808c5f40da54f9cd4c8 SHA1 264ef6938aad42577209bf919528bf28f99ef54d SHA256 6e0cc04a74c2aaf45217051c35a1a3bed8cc0d871663fd241904a98da0c85582
+EBUILD doxygen-1.4.4.ebuild 3351 RMD160 31edd06f261bb260c43e5eb8702e214c01c14b23 SHA1 3b5df4cad1beaadd11cc815f5802be4bd5042d8a SHA256 d8dac5149bc576044880800faa031cbe5e577b1967d24ccce1d227f3e1d7976f
+EBUILD doxygen-1.4.5.ebuild 3373 RMD160 f84693c6651e6e7454e0679c571564354f2b6c73 SHA1 84d2ddd27ea9e7fdf6c6898925e382f12494c9cc SHA256 352d251b972b84a0ad883451c62ad9081ae676979ae802015ccb16a9c84cac39
+EBUILD doxygen-1.4.6.ebuild 3825 RMD160 99cca515a1f2a6f8ada8292029141904f98f992a SHA1 8076796d8702432774d1fc7308c7744783bf1747 SHA256 604978c8f983c60acbb6525b3b728a7a91da74f87904af78912f6706a27de7e1
 EBUILD doxygen-1.4.7.ebuild 4047 RMD160 3f161f352529858c7e95a4df253e5f2788d055a9 SHA1 f2ce6488bf29c0937c83b090e7a4e23b967c6868 SHA256 2ff7be201f8f688cda8618671420af1afe5635efd080c46df496c7639af49d4f
 EBUILD doxygen-1.5.1.ebuild 4071 RMD160 657cc50ca98d4a6fea97636387a8ce786bae0cdd SHA1 64b4cfafa42312d61a944a30639b9cf034d04df5 SHA256 59565ed9a82fd37c9220d24d511fa31a032906b50e421c1a8a8baee41f8490a7
-EBUILD doxygen-1.5.2.ebuild 3832 RMD160 9d3a85bfab1bd258ca31237b7d1f27d70232a9fc SHA1 ecd563e0641bcaa7be542338f15d3785390cde86 SHA256 846b0798edf5d3ee0c3cd4aeb4ddf7bbcf9bc2ed76b4782e38e907f09da2e9a7
-EBUILD doxygen-1.5.3.ebuild 4747 RMD160 31fd4c687af81273547de091e076133355aaea58 SHA1 a5bfc4fdf1d118afa1f12109dac868962a7a0d96 SHA256 ad270df8ab0f2dde6896e0de82f582d7405061423f9d45cbc16b024e5cd0b220
-EBUILD doxygen-1.5.4.ebuild 4816 RMD160 52ac938ded6443cbbf1ad7fa503964b205f76ff0 SHA1 d2753f784679a7644e6044c2b6731de37a93da48 SHA256 8b93e7c5b9c414878419c8550d6262067bcf113d16e97f79c03b024f7554057f
-MISC ChangeLog 22711 RMD160 d9f9c3a0e43eb3c191eb59f064f2a1c0bf10c766 SHA1 bbc63cefcab95f7bc2b0324c2b41de62558114aa SHA256 b0d18bbfab3dee842f70b95a318126b19360921efdccf3f6cd95d408ee90658f
+EBUILD doxygen-1.5.2.ebuild 4025 RMD160 d7c252a75e7a96a9f8cc7e08db25690818e2d7da SHA1 71b181cd063288d3c752b7bc045b020ecdf1d138 SHA256 5fc0d48327d49ff66a0c55406690e43aecfac9fe43a97487b95d6d3e6f711125
+EBUILD doxygen-1.5.3.ebuild 4940 RMD160 194e2891ae15bc8eb66ac75b637ccf1982a602e9 SHA1 777f892e8e46b2f5a4390075957983ac34b2d7e8 SHA256 7ffcee6c6ad3e61df2d9c8c8d64524d0c68be36d6b9c78acea2cd8de9e2130b0
+EBUILD doxygen-1.5.4.ebuild 5009 RMD160 b402320dc774f2137bdc991a5a1dd2affcee8f87 SHA1 4283c1d3a76abc5558163ba1ee7530b1250cac7d SHA256 fceff6f0f53b315688b69b0c9bf1c8accafb5ccb53df85902ba44ac7a732e37f
+EBUILD doxygen-1.5.5.ebuild 5055 RMD160 171973d077e3f71a7d0e477c1b3b964761e868aa SHA1 b2520039e491d8adad980926064e290b23d5aff4 SHA256 ca2898fd980ba38291692ec7640bdecd5d186dbeb9a86a9cb00ddc398a7884ac
+MISC ChangeLog 23211 RMD160 7351455a876c0e88c370dcdd9322fd4d1f6d7954 SHA1 0d4393af2af81bc08f44bf8387dde5d55be10ea2 SHA256 1511602fd21c35a692e154028df81498873488ac2cb408194cc15bf7e8344f14
 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index 127297a1fe85..097790f199e2 100644
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.ebuild,v 1.23 2008/02/04 18:39:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.24 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 77e864fdcecf..c004b4a72c5b 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
+# 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.13 2008/02/04 18:39:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.14 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index 70b82e76ce74..263895e67397 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.14 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.15 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C,
+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
diff --git a/app-doc/doxygen/doxygen-1.5.2.ebuild b/app-doc/doxygen/doxygen-1.5.2.ebuild
index 7dc1c0603771..06488bebbaca 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
+# 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.2.ebuild,v 1.10 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.11 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
@@ -36,6 +36,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.3.ebuild
index 0d0560569f6e..a370e3ca4410 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
+# 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.4 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.5 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
 
@@ -44,6 +44,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.4.ebuild b/app-doc/doxygen/doxygen-1.5.4.ebuild
index 34a08d1f3d18..acb7e8d3a9a8 100644
--- a/app-doc/doxygen/doxygen-1.5.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.4.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.4.ebuild,v 1.10 2008/01/24 20:30:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.11 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
 
@@ -47,6 +47,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.5.ebuild b/app-doc/doxygen/doxygen-1.5.5.ebuild
new file mode 100644
index 000000000000..98f2bd423820
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.5.5.ebuild
@@ -0,0 +1,165 @@
+# 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.5.ebuild,v 1.1 2008/02/16 20:24:36 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 )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.6
+		media-libs/freetype )"
+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"
+
+	# 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
+
+	# 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"
+
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
+	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=""
+	if use debug; then
+	    my_conf="--prefix ${D}usr --debug"
+	else
+	    my_conf="--prefix ${D}usr"
+	fi
+
+	if use qt3; then
+	    einfo "using QTDIR: '$QTDIR'."
+	    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) \
+		|| 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 helper tools to parse"
+	elog "more languages."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch
new file mode 100644
index 000000000000..34aaef42d2dd
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2008-02-15 18:40:57.000000000 -0800
++++ configure	2008-02-15 19:06:13.000000000 -0800
+@@ -276,6 +276,8 @@
+         echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!"
+         exit 2
+       fi
++    fi
++    if test -d "$QTDIR/lib64"; then
+       LIBDIR=lib64
+     fi
+     if test ! -d "$QTDIR/include"; then
diff --git a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch
new file mode 100644
index 000000000000..dbd95b879ba4
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch
@@ -0,0 +1,105 @@
+diff -ur doxygen-1.5.1/configure doxygen-fixed/configure
+--- doxygen-1.5.1/configure	2006-11-01 22:52:27.711364356 +0200
++++ doxygen-fixed/configure	2006-11-01 22:54:09.086952924 +0200
+@@ -525,7 +525,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 addon/doxyapp/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 addon/doxyapp/Makefile.in"
+ 
+ for i in $f_inmakefiles ; do
+      SRC=$i
+@@ -542,7 +542,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
+@@ -562,7 +561,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 addon/doxyapp/doxyapp.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 addon/doxyapp/doxyapp.pro.in" 
+ 
+ for i in $f_inprofiles ; do
+      SRC=$i
+diff -ur doxygen-1.5.1/Makefile.in doxygen-fixed/Makefile.in
+--- doxygen-1.5.1/Makefile.in	2006-11-01 22:52:31.257825212 +0200
++++ doxygen-fixed/Makefile.in	2006-11-01 22:53:44.182738940 +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
+@@ -32,11 +30,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
+@@ -81,7 +78,7 @@
+ pdf: docs
+ 	cd latex ; $(MAKE)
+ 
+-DISTFILES =  Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \
++DISTFILES =  Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \
+              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
+              Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
+              VERSION packages winbuild
+diff -ur doxygen-1.5.1/src/doxygen.pro.in doxygen-fixed/src/doxygen.pro.in
+--- doxygen-1.5.1/src/doxygen.pro.in	2006-11-01 22:52:32.611619404 +0200
++++ doxygen-fixed/src/doxygen.pro.in	2006-11-01 22:54:39.508328172 +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 -ur doxygen-1.5.1/src/libdoxygen.pro.in doxygen-fixed/src/libdoxygen.pro.in
+--- doxygen-1.5.1/src/libdoxygen.pro.in	2006-11-01 22:52:33.704453268 +0200
++++ doxygen-fixed/src/libdoxygen.pro.in	2006-11-01 22:54:50.479660276 +0200
+@@ -207,7 +207,6 @@
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+ linux-g++:TMAKE_CXXFLAGS    += -fno-exceptions -fno-rtti
+ INCLUDEPATH                += ../qtools
+-INCLUDEPATH                += ../libpng
+ INCLUDEPATH                += ../libmd5
+ win32:INCLUDEPATH          += .
+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
+diff -ur doxygen-1.5.1/src/pngenc.cpp doxygen-fixed/src/pngenc.cpp
+--- doxygen-1.5.1/src/pngenc.cpp	2006-11-01 22:52:34.006407364 +0200
++++ doxygen-fixed/src/pngenc.cpp	2006-11-01 22:53:13.023475868 +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>