added workaround for bug 118580, and new version for bugs 117613 and 110615

(Portage version: 2.1_pre3-r1)

8 files changed, 157 insertions, 36 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index aeb1adf86369..cd5108c6c4b2 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.91 2005/12/27 12:19:30 kloeri Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.92 2006/01/18 07:17:19 nerdboy Exp $
+
+*doxygen-1.4.6 (18 Jan 2006)
+
+  18 Jan 2006; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.2.ebuild,
+  doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
+  +doxygen-1.4.6.ebuild:
+  Added workaround for bug 118580, and new version for bugs 117613 and 110615.
+  ~mips removed temporarily from 1.4.5 and 1.4.6 until it gets updated to
+  graphviz-2.6 or better.
 
   27 Dec 2005; Bryan Østergaard <kloeri@gentoo.org doxygen-1.4.4.ebuild:
   Stable on alpha.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0e662043a871..b4440ef37026 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 cc8a2ec11f580ca1479967894f7c410c ChangeLog 14519
-MD5 ec256c1b04a7b34cae44d0b10f47e4c2 doxygen-1.4.2.ebuild 3060
-MD5 cb1e89e6e89d0215cedb16195408caa1 doxygen-1.4.3-r1.ebuild 3148
-MD5 8f2103c62c96b682ac78f2a1fdd0010b doxygen-1.4.4.ebuild 2985
-MD5 a1184057e58f12fbd1f6de67a3fc1cc8 doxygen-1.4.5.ebuild 3008
+MD5 037034a7679c10de80e38b34aaf4acaa doxygen-1.4.2.ebuild 3209
+MD5 0ec79c66df8077fa00e7ccfea235b18f doxygen-1.4.3-r1.ebuild 3297
+MD5 36292427e5bd22b7363129842cdde275 doxygen-1.4.4.ebuild 3134
+MD5 ef22c380b857dd7efa0bd9d9c98343ac doxygen-1.4.5.ebuild 3163
+MD5 c74a918d2ef21e2023e159d6b314dfb1 doxygen-1.4.6.ebuild 3164
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
 MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
 MD5 16a84c6342d0f6132416d398bb1a36f3 files/digest-doxygen-1.4.3-r1 70
 MD5 d2ecb11525308c4c548e9d94003c3f74 files/digest-doxygen-1.4.4 70
 MD5 2f35d937d20077c4ebaa239d0f9f0306 files/digest-doxygen-1.4.5 70
+MD5 0243c64903ce2a96ccfe0de26e54dc1a files/digest-doxygen-1.4.6 70
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
 MD5 1473b90cf51c0df70eed324ededc8624 files/doxygen-1.4.3-nls.patch 1019
 MD5 461d2d8b233682be4ea9191058708a77 files/doxygen-1.4.4-darwin.patch 536
 MD5 e143e9d3e25a559233f4f2d77a58290d files/doxygen-gcc4.patch 478
 MD5 d44ed0c8962329807cee729d1b5b207c files/doxygen-utf8-ru.patch.gz 14412
 MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvzXo2+ySkm8kpY0RAtg5AJ9oHs/ZhiEDUkqTbunQI7YQKNnH/ACeOkJf
-ljUdwufBJx4s4dbHYqPFd10=
-=oUaT
------END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index c15d577c16a7..02569316f961 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.13 2005/12/21 03:30:53 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.14 2006/01/18 07:17:19 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -44,11 +44,15 @@ src_unpack() {
 
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
-	local confopts="--prefix ${D}usr"
-	use qt && confopts="${confopts} --with-doxywizard"
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    export LD_LIBRARY_PATH=$QTDIR/$(get_libdir):$LD_LIBRARY_PATH \
+	    export LIBRARY_PATH=$QTDIR/$(get_libdir):$LIBRARY_PATH \
+	    my_conf="${my_conf} $(use_with qt doxywizard)"
+	fi
 
 	# ./configure and compile
-	./configure ${confopts} || die '"./configure" failed.'
+	./configure ${my_conf} || die '"./configure" failed.'
 	make DESTDIR="${D}" all || die '"make all" failed.'
 
 	# generate html and pdf (if tetex in use) documents.
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
index 80b6e3833902..c15f64374ff5 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.8 2005/12/21 03:30:53 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.9 2006/01/18 07:17:19 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -48,11 +48,15 @@ src_unpack() {
 
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
-	local confopts="--prefix ${D}usr"
-	use qt && confopts="${confopts} --with-doxywizard"
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    export LD_LIBRARY_PATH=$QTDIR/$(get_libdir):$LD_LIBRARY_PATH \
+	    export LIBRARY_PATH=$QTDIR/$(get_libdir):$LIBRARY_PATH \
+	    my_conf="${my_conf} $(use_with qt doxywizard)"
+	fi
 
 	# ./configure and compile
-	./configure ${confopts} || die '"./configure" failed.'
+	./configure ${my_conf} || die '"./configure" failed.'
 	emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index 0e45e7123680..371d87f9cf99 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-2006 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.14 2006/01/07 03:29:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.15 2006/01/18 07:17:19 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -42,11 +42,15 @@ src_unpack() {
 
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
-	local confopts="--prefix ${D}usr"
-	use qt && confopts="${confopts} --with-doxywizard"
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    export LD_LIBRARY_PATH=$QTDIR/$(get_libdir):$LD_LIBRARY_PATH \
+	    export LIBRARY_PATH=$QTDIR/$(get_libdir):$LIBRARY_PATH \
+	    my_conf="${my_conf} $(use_with qt doxywizard)"
+	fi
 
 	# ./configure and compile
-	./configure ${confopts} || die '"./configure" failed.'
+	./configure ${my_conf} || die '"./configure" failed.'
 	emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index de6d79296380..d440fd5eed56 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-2006 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.3 2006/01/04 05:00:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.4 2006/01/18 07:17:19 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,10 +10,10 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc qt tetex unicode"
 
-RDEPEND="media-gfx/graphviz
+RDEPEND=">=media-gfx/graphviz-2.6
 	qt? ( =x11-libs/qt-3* )
 	tetex? ( virtual/tetex )
 	virtual/ghostscript"
@@ -42,11 +42,15 @@ src_unpack() {
 
 src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
-	local confopts="--prefix ${D}usr"
-	use qt && confopts="${confopts} --with-doxywizard"
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    export LD_LIBRARY_PATH=$QTDIR/$(get_libdir):$LD_LIBRARY_PATH \
+	    export LIBRARY_PATH=$QTDIR/$(get_libdir):$LIBRARY_PATH \
+	    my_conf="${my_conf} $(use_with qt doxywizard)"
+	fi
 
 	# ./configure and compile
-	./configure ${confopts} || die '"configure" failed.'
+	./configure ${my_conf} || die '"configure" failed.'
 	emake all || die 'emake failed'
 
 	# generate html and pdf (if tetex in use) documents.
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
new file mode 100644
index 000000000000..77b997b5d657
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 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.1 2006/01/18 07:17:19 nerdboy Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
+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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc qt tetex unicode"
+
+RDEPEND=">=media-gfx/graphviz-2.6
+	qt? ( =x11-libs/qt-3* )
+	tetex? ( virtual/tetex )
+	virtual/ghostscript"
+DEPEND=">=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	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
+
+	if use unicode; then
+		epatch ${FILESDIR}/${PN}-utf8-ru.patch.gz || die "utf8-ru patch failed"
+	fi
+
+	if [ $(gcc-major-version) -eq 4 ] ; then
+		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
+}
+
+src_compile() {
+	# set ./configure options (prefix, Qt based wizard, docdir)
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    export LD_LIBRARY_PATH=$QTDIR/$(get_libdir):$LD_LIBRARY_PATH \
+	    export LIBRARY_PATH=$QTDIR/$(get_libdir):$LIBRARY_PATH \
+	    my_conf="${my_conf} $(use_with qt doxywizard)"
+	fi
+
+	# ./configure and compile
+	./configure ${my_conf} || die '"configure" failed.'
+	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 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.'
+
+	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+
+	# 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() {
+
+	ewarn
+	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "the html and pdf documentation, respectively.  For examples"
+	einfo "and other goodies, see the source tarball.  For some example"
+	einfo "output, run doxygen on the doxygen source using the Doxyfile"
+	einfo "provided in the top-level source dir."
+	ewarn
+}
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.6 b/app-doc/doxygen/files/digest-doxygen-1.4.6
new file mode 100644
index 000000000000..3b5b2d30d6a9
--- /dev/null
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.6
@@ -0,0 +1 @@
+MD5 ebf11130bec7987e9b69b1e0301d151a doxygen-1.4.6.src.tar.gz 2889072