Updated to latest upstream release (see bug #269961).

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 251 insertions, 1 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 15de63474bed..775b1acb16d0 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.165 2009/07/12 14:14:03 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.166 2009/08/25 06:12:37 nerdboy Exp $
+
+*doxygen-1.6.0 (25 Aug 2009)
+
+  25 Aug 2009; Steve Arnold <nerdboy@gentoo.org>
+  +files/doxygen-1.5-dot-eps.patch, +doxygen-1.6.0.ebuild:
+  Updated to latest upstream release (see bug #269961) and there is 
+  already one reported failure (see bug #282598) which has been reported 
+  upstream (http://bugzilla.gnome.org/show_bug.cgi?id=592975).
 
   12 Jul 2009; Tobias Klausmann <klausman@gentoo.org>
   doxygen-1.5.8-r1.ebuild:
diff --git a/app-doc/doxygen/doxygen-1.6.0.ebuild b/app-doc/doxygen/doxygen-1.6.0.ebuild
new file mode 100644
index 000000000000..ca9dd17141e4
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.6.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.0.ebuild,v 1.1 2009/08/25 06:12:37 nerdboy Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic toolchain-funcs qt4 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 qt4 latex elibc_FreeBSD"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
+	latex? ( app-text/texlive-core
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.20.0
+		media-libs/freetype )"
+DEPEND=">=sys-apps/sed-4
+	sys-devel/flex
+	${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
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch"
+
+	# fix final DESTDIR issue
+	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
+		addon/doxywizard/Makefile.in || die "sed 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_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 /usr --debug"
+	else
+		my_conf="--prefix /usr"
+	fi
+
+	export CC="${QMAKE_CC}"
+	export CXX="${QMAKE_CXX}"
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	if use qt4; then
+		export QTDIR="/usr"
+		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 qt4 doxywizard) \
+		|| die 'configure with qt4 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 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.5-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.5-dot-eps.patch
new file mode 100644
index 000000000000..bee288ff7758
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5-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.5.8/src/dot.cpp
+===================================================================
+--- doxygen-1.5.8.orig/src/dot.cpp
++++ doxygen-1.5.8/src/dot.cpp
+@@ -1887,7 +1887,7 @@ QCString DotClassGraph::writeGraph(QText
+     else if (format==EPS) // run dot to create a .eps image
+     {
+       DotRunner dotRun(baseName+".dot");
+-      dotRun.addJob("ps",baseName+".eps");
++      dotRun.addJob("eps",baseName+".eps");
+       if (!dotRun.run())
+       {
+         QDir::setCurrent(oldDir);
+@@ -2221,7 +2221,7 @@ QCString DotInclDepGraph::writeGraph(QTe
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(baseName+".dot");
+-      dotRun.addJob("ps",baseName+".eps");
++      dotRun.addJob("eps",baseName+".eps");
+       if (!dotRun.run())
+       {
+         QDir::setCurrent(oldDir);
+@@ -2515,7 +2515,7 @@ QCString DotCallGraph::writeGraph(QTextS
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(baseName+".dot");
+-      dotRun.addJob("ps",baseName+".eps");
++      dotRun.addJob("eps",baseName+".eps");
+       if (!dotRun.run())
+       {
+         QDir::setCurrent(oldDir);
+@@ -2657,7 +2657,7 @@ QCString DotDirDeps::writeGraph(QTextStr
+     {
+       // run dot to create a .eps image
+       DotRunner dotRun(baseName+".dot");
+-      dotRun.addJob("ps",baseName+".eps");
++      dotRun.addJob("eps",baseName+".eps");
+       if (!dotRun.run())
+       {
+         QDir::setCurrent(oldDir);
+@@ -2824,7 +2824,7 @@ void writeDotGraphFromFile(const char *i
+   if (format==BITMAP) 
+     dotRun.addJob(imgExt,imgName);
+   else // format==EPS
+-    dotRun.addJob("ps",QCString(outFile)+".eps");
++    dotRun.addJob("eps",QCString(outFile)+".eps");
+   if (!dotRun.run())
+   {
+     QDir::setCurrent(oldDir);
+@@ -3185,7 +3185,7 @@ QCString DotGroupCollaboration::writeGra
+   else if (format==EPS)
+   {
+     DotRunner dotRun(baseName+".dot");
+-    dotRun.addJob("ps",baseName+".eps");
++    dotRun.addJob("eps",baseName+".eps");
+     if (!dotRun.run())
+     {
+       QDir::setCurrent(oldDir);