tamiko 14/12/24 14:48:58 Modified: metadata.xml doxygen-1.8.5.ebuild ChangeLog Added: doxygen-1.8.8.ebuild Log: version bump and support for python3, bug #499532; add support for doxysearch, bug #508962; fix linkage on with sys-libc/uclibc, bug #512782; add support for clang assisted parsing, bug #515840; fix linkage on Gentoo/FreeBSD, bug #511024 (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key BD3A97A3)
Revision Changes Path 1.12 app-doc/doxygen/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/metadata.xml?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/metadata.xml?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/metadata.xml?r1=1.11&r2=1.12 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/metadata.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- metadata.xml 27 May 2014 07:28:07 -0000 1.11 +++ metadata.xml 24 Dec 2014 14:48:58 -0000 1.12 @@ -9,7 +9,9 @@ as well as other languages (using additional helper tools). </longdescription> <use> - <flag name='nodot'>removes graphviz dependency, along with dot graphs</flag> + <flag name='clang'>support for <pkg>sys-devel/clang</pkg> assisted parsing</flag> <flag name='dot'>allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag> + <flag name='doxysearch'>build doxyindexer and doxysearch.cgi</flag> + <flag name='nodot'>removes graphviz dependency, along with dot graphs</flag> </use> </pkgmetadata> 1.15 app-doc/doxygen/doxygen-1.8.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild?r1=1.14&r2=1.15 Index: doxygen-1.8.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- doxygen-1.8.5.ebuild 3 Sep 2014 17:10:14 -0000 1.14 +++ doxygen-1.8.5.ebuild 24 Dec 2014 14:48:58 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.14 2014/09/03 17:10:14 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.15 2014/12/24 14:48:58 tamiko Exp $ EAPI=4 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -96,7 +96,7 @@ || die # Ensure we link to -liconv - if use elibc_FreeBSD; then + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then for pro in */*.pro.in */*/*.pro.in; do echo "unix:LIBS += -liconv" >> "${pro}" done 1.273 app-doc/doxygen/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.273&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.273&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.272&r2=1.273 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- ChangeLog 3 Sep 2014 17:10:14 -0000 1.272 +++ ChangeLog 24 Dec 2014 14:48:58 -0000 1.273 @@ -1,6 +1,15 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.272 2014/09/03 17:10:14 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.273 2014/12/24 14:48:58 tamiko Exp $ + +*doxygen-1.8.8 (24 Dec 2014) + + 24 Dec 2014; Matthias Maier <[email protected]> +doxygen-1.8.8.ebuild, + doxygen-1.8.5.ebuild, metadata.xml: + version bump and support for python3, bug #499532; add support for doxysearch, + bug #508962; fix linkage on with sys-libc/uclibc, bug #512782; add support for + clang assisted parsing, bug #515840; fix linkage on Gentoo/FreeBSD, bug + #511024 03 Sep 2014; Christoph Junghans <[email protected]> doxygen-1.8.5.ebuild: Added ~x64-macos (tested by me) 1.1 app-doc/doxygen/doxygen-1.8.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.8.8.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.8.8.ebuild?rev=1.1&content-type=text/plain Index: doxygen-1.8.8.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.8.ebuild,v 1.1 2014/12/24 14:48:58 tamiko Exp $ EAPI=4 PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} ) inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs DESCRIPTION="Documentation system for most programming languages" HOMEPAGE="http://www.doxygen.org/"; SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="clang debug doc dot doxysearch qt4 latex sqlite elibc_FreeBSD elibc_uclibc userland_GNU" #missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk nl nb pl pt ro ru sl sk sr sv tr uk vi af) for X in "${LANGS[@]}" ; do IUSE="${IUSE} linguas_${X}" done RDEPEND="app-text/ghostscript-gpl dev-lang/perl media-libs/libpng virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt4? ( dev-qt/qtgui:4 ) sqlite? ( dev-db/sqlite:3 ) " DEPEND="sys-apps/sed sys-devel/flex sys-devel/bison doc? ( ${PYTHON_DEPS} ) ${RDEPEND}" # src_test() defaults to make -C testing but there is no such directory (bug #504448) RESTRICT="mirror test" EPATCH_SUFFIX="patch" get_langs() { # using only user set linguas also fixes #263641 my_linguas=() for lingua in ${LINGUAS}; do if has ${lingua} "${LANGS[@]}"; then case ${lingua} in hy) lingua=am ;; pt_BR) lingua=br ;; zh*) lingua=cn ;; cs) lingua=cz ;; da) lingua=dk ;; el*) lingua=gr ;; ja*) lingua=jp ;; ko) lingua=kr ;; nb) lingua=no ;; sl) lingua=si ;; tr*) lingua=tr ;; uk) lingua=ua ;; af) lingua=za ;; esac has ${lingua} "${my_linguas[@]}" || my_linguas+=(${lingua}) fi done f_langs="${my_linguas[@]}" echo ${f_langs// /,} } pkg_setup() { tc-export CC CXX use doc && python-any-r1_pkg_setup } src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${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):' \ -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \ -e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \ -e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \ -e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \ -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \ || die # Ensure we link to -liconv if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; 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 sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die # prefix search tools patch, plus OSX fixes epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348 # fix pdf doc sed -i.orig -e "s:g_kowal:g kowal:" \ doc/maintainers.txt || die sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \ -i Makefile.in || die #428280 if is-flagq "-O3" ; then echo ewarn "Compiling with -O3 is known to produce incorrectly" ewarn "optimized code which breaks doxygen." echo elog "Continuing with -O2 instead ..." echo replace-flags "-O3" "-O2" fi } src_configure() { # set ./configure options (prefix, Qt based wizard, docdir) local my_conf="--shared --enable-langs $(get_langs)" if use debug ; then my_conf="${my_conf} --debug" else my_conf="${my_conf} --release " fi use clang && my_conf="${my_conf} --with-libclang" use doxysearch && my_conf="${my_conf} --with-doxysearch" use qt4 && my_conf="${my_conf} --with-doxywizard" use sqlite && my_conf="${my_conf} --with-sqlite3" # On non GNU userland (e.g. BSD), configure script picks up make and bails # out because it is not GNU make, so we force the right value. use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install" export LINK="${QMAKE_LINK}" export LINK_SHLIB="${QMAKE_CXX}" ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ || die if use qt4 ; then pushd addon/doxywizard &> /dev/null eqmake4 doxywizard.pro -o Makefile.doxywizard popd &> /dev/null fi } src_compile() { emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \ LFLAGS+="${ELDFLAGS}" all # 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 dot; 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 docs" failed.' fi fi } src_install() { emake DESTDIR="${D}" MAN1DIR=share/man/man1 install if use qt4; then doicon "${DISTDIR}/doxywizard.png" make_desktop_entry doxywizard "DoxyWizard ${PV}" \ "/usr/share/pixmaps/doxywizard.png" \ "Development" fi dodoc LANGUAGE.HOWTO README.md # pdf and html manuals if use doc; then dohtml -r html/* use latex && dodoc latex/doxygen_manual.pdf 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 "Disabling the dot 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 }
![http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"](http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"){kind=link}