From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MAJnH-0005Th-MQ for garchives@archives.gentoo.org; Sat, 30 May 2009 08:19:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9653CE01CD; Sat, 30 May 2009 08:19:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1AFEBE01CD for ; Sat, 30 May 2009 08:19:54 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 91E7665816 for ; Sat, 30 May 2009 08:19:53 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MAJnF-0003sr-Ad for gentoo-commits@lists.gentoo.org; Sat, 30 May 2009 08:19:53 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-doc/doxygen: doxygen-1.5.5.ebuild doxygen-1.5.4.ebuild doxygen-1.5.7.1.ebuild doxygen-1.5.8.ebuild ChangeLog doxygen-1.4.7.ebuild doxygen-1.5.6.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: doxygen-1.5.5.ebuild doxygen-1.5.4.ebuild doxygen-1.5.7.1.ebuild doxygen-1.5.8.ebuild ChangeLog doxygen-1.4.7.ebuild doxygen-1.5.6.ebuild X-VCS-Directories: app-doc/doxygen X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ulrich Mueller Date: Sat, 30 May 2009 08:19:53 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 30f9f3d3-ad9a-4a51-bcad-8c95bc621650 X-Archives-Hash: a0e459cf24897cafcd8bbc57a9eb99db ulm 09/05/30 08:19:53 Modified: doxygen-1.5.5.ebuild doxygen-1.5.4.ebuild doxygen-1.5.7.1.ebuild doxygen-1.5.8.ebuild ChangeLog doxygen-1.4.7.ebuild doxygen-1.5.6.ebui= ld Log: Remove app-text/tetex from dependencies, bug 227443. (Portage version: 2.2_rc33/cvs/Linux i686) Revision Changes Path 1.7 app-doc/doxygen/doxygen-1.5.5.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.5.ebuild?rev=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.5.ebuild?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.5.ebuild?r1=3D1.6&r2=3D1.7 Index: doxygen-1.5.5.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- doxygen-1.5.5.ebuild 12 Oct 2008 01:49:49 -0000 1.6 +++ doxygen-1.5.5.ebuild 30 May 2009 08:19:53 -0000 1.7 @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.5.5.ebuild,= v 1.6 2008/10/12 01:49:49 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,= v 1.7 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -16,13 +16,10 @@ IUSE=3D"debug doc nodot qt3 latex elibc_FreeBSD" =20 RDEPEND=3D"qt3? ( x11-libs/qt:3 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended ) - ( app-text/tetex ) ) - ) dev-lang/python virtual/libiconv media-libs/libpng @@ -40,16 +37,16 @@ =20 # use CFLAGS, CXXFLAGS, LDFLAGS sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECFLAGS):= ' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/t= make.conf \ - || die "sed failed" + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmak= e.conf \ + || die "sed failed" =20 # Ensure we link to -liconv if use elibc_FreeBSD; then - for pro in */*.pro.in */*/*.pro.in; do + for pro in */*.pro.in */*/*.pro.in; do echo "unix:LIBS +=3D -liconv" >> "${pro}" - done + done fi =20 # Consolidate patches, apply FreeBSD configure patch, codepage patch, @@ -60,18 +57,18 @@ epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch" =20 if [ $(get_libdir) =3D=3D "lib64" ] ; then - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" fi =20 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" + 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 } =20 @@ -81,52 +78,52 @@ =20 local my_conf=3D"" if use debug; then - my_conf=3D"--prefix ${D}usr --debug" + my_conf=3D"--prefix ${D}usr --debug" else - my_conf=3D"--prefix ${D}usr" + my_conf=3D"--prefix ${D}usr" fi =20 if use qt3; then - einfo "using QTDIR: '$QTDIR'." - export LIBRARY_PATH=3D"${QTDIR}/$(get_libdir):${LIBRARY_PATH}" - export LD_LIBRARY_PATH=3D"${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 qt3 doxywizard) \ + einfo "using QTDIR: '$QTDIR'." + export LIBRARY_PATH=3D"${QTDIR}/$(get_libdir):${LIBRARY_PATH}" + export LD_LIBRARY_PATH=3D"${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 qt3 doxywizard) \ || die 'configure with qt3 failed' else - ./configure ${my_conf} || die 'configure failed' + ./configure ${my_conf} || die 'configure failed' fi =20 # and compile emake CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LINK=3D"$(tc-getCXX)" \ - LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' + LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' =20 # 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 + if use nodot; then sed -i -e "s/HAVE_DOT =3D YES/HAVE_DOT =3D NO/" \ - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed" - fi - if use latex; then + {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 + else cp doc/Doxyfile doc/Doxyfile.orig cp doc/Makefile doc/Makefile.orig sed -i.orig -e "s/GENERATE_LATEX =3D YES/GENERATE_LATEX =3D NO/"= \ - doc/Doxyfile + doc/Doxyfile sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ + -e "s/@sed/# @sed/" doc/Makefile make docs || ewarn '"make html docs" failed.' - fi + fi fi } =20 @@ -135,8 +132,8 @@ install || die '"make install" failed.' =20 if use qt3; then - doicon "${FILESDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ + doicon "${FILESDIR}/doxywizard.png" + make_desktop_entry doxywizard "DoxyWizard ${PV}" \ "doxywizard.png" "Application;Development" fi =20 @@ -144,11 +141,11 @@ =20 # pdf and html manuals if use doc; then - insinto /usr/share/doc/"${PF}" - if use latex; then + insinto /usr/share/doc/"${PF}" + if use latex; then doins latex/doxygen_manual.pdf - fi - dohtml -r html/* + fi + dohtml -r html/* fi } =20 1.17 app-doc/doxygen/doxygen-1.5.4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.4.ebuild?rev=3D1.17&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.4.ebuild?rev=3D1.17&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.4.ebuild?r1=3D1.16&r2=3D1.17 Index: doxygen-1.5.4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- doxygen-1.5.4.ebuild 12 Oct 2008 01:49:49 -0000 1.16 +++ doxygen-1.5.4.ebuild 30 May 2009 08:19:53 -0000 1.17 @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.5.4.ebuild,= v 1.16 2008/10/12 01:49:49 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,= v 1.17 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -16,13 +16,10 @@ IUSE=3D"debug doc nodot qt3 latex elibc_FreeBSD" =20 RDEPEND=3D"qt3? ( x11-libs/qt:3 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended ) - ( app-text/tetex ) ) - ) dev-lang/python virtual/libiconv virtual/ghostscript @@ -39,10 +36,10 @@ =20 # use CFLAGS, CXXFLAGS, LDFLAGS sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECFLAGS):= ' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/t= make.conf \ - || die "sed failed" + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmak= e.conf \ + || die "sed failed" =20 # Ensure we link to -liconv if use elibc_FreeBSD; then @@ -59,18 +56,18 @@ epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch" =20 if [ $(get_libdir) =3D=3D "lib64" ] ; then - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" fi =20 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" + 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 } =20 @@ -79,52 +76,52 @@ # set ./configure options (prefix, Qt based wizard, docdir) =20 if use debug; then - local my_conf=3D"--prefix ${D}usr --debug" + local my_conf=3D"--prefix ${D}usr --debug" else - local my_conf=3D"--prefix ${D}usr" + local my_conf=3D"--prefix ${D}usr" fi =20 if use qt3; then - einfo "using QTDIR: '$QTDIR'." - export LD_LIBRARY_PATH=3D${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH} - export LIBRARY_PATH=3D${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) \ + einfo "using QTDIR: '$QTDIR'." + export LD_LIBRARY_PATH=3D${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH} + export LIBRARY_PATH=3D${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' + ./configure ${my_conf} || die 'configure failed' fi =20 # and compile emake CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LINK=3D"$(tc-getCXX)" \ - LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' + LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' =20 # 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 + if use nodot; then sed -i -e "s/HAVE_DOT =3D YES/HAVE_DOT =3D NO/" \ - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed" - fi - if use latex; then + {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 + else cp doc/Doxyfile doc/Doxyfile.orig cp doc/Makefile doc/Makefile.orig sed -i.orig -e "s/GENERATE_LATEX =3D YES/GENERATE_LATEX =3D NO/"= \ - doc/Doxyfile + doc/Doxyfile sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ + -e "s/@sed/# @sed/" doc/Makefile make docs || ewarn '"make html docs" failed.' - fi + fi fi } =20 @@ -133,8 +130,8 @@ install || die '"make install" failed.' =20 if use qt3; then - doicon "${FILESDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ + doicon "${FILESDIR}/doxywizard.png" + make_desktop_entry doxywizard "DoxyWizard ${PV}" \ "doxywizard.png" "Application;Development" fi =20 @@ -142,11 +139,11 @@ =20 # pdf and html manuals if use doc; then - insinto /usr/share/doc/${PF} - if use latex; then + insinto /usr/share/doc/${PF} + if use latex; then doins latex/doxygen_manual.pdf - fi - dohtml -r html/* + fi + dohtml -r html/* fi } =20 1.4 app-doc/doxygen/doxygen-1.5.7.1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.7.1.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.7.1.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.7.1.ebuild?r1=3D1.3&r2=3D1.4 Index: doxygen-1.5.7.1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,= v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- doxygen-1.5.7.1.ebuild 24 Dec 2008 02:18:09 -0000 1.3 +++ doxygen-1.5.7.1.ebuild 30 May 2009 08:19:53 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.5.7.1.ebuil= d,v 1.3 2008/12/24 02:18:09 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuil= d,v 1.4 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -16,14 +16,11 @@ IUSE=3D"debug doc nodot qt3 latex elibc_FreeBSD" =20 RDEPEND=3D"qt3? ( x11-libs/qt:3 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) - ( app-text/tetex ) ) - ) dev-lang/python virtual/libiconv media-libs/libpng 1.4 app-doc/doxygen/doxygen-1.5.8.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.8.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.8.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.8.ebuild?r1=3D1.3&r2=3D1.4 Index: doxygen-1.5.8.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- doxygen-1.5.8.ebuild 4 Feb 2009 14:53:34 -0000 1.3 +++ doxygen-1.5.8.ebuild 30 May 2009 08:19:53 -0000 1.4 @@ -1,6 +1,6 @@ # 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.5.8.ebuild,= v 1.3 2009/02/04 14:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,= v 1.4 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -16,14 +16,11 @@ IUSE=3D"debug doc nodot qt4 latex elibc_FreeBSD" =20 RDEPEND=3D"qt4? ( x11-libs/qt-gui:4 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) - ( app-text/tetex ) ) - ) dev-lang/python virtual/libiconv media-libs/libpng 1.158 app-doc/doxygen/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/Ch= angeLog?rev=3D1.158&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/Ch= angeLog?rev=3D1.158&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/Ch= angeLog?r1=3D1.157&r2=3D1.158 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- ChangeLog 4 Feb 2009 14:53:34 -0000 1.157 +++ ChangeLog 30 May 2009 08:19:53 -0000 1.158 @@ -1,6 +1,11 @@ # ChangeLog for app-doc/doxygen # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.157 200= 9/02/04 14:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.158 200= 9/05/30 08:19:53 ulm Exp $ + + 30 May 2009; Ulrich Mueller doxygen-1.4.7.ebuild, + doxygen-1.5.4.ebuild, doxygen-1.5.5.ebuild, doxygen-1.5.6.ebuild, + doxygen-1.5.7.1.ebuild, doxygen-1.5.8.ebuild: + Remove app-text/tetex from dependencies, bug 227443. =20 04 Feb 2009; Ben de Groot doxygen-1.5.8: Correct qt:4 dep to use split deps @@ -28,7 +33,7 @@ Updated latex depends for bugs 237960 and 241350 since the virtual doe= s not seem to be working very well for people. Added several deps for texlive; thanks to mephinet and - for helping to track down some of the needed depends (this latex/tetex= =20 + for helping to track down some of the needed depends (this latex/tetex thing is painful). =20 02 Sep 2008; Christian Faulhammer @@ -241,7 +246,7 @@ +files/1.4.7/06_all_qtools.patch, +doxygen-1.4.7.ebuild: Version bump for bug #137283, need arch testing and graphviz answers (= see bug #134575) before package cleanup can occur. Filed bug #138937 on t= he - doxygen stablization issue. Thanks to Adam Piatyszek for providing th= e=20 + doxygen stablization issue. Thanks to Adam Piatyszek for providing th= e updated ebuild and patches. =20 24 Jun 2006; Doug Goldstein doxygen-1.4.2.ebuild, @@ -395,7 +400,7 @@ 30 May 2005; Steve Arnold +files/doxygen-1.4.3-cp1251.patch, doxygen-1.4.2.ebuild, +doxygen-1.4.3.ebuild: - new version for bug 92789, patch for bug 85668, and stable bumps on=20 + new version for bug 92789, patch for bug 85668, and stable bumps on covered arches. Also added brute-force workaround for bug 89075. =20 15 May 2005; Fernando J. Pereda doxygen-1.4.1.ebuil= d: @@ -669,11 +674,11 @@ =20 17 Apr 2002; Ryan Phillips ChangeLog : Copied 1.2.13.1 ebuild over for 1.2.15 (#1786) - =20 + *doxygen-1.2.13.1 (1 Feb 2002) =20 1 Feb 2002; G.Bevin ChangeLog : - =20 + Added initial ChangeLog which should be updated whenever the package i= s updated in any way. This changelog is targetted to users. This means t= hat the comments should well explained and written in clean English. The detai= ls about 1.27 app-doc/doxygen/doxygen-1.4.7.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.4.7.ebuild?rev=3D1.27&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.4.7.ebuild?rev=3D1.27&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.4.7.ebuild?r1=3D1.26&r2=3D1.27 Index: doxygen-1.4.7.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- doxygen-1.4.7.ebuild 12 Oct 2008 01:49:49 -0000 1.26 +++ doxygen-1.4.7.ebuild 30 May 2009 08:19:53 -0000 1.27 @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.4.7.ebuild,= v 1.26 2008/10/12 01:49:49 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,= v 1.27 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -18,13 +18,10 @@ =20 RDEPEND=3D">=3Dmedia-gfx/graphviz-2.6 qt3? ( x11-libs/qt:3 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended ) - ( app-text/tetex ) ) - ) virtual/ghostscript" DEPEND=3D">=3Dsys-apps/sed-4 ${RDEPEND}" 1.3 app-doc/doxygen/doxygen-1.5.6.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.6.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.6.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/do= xygen-1.5.6.ebuild?r1=3D1.2&r2=3D1.3 Index: doxygen-1.5.6.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doxygen-1.5.6.ebuild 12 Oct 2008 01:49:49 -0000 1.2 +++ doxygen-1.5.6.ebuild 30 May 2009 08:19:53 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.5.6.ebuild,= v 1.2 2008/10/12 01:49:49 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,= v 1.3 2009/05/30 08:19:53 ulm Exp $ =20 EAPI=3D1 =20 @@ -16,13 +16,10 @@ IUSE=3D"debug doc nodot qt3 latex elibc_FreeBSD" =20 RDEPEND=3D"qt3? ( x11-libs/qt:3 ) - latex? ( || ( - ( app-text/texlive-core + latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended ) - ( app-text/tetex ) ) - ) dev-lang/python virtual/libiconv media-libs/libpng @@ -40,16 +37,16 @@ =20 # use CFLAGS, CXXFLAGS, LDFLAGS sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECFLAGS):= ' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/t= make.conf \ - || die "sed failed" + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)=3D .*$:\1=3D $(ECXXFLAGS):' \ + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=3D.*$:\1=3D $(ELDFLAGS):' \ + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmak= e.conf \ + || die "sed failed" =20 # Ensure we link to -liconv if use elibc_FreeBSD; then - for pro in */*.pro.in */*/*.pro.in; do + for pro in */*.pro.in */*/*.pro.in; do echo "unix:LIBS +=3D -liconv" >> "${pro}" - done + done fi =20 # Consolidate patches, apply FreeBSD configure patch, codepage patch, @@ -60,18 +57,18 @@ epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch" =20 if [ $(get_libdir) =3D=3D "lib64" ] ; then - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" fi =20 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" + 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 } =20 @@ -81,52 +78,52 @@ =20 local my_conf=3D"" if use debug; then - my_conf=3D"--prefix ${D}usr --debug" + my_conf=3D"--prefix ${D}usr --debug" else - my_conf=3D"--prefix ${D}usr" + my_conf=3D"--prefix ${D}usr" fi =20 if use qt3; then - einfo "using QTDIR: '$QTDIR'." - export LIBRARY_PATH=3D"${QTDIR}/$(get_libdir):${LIBRARY_PATH}" - export LD_LIBRARY_PATH=3D"${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 qt3 doxywizard) \ + einfo "using QTDIR: '$QTDIR'." + export LIBRARY_PATH=3D"${QTDIR}/$(get_libdir):${LIBRARY_PATH}" + export LD_LIBRARY_PATH=3D"${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 qt3 doxywizard) \ || die 'configure with qt3 failed' else - ./configure ${my_conf} || die 'configure failed' + ./configure ${my_conf} || die 'configure failed' fi =20 # and compile emake CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LINK=3D"$(tc-getCXX)" \ - LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' + LINK_SHLIB=3D"$(tc-getCXX)" all || die 'emake failed' =20 # 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 + if use nodot; then sed -i -e "s/HAVE_DOT =3D YES/HAVE_DOT =3D NO/" \ - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed" - fi - if use latex; then + {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 + else cp doc/Doxyfile doc/Doxyfile.orig cp doc/Makefile doc/Makefile.orig sed -i.orig -e "s/GENERATE_LATEX =3D YES/GENERATE_LATEX =3D NO/"= \ - doc/Doxyfile + doc/Doxyfile sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ + -e "s/@sed/# @sed/" doc/Makefile make docs || ewarn '"make html docs" failed.' - fi + fi fi } =20 @@ -135,8 +132,8 @@ install || die '"make install" failed.' =20 if use qt3; then - doicon "${FILESDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ + doicon "${FILESDIR}/doxywizard.png" + make_desktop_entry doxywizard "DoxyWizard ${PV}" \ "doxywizard.png" "Application;Development" fi =20 @@ -144,11 +141,11 @@ =20 # pdf and html manuals if use doc; then - insinto /usr/share/doc/"${PF}" - if use latex; then + insinto /usr/share/doc/"${PF}" + if use latex; then doins latex/doxygen_manual.pdf - fi - dohtml -r html/* + fi + dohtml -r html/* fi } =20