From 3b261f1e7241aa9744dbcf907a3f28a1074df4fe Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Fri, 25 Sep 2009 18:32:10 +0000 Subject: Updated to current release (closes bugs 282598 and 283780). Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 --- app-doc/doxygen/ChangeLog | 9 +- app-doc/doxygen/Manifest | 6 +- app-doc/doxygen/doxygen-1.6.0.ebuild | 176 ----------------------------------- app-doc/doxygen/doxygen-1.6.1.ebuild | 174 ++++++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 180 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.6.0.ebuild create mode 100644 app-doc/doxygen/doxygen-1.6.1.ebuild diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 88779e5e139c..526ed4ce0a05 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,13 @@ # 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.169 2009/08/27 13:55:46 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.170 2009/09/25 18:32:10 nerdboy Exp $ + +*doxygen-1.6.1 (25 Sep 2009) + + 25 Sep 2009; Steve Arnold -doxygen-1.6.0.ebuild, + +doxygen-1.6.1.ebuild: + Updated to current release; fixes eigen borkage plus a few other issues + (closes bugs 282598 and 283780). 27 Aug 2009; Raúl Porcel doxygen-1.5.8-r1.ebuild: arm/ia64/sh/s390 stable wrt #263641 diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index fdcc10833039..7c3a39ae301f 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -21,7 +21,7 @@ DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc 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.5.9.src.tar.gz 4141375 RMD160 51d79c0f8846f47e9aa8c37cd0eb9db630491885 SHA1 6211b850bdaa2198e35546e4299a27774c957ece SHA256 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e -DIST doxygen-1.6.0.src.tar.gz 3899759 RMD160 01755b851dd1d173f30ab2b5b09431262c69a688 SHA1 8e8ae938bbd60c829d8a055cb654d92cf42cc225 SHA256 f33c82794d034b8b9f60ff80c49624c3da3eeaace277a9be27f56fe6ccf3c253 +DIST doxygen-1.6.1.src.tar.gz 3902407 RMD160 0a9c5962dbd076bac418b85b72a4874576c9da4d SHA1 31f861841eba1ebdded1b4bf70bdecb42441dafd SHA256 4c5aedf052a14a0f7fe8c126140ff1c5c50887c74814a4804181c61625d539d3 EBUILD doxygen-1.4.7.ebuild 4121 RMD160 7081a5298f89f311412505a393faf0207039a408 SHA1 7a2d1fe6f6287b37391441faf4c62f9dc2e3a824 SHA256 46e94677d828ecfeed207933ff946d3d339ce060159aff2ff62c8cea819acfed EBUILD doxygen-1.5.4.ebuild 5122 RMD160 8097661b719d770eb043e28257973a086f5d4c3b SHA1 b594cd381a1f71c3632a80a1b80b62ca9291e04e SHA256 33f10d9b5b7e843b58b53bf8645485ea5ffbbe9d5021811dc8d06e49018bb02b EBUILD doxygen-1.5.5.ebuild 5092 RMD160 c2ec2ebfc2c22f10dcee98e680fac5cf357f4d9c SHA1 57d7ccf3fbbd1c50ed62c76f2b84aed735238976 SHA256 5c8febe96e4b6784d75cb3bd40376bba6b5669c1d86b55cf0b968e41ec7f6e23 @@ -29,6 +29,6 @@ EBUILD doxygen-1.5.6.ebuild 5092 RMD160 1070ba96de3321c82810b306b30356f4bef70e64 EBUILD doxygen-1.5.7.1.ebuild 5320 RMD160 865e8b8550125d6b890eb921023b0988f8dc8773 SHA1 fb002135bf8c816e60948a66797f0f4cdf79a99d SHA256 874a190497d93fbe713cbba010f60a2d27a7cbf0ee31f8ff3f9c3c9769d81938 EBUILD doxygen-1.5.8-r1.ebuild 5364 RMD160 2e4e226220d88b881dba4817cc8c800866cb9320 SHA1 4bb0f504576d9809e47743e3992b4c7fdf1aa3d8 SHA256 ae7c922466c4c7600cb8fd2fdfa87577f99dfd6f8f699a47cec794b9b7b69b9e EBUILD doxygen-1.5.9.ebuild 5133 RMD160 e8934997968e9744e64c068597afdbc5c208cd50 SHA1 3085bbeedba8482df399c435e1f3a701f72f584c SHA256 6c94352fa29aa99c99cc41a1eb0c54c363be85154cd4824d1f5192b2954ef2b7 -EBUILD doxygen-1.6.0.ebuild 5133 RMD160 6f3e234d6af8bdb89d8d6a11c2cc260c08197425 SHA1 f5dadf94e5d37bea4a4f76deac87a7b05ad4d5ed SHA256 6f2cbc953e9c620c82284136356e39d5bd74557aba6f691bb6173b5fc67ff323 -MISC ChangeLog 28599 RMD160 12d6194488541657c3f859c8981bc4dd5379dd0d SHA1 c0223cef4a829cb2906b3e639d2d995c909184b3 SHA256 8d5f3b55cec175c87a58df16954e44407589d741cec8acd563df791601ff374c +EBUILD doxygen-1.6.1.ebuild 5118 RMD160 85ed6fdb4a1575c6760eee10c727e19271473a3e SHA1 3753ac42f3b98ae04b1b59dc63eca71d79790efa SHA256 74aa4f738fa27f0a0605635c9a058fea824ba817be8e45485df30f707a8ebbc7 +MISC ChangeLog 28837 RMD160 d069dd7dda20eacf732d3f3485756d1b529b28fc SHA1 f7a28a5ab3f5b0efead440d89f65f3157f0f9ab7 SHA256 fb16162497285d92736eca1619428aa235a8781b0216eb6ff0c891c5bbcf5663 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 deleted file mode 100644 index dc3a440bb906..000000000000 --- a/app-doc/doxygen/doxygen-1.6.0.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# 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.2 2009/08/27 07:16:43 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-fontsextra - 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/doxygen-1.6.1.ebuild b/app-doc/doxygen/doxygen-1.6.1.ebuild new file mode 100644 index 000000000000..a7174c4a8caa --- /dev/null +++ b/app-doc/doxygen/doxygen-1.6.1.ebuild @@ -0,0 +1,174 @@ +# 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.1.ebuild,v 1.1 2009/09/25 18:32:10 nerdboy Exp $ + +EAPI=2 + +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-fontsextra + 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_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.5-dot-eps.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="" + 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 +} + +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 +} -- cgit v1.2.3-65-gdbad