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

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

4 files changed, 255 insertions, 2 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/Manifest b/app-doc/doxygen/Manifest
index c9675af54df3..b37d6537b7f6 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,6 +5,7 @@ AUX bsd-configure.patch 504 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 SHA1
 AUX doxygen-1.4.3-cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 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-dot-eps.patch 2247 RMD160 b34b332df8b6769f73613ba11f98b3c5bdee40c6 SHA1 ab5c78d0599661e82a9ac1f4bf0117318e54712e SHA256 6dc47978298a39bc520a1f48206be26f76657842f14aba3413768352c7e87d45
 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
@@ -19,11 +20,13 @@ DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b206
 DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b SHA1 a478176b9183aef299418e655d6e38b8f8f4e4a5 SHA256 6f5d9ab77a21c7b0e6ebd1524ffa498cc2738ef9a1d8a2ed355117efb3685588
 DIST doxygen-1.5.7.1.src.tar.gz 4096168 RMD160 f9614bb076d6531334a212a95dfbb862a7502c69 SHA1 aecb0c453f76e900eb2aa8132ad063215005fca3 SHA256 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29
 DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
+DIST doxygen-1.6.0.src.tar.gz 3899759 RMD160 01755b851dd1d173f30ab2b5b09431262c69a688 SHA1 8e8ae938bbd60c829d8a055cb654d92cf42cc225 SHA256 f33c82794d034b8b9f60ff80c49624c3da3eeaace277a9be27f56fe6ccf3c253
 EBUILD doxygen-1.4.7.ebuild 4121 RMD160 7081a5298f89f311412505a393faf0207039a408 SHA1 7a2d1fe6f6287b37391441faf4c62f9dc2e3a824 SHA256 46e94677d828ecfeed207933ff946d3d339ce060159aff2ff62c8cea819acfed
 EBUILD doxygen-1.5.4.ebuild 5052 RMD160 b916bd7d3ede4ea4191100db752ebcf8c31d581d SHA1 b4d62673958a5fa045eabf2a98850f134276d613 SHA256 ca5de239d784b12b874771f04be0ad0ffeafe53d31174f88be0cde37d38bf4a2
 EBUILD doxygen-1.5.5.ebuild 5092 RMD160 c2ec2ebfc2c22f10dcee98e680fac5cf357f4d9c SHA1 57d7ccf3fbbd1c50ed62c76f2b84aed735238976 SHA256 5c8febe96e4b6784d75cb3bd40376bba6b5669c1d86b55cf0b968e41ec7f6e23
 EBUILD doxygen-1.5.6.ebuild 5092 RMD160 1070ba96de3321c82810b306b30356f4bef70e64 SHA1 080787a2a0e92460325b5f603153f8731e653a0f SHA256 20d46668251abb45a71f7ec6daac0a5873f04114365f54ddb34d14a46f4b2903
 EBUILD doxygen-1.5.7.1.ebuild 5320 RMD160 865e8b8550125d6b890eb921023b0988f8dc8773 SHA1 fb002135bf8c816e60948a66797f0f4cdf79a99d SHA256 874a190497d93fbe713cbba010f60a2d27a7cbf0ee31f8ff3f9c3c9769d81938
 EBUILD doxygen-1.5.8-r1.ebuild 5336 RMD160 0b1c488b93956ab375fdbb0090a65bf48fa8478c SHA1 4b1079efa99c07e84aea97bd5bdcac06d3bed674 SHA256 0532c9a63f318af988a09948ada03a215321ce2a8c77ff6865b1fb8b51c46517
-MISC ChangeLog 27687 RMD160 4312f63476922c106e9f2c48b0ceb5aeea6a64b2 SHA1 c2241b157175817f1b90b54ae3bf2c13bf9d06b3 SHA256 cef2232fc18fd356b9d13073412d135420fe39a0061ca8101ba60caeef71dcad
+EBUILD doxygen-1.6.0.ebuild 5100 RMD160 4974b9a1096fb1213642ab6c0d6ad3274c47dc26 SHA1 30d1cd9d7a0b806be29f110d535067096714a4b6 SHA256 3e3b92b00267ca834a0bdcbaaed0b2e6282b649b70716b499f8723b81e47f2b4
+MISC ChangeLog 28031 RMD160 f654db5ca85b293c531e1b11621a2f7d75e1d8bf SHA1 4804ed57ff7c359253445edb1320ed460d920333 SHA256 144e6edad7785a3490e1345eb63cc3547629730c2f49352eee24a57f1b888b61
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
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);