Updated to latest versions, (closes bug 300577) simplified texlive deps.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

6 files changed, 420 insertions, 15 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 34e333f0cea9..15627dbf5646 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.174 2010/02/08 19:21:51 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.175 2010/03/08 07:15:06 nerdboy Exp $
+
+*doxygen-1.6.3 (08 Mar 2010)
+*doxygen-1.6.2 (08 Mar 2010)
+
+  08 Mar 2010; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.6.2.ebuild,
+  +files/doxygen-1.6.2-dot-eps.patch, +doxygen-1.6.3.ebuild:
+  Updated to latest versions, (closes bug 300577) simplified texlive deps.
 
   08 Feb 2010; Jonathan Callen <abcd@gentoo.org>
   +files/doxygen-1.5.6-prefix-misc-alt.patch, doxygen-1.6.1.ebuild:
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index f30912f0f8d0..309359a08d74 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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,6 +12,7 @@ AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ec
 AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 RMD160 fba979abf6b0db3c32a1a9509c0a98d7e452a86f SHA1 3bb95cd36289a46d7ba221319421c82e5433e60e SHA256 ee4b8c11c8af9bc3dfb365eff06addf3d7ec73931a234ac3651be2ba28ad3b44
 AUX doxygen-1.5.7.1-substitute.patch 656 RMD160 3730347b9fba4ceef96b6852c164ca4c9037c250 SHA1 e470ee8ede9293cda8ef00d059ca338c725e8523 SHA256 204f140187865c9eb5ca76a421cf1271dfb696858269477468bd605070bd41fd
 AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477df8 SHA1 5e987c64b95500441a668fd4912db32714de495d SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c
+AUX doxygen-1.6.2-dot-eps.patch 2449 RMD160 f8ca2a81af9dbe4fb709528b1f4146fe53aa338e SHA1 408b5119043a35d31b7d55b7f183a0dbae54d678 SHA256 fd62eda9dba9fad7a17c6afdb637178d28b7be7218c975f252a0a3de204c2b87
 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.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
@@ -26,20 +24,17 @@ DIST doxygen-1.5.7.1.src.tar.gz 4096168 RMD160 f9614bb076d6531334a212a95dfbb862a
 DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
 DIST doxygen-1.5.9.src.tar.gz 4141375 RMD160 51d79c0f8846f47e9aa8c37cd0eb9db630491885 SHA1 6211b850bdaa2198e35546e4299a27774c957ece SHA256 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e
 DIST doxygen-1.6.1.src.tar.gz 3902407 RMD160 0a9c5962dbd076bac418b85b72a4874576c9da4d SHA1 31f861841eba1ebdded1b4bf70bdecb42441dafd SHA256 4c5aedf052a14a0f7fe8c126140ff1c5c50887c74814a4804181c61625d539d3
+DIST doxygen-1.6.2.src.tar.gz 3985401 RMD160 13129dc6c4c156fd939e592c6fa4f86784566d27 SHA1 7e0281a78455c43ff6ed058191ba4a9aac361f4f SHA256 3b2e1ca98552da0e44c640123eb79f5b38f50759d7dbe2e56852218a78bc1e5f
+DIST doxygen-1.6.3.src.tar.gz 3986440 RMD160 3c205185316675a78dba390ef83942d5abda0815 SHA1 36e4f479a136a439307456e539a4bd6c2fefa8b7 SHA256 a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492
 EBUILD doxygen-1.4.7.ebuild 3704 RMD160 2eb5f033e3c74151a47810ff891da56f6496c540 SHA1 0391691e76518782caeb2cb65da588dc5dc3d5b0 SHA256 ca8f96af859e6edf280819f3f022051688a3606a78fc0fa6e73e7856c7579306
 EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6 SHA1 a7aa62f3a45baeb832b6e915f7c2a85f59674b57 SHA256 0778d0f7905e75ad14ce09a88c0af12fd75ae7524b7fb8381a2b345dd35df127
 EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc SHA1 8e6f528aed0369a6214689916f1497ed01b40456 SHA256 fe0b01e91433a9cc4afb45aad725fbd9a9f4ffaaa3a422b9571409407f43e088
 EBUILD doxygen-1.5.6.ebuild 4499 RMD160 470b6034a63d4bdebd48443b063e6565ba926b01 SHA1 943482558e93d3dd6de145532c95f2e203eca6e3 SHA256 01028754cf1a7be1e012e3df8ba3d433e48d63aa7e54b5323764fd0aa090ec21
 EBUILD doxygen-1.5.7.1.ebuild 4726 RMD160 bdd542705abb6c260fd29f6c02f0664979d1c8af SHA1 97513e9b35b7fd410754b587c418a1b5102cf86e SHA256 d8f68d435453a9a34cdfd29044ba999cfdd2f09dee293d9d05f7676a56506850
-EBUILD doxygen-1.5.8-r1.ebuild 5365 RMD160 c7e343b90603436a1650197307a7d1f8f80b2137 SHA1 2b878c6baf31fb3ea0c1b5a8699d3551e844ec9a SHA256 f26e333750ba0da6bd4840597f1a7d1f7d80aebb29d7195c3447e3b68fce59be
+EBUILD doxygen-1.5.8-r1.ebuild 5369 RMD160 677cd9e36e07abd0e6d259f4b6f58f21a02d323f SHA1 81886838039f36e63e1d5896560a2b15294826d9 SHA256 44051c62324f0449ce785b14ca64152c01226acde4506d3deb367ca97ea9ae94
 EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
 EBUILD doxygen-1.6.1.ebuild 5338 RMD160 57de63321a37fe5edda3b65cfb7e9fc42fd9cfdc SHA1 4288ce22c04c099ab4f33ddaa854f0caa3c07c25 SHA256 6a9ceab95df22430b405ac12e12be8bf0c89098ee513eb36395ae59c1a1572f9
-MISC ChangeLog 29688 RMD160 adbad11a188df92f9471a8c9527072cc465454fa SHA1 d20de9c622aaf40fc946da7f4408ddcbffc20ce0 SHA256 88aeea7349c3daf2012b5e22c513974a085ef59ef3a1679e939356d5427200f5
+EBUILD doxygen-1.6.2.ebuild 5160 RMD160 b5952a22b1cbc209f9ef5ff048b11bb14ac71866 SHA1 f12c3b85642b5b046cab8758025b087fb730783b SHA256 a57c0f6fc1dd84326b33d5ee9fcf8a0ecfd4e1e28b3299e1d54a4be8945b4be4
+EBUILD doxygen-1.6.3.ebuild 5167 RMD160 3b5897a069ca0c21bcb2d93280e406d88780add0 SHA1 2c255785cfebc8285634ab2da3dc73257b1f734a SHA256 1a497a4622522e96f6ab99348d71860aa4aaabc03603d2d700fa56cd5956abe8
+MISC ChangeLog 29959 RMD160 9a234fe53e4f5f9cbdcb9ce5798a254d2a528e41 SHA1 b55b9e0700ac962ff7afe0a53839fbf45f9d2251 SHA256 7dc2bb930816cdb835fe641e9c239bb37d13a8374c57f3ecbf1ffe608d224c30
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEUEARECAAYFAktwZG4ACgkQOypDUo0oQOrEQgCYi3sOxqXNWgaxZ91oip8KvVfi
-6QCgwaQerzAWmW53Kt6S33K3dfM/M4o=
-=Vu47
------END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
index f71fdf7429c6..1230c6116749 100644
--- a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.6 2009/12/26 17:24:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.7 2010/03/08 07:15:06 nerdboy Exp $
 
 EAPI=1
 
diff --git a/app-doc/doxygen/doxygen-1.6.2.ebuild b/app-doc/doxygen/doxygen-1.6.2.ebuild
new file mode 100644
index 000000000000..fa82a3ae6930
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.6.2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.2.ebuild,v 1.1 2010/03/08 07:15:06 nerdboy Exp $
+
+EAPI=3
+
+inherit eutils flag-o-matic toolchain-funcs qt4-r2 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
+	latex? ( >=app-text/texlive-2008[extra] )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	app-text/ghostscript-gpl
+	!nodot? ( >=media-gfx/graphviz-2.20.0
+		media-libs/freetype )"
+DEPEND=">=sys-apps/sed-4
+	sys-devel/flex
+	${RDEPEND}"
+
+EPATCH_SUFFIX="patch"
+
+src_prepare() {
+	# 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 1 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
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	epatch "${FILESDIR}/${P}-dot-eps.patch"
+
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
+
+	# fix final DESTDIR issue
+	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
+		addon/doxywizard/Makefile.in || die "sed 2 failed"
+
+	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_configure() {
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf=""
+	use debug && my_conf="--debug"
+
+	export CC="${QMAKE_CC}"
+	export CXX="${QMAKE_CXX}"
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	if use qt4; then
+		export QTDIR="${EPREFIX}/usr"
+		einfo "using QTDIR: '$QTDIR'."
+		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
+		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
+		|| die 'configure with qt4 failed'
+	else
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
+	fi
+}
+
+src_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 nodot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| ewarn "disabling dot failed"
+		fi
+		if use latex; then
+			addwrite /var/cache/fonts
+			addwrite /var/cache/fontconfig
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make pdf docs" failed.'
+		else
+			cp doc/Doxyfile doc/Doxyfile.orig
+			cp doc/Makefile doc/Makefile.orig
+			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+				doc/Doxyfile
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make html docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
+		install || die '"make install" failed.'
+
+	if use qt4; 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
+		dohtml -r html/*
+		if use latex; then
+			insinto /usr/share/doc/"${PF}"
+			doins latex/doxygen_manual.pdf
+		fi
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "provided in the top-level source dir."
+	elog
+	elog "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/doxygen-1.6.3.ebuild b/app-doc/doxygen/doxygen-1.6.3.ebuild
new file mode 100644
index 000000000000..da38b47138b2
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.6.3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.3.ebuild,v 1.1 2010/03/08 07:15:06 nerdboy Exp $
+
+EAPI=3
+
+inherit eutils flag-o-matic toolchain-funcs qt4-r2 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
+	latex? ( >=app-text/texlive-2008[extra] )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	app-text/ghostscript-gpl
+	!nodot? ( >=media-gfx/graphviz-2.20.0
+		media-libs/freetype )"
+DEPEND=">=sys-apps/sed-4
+	sys-devel/flex
+	${RDEPEND}"
+
+EPATCH_SUFFIX="patch"
+
+src_prepare() {
+	# 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 1 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
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	epatch "${FILESDIR}/${PN}-1.6.2-dot-eps.patch"
+
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
+
+	# fix final DESTDIR issue
+	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
+		addon/doxywizard/Makefile.in || die "sed 2 failed"
+
+	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_configure() {
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf=""
+	use debug && my_conf="--debug"
+
+	export CC="${QMAKE_CC}"
+	export CXX="${QMAKE_CXX}"
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	if use qt4; then
+		export QTDIR="${EPREFIX}/usr"
+		einfo "using QTDIR: '$QTDIR'."
+		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
+		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
+		|| die 'configure with qt4 failed'
+	else
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
+	fi
+}
+
+src_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 nodot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| ewarn "disabling dot failed"
+		fi
+		if use latex; then
+			addwrite /var/cache/fonts
+			addwrite /var/cache/fontconfig
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make pdf docs" failed.'
+		else
+			cp doc/Doxyfile doc/Doxyfile.orig
+			cp doc/Makefile doc/Makefile.orig
+			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+				doc/Doxyfile
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make html docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
+		install || die '"make install" failed.'
+
+	if use qt4; 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
+		dohtml -r html/*
+		if use latex; then
+			insinto /usr/share/doc/"${PF}"
+			doins latex/doxygen_manual.pdf
+		fi
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "provided in the top-level source dir."
+	elog
+	elog "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.6.2-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch
new file mode 100644
index 000000000000..9ceeb9fde902
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch
@@ -0,0 +1,67 @@
+Pass -Teps instead of -Tps to graphviz dot.
+Supposed to work with graphviz version 2.20.0 and later.
+
+2009-08-20 Martin von Gagern
+
+References:
+http://bugs.gentoo.org/282150
+http://bugzilla.gnome.org/show_bug.cgi?id=592516
+
+Index: doxygen-1.6.2/src/dot.cpp
+===================================================================
+--- doxygen-1.6.2.orig/src/dot.cpp	2010-01-21 03:05:09.000000000 +0100
++++ doxygen-1.6.2/src/dot.cpp	2010-01-21 03:06:35.000000000 +0100
+@@ -1932,7 +1932,7 @@ QCString DotClassGraph::writeGraph(QText
+     else if (format==EPS) // run dot to create a .eps image
+     {
+       DotRunner dotRun(absBaseName+".dot");
+-      dotRun.addJob("ps",absBaseName+".eps");
++      dotRun.addJob("eps",absBaseName+".eps");
+ 
+       if (Config_getBool("USE_PDFLATEX"))
+       {
+@@ -2261,7 +2261,7 @@ QCString DotInclDepGraph::writeGraph(QTe
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(absBaseName+".dot");
+-      dotRun.addJob("ps",absBaseName+".eps");
++      dotRun.addJob("eps",absBaseName+".eps");
+       if (Config_getBool("USE_PDFLATEX"))
+       {
+         QCString epstopdfArgs(maxCmdLine);
+@@ -2547,7 +2547,7 @@ QCString DotCallGraph::writeGraph(QTextS
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(absBaseName+".dot");
+-      dotRun.addJob("ps",absBaseName+".eps");
++      dotRun.addJob("eps",absBaseName+".eps");
+       if (Config_getBool("USE_PDFLATEX"))
+       {
+         QCString epstopdfArgs(maxCmdLine);
+@@ -2682,7 +2682,7 @@ QCString DotDirDeps::writeGraph(QTextStr
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(absBaseName+".dot");
+-      dotRun.addJob("ps",absBaseName+".eps");
++      dotRun.addJob("eps",absBaseName+".eps");
+       if (Config_getBool("USE_PDFLATEX"))
+       {
+         QCString epstopdfArgs(maxCmdLine);
+@@ -2832,7 +2832,7 @@ void writeDotGraphFromFile(const char *i
+   if (format==BITMAP)
+     dotRun.addJob(imgExt,absImgName);
+   else // format==EPS
+-    dotRun.addJob("ps",absOutFile+".eps");
++    dotRun.addJob("eps",absOutFile+".eps");
+ 
+   if ( (format==EPS) && (Config_getBool("USE_PDFLATEX")) )
+   {
+@@ -3186,7 +3186,7 @@ QCString DotGroupCollaboration::writeGra
+   else if (format==EPS)
+   {
+     DotRunner dotRun(absBaseName+".dot");
+-    dotRun.addJob("ps",absBaseName+".eps");
++    dotRun.addJob("eps",absBaseName+".eps");
+     if (Config_getBool("USE_PDFLATEX"))
+     {
+       QCString epstopdfArgs(maxCmdLine);