From 7ac03e1fd2e0a699d324f0f35aeeee6c6f0291cc Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Mon, 8 Mar 2010 07:15:07 +0000 Subject: Updated to latest versions, (closes bug 300577) simplified texlive deps. (Portage version: 2.2_rc63/cvs/Linux x86_64) --- app-doc/doxygen/ChangeLog | 9 +- app-doc/doxygen/doxygen-1.5.8-r1.ebuild | 4 +- app-doc/doxygen/doxygen-1.6.2.ebuild | 168 ++++++++++++++++++++++ app-doc/doxygen/doxygen-1.6.3.ebuild | 168 ++++++++++++++++++++++ app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch | 67 +++++++++ 5 files changed, 413 insertions(+), 3 deletions(-) create mode 100644 app-doc/doxygen/doxygen-1.6.2.ebuild create mode 100644 app-doc/doxygen/doxygen-1.6.3.ebuild create mode 100644 app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch (limited to 'app-doc/doxygen') 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 +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 +files/doxygen-1.5.6-prefix-misc-alt.patch, doxygen-1.6.1.ebuild: 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); -- cgit v1.2.3-65-gdbad