updated to latest release, added desktop entry and nodot use flag

Package-Manager: portage-2.1.3.7

5 files changed, 176 insertions, 17 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index c6d180babe73..2ff2a7081088 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.130 2007/07/12 19:20:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.131 2007/09/02 18:10:59 nerdboy Exp $
+
+*doxygen-1.5.3 (02 Sep 2007)
+
+  02 Sep 2007; Steve Arnold <nerdboy@gentoo.org> +files/doxywizard.png,
+  +doxygen-1.5.3.ebuild:
+  Updated to latest release, added desktop entry and nodot use flag
+  (addresses bugs 188124 and 181890).  USE=nodot will remove both the
+  graphviz dependency and the capability to generate dot-based graphs.
+  If someone has a better icon for doxywizard, please post a bug :)
 
   12 Jul 2007; Fabian Groffen <grobian@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
@@ -32,8 +41,8 @@
 *doxygen-1.5.2 (24 Apr 2007)
 
   24 Apr 2007; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.5.2.ebuild:
-  updated to latest upstream release, and removed unicode USE flag (russian
-  patch incorporate dupstream).  Closes bug #174831.
+  updated to latest upstream release, and removed unicode USE flag (ru
+  patch incorporated upstream).  Closes bug #174831.
 
   12 Mar 2007; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.7.ebuild,
   doxygen-1.5.1.ebuild:
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 74f3cff4d552..055b1e829eae 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.6/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/1.4.6/01_all_cp1251.patch 683
 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/1.4.6/01_all_cp1251.patch 683
@@ -57,6 +54,10 @@ AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1
 MD5 9b79bcfbb78c577a9cf1e433cedf043d files/doxygen-gcc4.patch 267
 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 files/doxygen-gcc4.patch 267
 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce files/doxygen-gcc4.patch 267
+AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
+MD5 bbd00dd577cba5ac1d21a609ddffe12e files/doxywizard.png 4231
+RMD160 b194049b42aad3466a5ef9c69ff3504536223dae files/doxywizard.png 4231
+SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 files/doxywizard.png 4231
 DIST doxygen-1.4.2.src.tar.gz 2856998 RMD160 7cb3102b886a75b67591c56e2610b6755d680195 SHA1 3a95a1bc825e34144ecfa6cebd395a69d49fb8c6 SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122
 DIST doxygen-1.4.3.src.tar.gz 2767795 RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 SHA1 96802c63a72c009cb3fbba049dc22bf42fcdb739 SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f
 DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA1 50e04f40b6b69b1897cad789f993a11df0368eb5 SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78
@@ -67,6 +68,7 @@ DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a
 DIST doxygen-1.5.1-utf8-ru.patch.gz 14581 RMD160 a0237fc0fb52cae3483e15ccbdb0633c5745f8ce SHA1 37f0b6b5e59a779c0bc1e72191ff0c03e38e75a6 SHA256 0c9205193021401cb78ea8e69880ef8ae35a89677f3018ba2cac2acac7065c55
 DIST doxygen-1.5.1.src.tar.gz 2888159 RMD160 bacd34a5a69833e42e116d997c99df03dd837062 SHA1 eac525c670ef3f1f81c3038588b42e111a9ec6a6 SHA256 c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578
 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-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
 EBUILD doxygen-1.4.2.ebuild 3429 RMD160 fa41161c6260fb6269795f4db773f7c58222e2d4 SHA1 c50ad8bb6637c32c338508858f8141abae0d641e SHA256 79ab53ba00a45234b9cf66b7313e01d2bc97af49c2e9fb0bc41830a5e86fb20e
 MD5 1d3a0f778b1172b3564d0d75d235b49e doxygen-1.4.2.ebuild 3429
@@ -100,10 +102,14 @@ EBUILD doxygen-1.5.2.ebuild 3824 RMD160 b01a9428a1566a247281cafce41737de721621f9
 MD5 e129a38cd61d1ccf52a976b7b68a29ee doxygen-1.5.2.ebuild 3824
 RMD160 b01a9428a1566a247281cafce41737de721621f9 doxygen-1.5.2.ebuild 3824
 SHA256 8f5836e1533c9b902b0326ac9e4f789c6b397a9f2a39395c7b4815591c056065 doxygen-1.5.2.ebuild 3824
-MISC ChangeLog 21094 RMD160 c0eeebf1d82e9bffca87169e319fd01d347c875a SHA1 6743969a93779ad0d7e524e1f56da8532358b4dd SHA256 96280a90d6caced0b815dced0297fdca1b8457e594d144b0c3c734d3d10bb74a
-MD5 17be7bc8730f1162394cc386216e98a9 ChangeLog 21094
-RMD160 c0eeebf1d82e9bffca87169e319fd01d347c875a ChangeLog 21094
-SHA256 96280a90d6caced0b815dced0297fdca1b8457e594d144b0c3c734d3d10bb74a ChangeLog 21094
+EBUILD doxygen-1.5.3.ebuild 4572 RMD160 58e10f656199144344a707bb313c9a026e8c0832 SHA1 cda4091ce289104e3f7a54e228a18ecf159ce5f7 SHA256 33dc73ef715f7ea6e22dd571a5d9e0caf31889b05dee06062641190ce98e6e2c
+MD5 48a58d4d92b2db12ebfef9d1af38248b doxygen-1.5.3.ebuild 4572
+RMD160 58e10f656199144344a707bb313c9a026e8c0832 doxygen-1.5.3.ebuild 4572
+SHA256 33dc73ef715f7ea6e22dd571a5d9e0caf31889b05dee06062641190ce98e6e2c doxygen-1.5.3.ebuild 4572
+MISC ChangeLog 21494 RMD160 8c2e3d4f69ea8e94c71a91b1a1a458d65426dacb SHA1 73d85a04a9697adf7b206a8ff2c9a89b1407cf2a SHA256 159df3609fe126ad8f223f859785ad69c96a329bbb04b5b5e2253662c6fd5419
+MD5 d6de156c545d1c2c7a1423c700a0f660 ChangeLog 21494
+RMD160 8c2e3d4f69ea8e94c71a91b1a1a458d65426dacb ChangeLog 21494
+SHA256 159df3609fe126ad8f223f859785ad69c96a329bbb04b5b5e2253662c6fd5419 ChangeLog 21494
 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b
 MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
@@ -132,10 +138,6 @@ SHA256 b8d3f160bdee292123a6ee33a44d082d597948ca481ce3aecd2c1ba22d7d72a4 files/di
 MD5 a711ae23ea82a78da1ba7d096092a044 files/digest-doxygen-1.5.2 256
 RMD160 825cb8e0ec4ef9e3d682f64db0cae40c8494a5e1 files/digest-doxygen-1.5.2 256
 SHA256 4497e4957fbd0349ba4d9e6ea8d94904018930db7d9513ff5da5e94445c5703e files/digest-doxygen-1.5.2 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFG0DLCp/wUKkr7RBoRApMFAJ4iRospOz/0czshjwj3ENTtQ9u1zQCePzNw
-D6McwDE5eCLi190j1Wy8Mbs=
-=JDAm
------END PGP SIGNATURE-----
+MD5 21d9e38d0271b87980cf30bdf9f864dc files/digest-doxygen-1.5.3 256
+RMD160 6f7295c02dafb2abc40dfe731bb8625ecef1a51e files/digest-doxygen-1.5.3 256
+SHA256 f35cf98d3503e80b9277a8ddde7361217a898784e0ca798bbc6a6ea16c0ed743 files/digest-doxygen-1.5.3 256
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.3.ebuild
new file mode 100644
index 000000000000..91e122fff053
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.5.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 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.1 2007/09/02 18:10:59 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"
+
+RDEPEND="qt3? ( $(qt_min_version 3.3) )
+	tetex? ( virtual/tetex )
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.6 )"
+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"
+
+	# 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
+
+	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)
+
+	if use debug; then
+	    local my_conf="--prefix ${D}usr --debug"
+	else
+	    local my_conf="--prefix ${D}usr"
+	fi
+
+	if use qt3; then
+	    einfo "using QTDIR: '$QTDIR'."
+	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
+	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${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 language support tools."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/files/digest-doxygen-1.5.3 b/app-doc/doxygen/files/digest-doxygen-1.5.3
new file mode 100644
index 000000000000..311af2831aaa
--- /dev/null
+++ b/app-doc/doxygen/files/digest-doxygen-1.5.3
@@ -0,0 +1,3 @@
+MD5 5fd6f0c2c7946005703b47dc6b663757 doxygen-1.5.3.src.tar.gz 3617278
+RMD160 f5e83a0feae0a53ae5c5733305f86cfa8937dafd doxygen-1.5.3.src.tar.gz 3617278
+SHA256 f0423a198c3183c03f88c16fdaec69c65f29756c893d0c688ac2c670f0d83a0b doxygen-1.5.3.src.tar.gz 3617278
diff --git a/app-doc/doxygen/files/doxywizard.png b/app-doc/doxygen/files/doxywizard.png
new file mode 100644
index 000000000000..c648231e7ea2
--- /dev/null
+++ b/app-doc/doxygen/files/doxywizard.png