commit: 72c0b85f06e30c53c92a96a9288e0620502611d5 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Fri Dec 15 02:31:16 2017 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri Dec 15 03:58:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c0b85f
app-doc/doxygen: significantly clean up ebuild - remove desktop entry setup and inherit old fdo-mime eclass - fix dependencies Closes: https://bugs.gentoo.org/633872 Closes: https://bugs.gentoo.org/625892 Closes: https://bugs.gentoo.org/637200 Package-Manager: Portage-2.3.18, Repoman-2.3.6 ...oxygen-9999.ebuild => doxygen-1.8.13-r2.ebuild} | 56 ++++++++-------------- app-doc/doxygen/doxygen-9999.ebuild | 37 ++++---------- 2 files changed, 29 insertions(+), 64 deletions(-) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild similarity index 69% copy from app-doc/doxygen/doxygen-9999.ebuild copy to app-doc/doxygen/doxygen-1.8.13-r2.ebuild index 9f04e7ce861..9bc4c44da9e 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild @@ -4,18 +4,15 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 +inherit cmake-utils eutils python-any-r1 if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"; SRC_URI="" - KEYWORDS="" else - SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" - S="${WORKDIR}/${PN}-Release_${PV//\./_}" fi -SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"; DESCRIPTION="Documentation system for most programming languages" HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"; @@ -34,10 +31,17 @@ RDEPEND="app-text/ghostscript-gpl media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) - latex? ( app-text/texlive[extra] ) + latex? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsxextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) " @@ -52,7 +56,12 @@ DEPEND="sys-devel/flex # src_test() defaults to make -C testing but there is no such directory (bug #504448) RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-1.8.11-link_with_pthread.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 + "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch" +) + DOCS=( LANGUAGE.HOWTO README.md ) pkg_setup() { @@ -78,12 +87,13 @@ src_prepare() { doc/maintainers.txt || die if is-flagq "-O3" ; then - echo + ewarn ewarn "Compiling with -O3 is known to produce incorrectly" ewarn "optimized code which breaks doxygen." - echo + ewarn + elog elog "Continuing with -O2 instead ..." - echo + elog replace-flags "-O3" "-O2" fi } @@ -118,30 +128,4 @@ src_compile() { src_install() { cmake-utils_src_install - - if use qt5; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "For examples and other goodies, see the source tarball. For some" - elog "example output, run doxygen on the doxygen source using the" - elog "Doxyfile 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 } diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index 9f04e7ce861..607349bff31 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 +inherit cmake-utils eutils python-any-r1 if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"; @@ -34,10 +34,17 @@ RDEPEND="app-text/ghostscript-gpl media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) - latex? ( app-text/texlive[extra] ) + latex? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsxextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) " @@ -118,30 +125,4 @@ src_compile() { src_install() { cmake-utils_src_install - - if use qt5; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "For examples and other goodies, see the source tarball. For some" - elog "example output, run doxygen on the doxygen source using the" - elog "Doxyfile 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 }
![https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"](https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"){kind=link}