From 83b5cde41ddb8fd20de4536dd68eb08da42d013e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Jul 2022 20:32:17 +0100 Subject: gentoo auto-resync : 17:07:2022 - 20:32:17 --- app-doc/doxygen/Manifest | 4 +- app-doc/doxygen/doxygen-1.9.4-r1.ebuild | 134 ++++++++++++++++++++++++++++++++ app-doc/doxygen/doxygen-1.9.4.ebuild | 131 ------------------------------- app-doc/doxygen/doxygen-9999.ebuild | 8 +- 4 files changed, 141 insertions(+), 136 deletions(-) create mode 100644 app-doc/doxygen/doxygen-1.9.4-r1.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.9.4.ebuild (limited to 'app-doc/doxygen') diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 13a482e94bc0..027aa0b9b22c 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -14,6 +14,6 @@ DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295 EBUILD doxygen-1.9.1.ebuild 3069 BLAKE2B 04a668ae2be27712efc937e69f67c6d2f33041a91ffcf3d6f64255fc67c477619e56cf1caecaa02030422af8cba57b0e828afd6858fae5e4c5dde7ee44596c43 SHA512 adbefc8067347781614369199c02d7071e0fd19b047b1315300310fdffbb84781252e860382b22aec58aa881bc0a5f0f2599ee342dbdaa3d674697689cd6ae11 EBUILD doxygen-1.9.2.ebuild 3044 BLAKE2B 418674cda835cb849d96c670af9846778f8ac40727af6ccc6a1c3880504be23dcf41007f18900cf7e4ab4ed1aef4057718aed61c83ffd43571f99fc7a844457e SHA512 af9d3a74eab861a0423ebf852b94312597624ab156e849d30cfeecd4cc20c8a5eacb6daf8da48dc21f7579b3c4c86754fcf28ba5856882616b7330386e69a729 EBUILD doxygen-1.9.3.ebuild 2905 BLAKE2B 6c177c1de038266e02c18912f63d087c292447346b7e850d4b17f30a7eaf6f3f66703502afd8afc4eb587d2c99374e343e64c3ad587bc6faceaab29c92275352 SHA512 1d25fb469253a97006fe043ceb225704d1d9413277ac644e7c9bdecd8309f1564b2b6ffd6c5a999e3529ef4bbc5bf5da9f08dede72643112ebb984b42f94a90f -EBUILD doxygen-1.9.4.ebuild 2968 BLAKE2B 88e3f17036a670fc2114821b1007d4914c8f28e780047a5734356f3e8f6902207c4e86037639a172b9467476466a969b922aee26ce86e3b2662a24919bd00a9c SHA512 75890747b795067cc5ee293978fbed4c80b3a98a8dcad7368e068edf4bbc84e4ac9cd64cc4fa4839029894a92ccf4e2436a336c16d06938df865e76676ac21a9 -EBUILD doxygen-9999.ebuild 2986 BLAKE2B 8071c7994a2475019011f01e3d71cdd93b5e570587a8dd0cb68bc2e6741a86b1a543c09c37bd1189732750ff8f8b5ae958039250c1eacb32593cf84e9ed346c3 SHA512 57d69f97e3748337e298f82a0f9cf18aff521e43869f6d4301ea9d2191d835157395ada7807331630ee2004b54e24d4c1eae03f1fb57a784f859321295b3750b +EBUILD doxygen-1.9.4-r1.ebuild 3065 BLAKE2B b626138e0019b20c1ad338eb3479ea9057c88ca67f56704421c688ed432b014232a468b6bf5192ec5906039e7fc9ecd948e143951a44c66f806dd8f6d8a76a18 SHA512 fa4b9beec601d8db6065272ee00ce6325f719ec6a1175a819f8b7221098bf9af982a8031e6b08c00005c1f965330fe6699c1e007f9283429402995c3d9b9bf9d +EBUILD doxygen-9999.ebuild 3027 BLAKE2B f5d5345fa9834ab02ae15c21df0add03c092e04f9d164e8127fe2e2e8cee8d14a9b24ef2277aee44b0b334db9f5be43ba0d2c3bab4d392a6a5774746512e188a SHA512 40660ad851ae2ab51b5f124f35cdd8a748c82f11b9afb9fa022e1ccc823b1bf7a8985eb1903d15cf03ff019ef0447348a7e50968e3c4e21b0a1a4baafc4c2ae5 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67 diff --git a/app-doc/doxygen/doxygen-1.9.4-r1.ebuild b/app-doc/doxygen/doxygen-1.9.4-r1.ebuild new file mode 100644 index 000000000000..5617165c5c4e --- /dev/null +++ b/app-doc/doxygen/doxygen-1.9.4-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic llvm python-any-r1 +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" +else + SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" + SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="http://www.doxygen.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch qt5 sqlite" +# We need TeX for tests, bug #765472 +RESTRICT="!doc? ( test )" + +BDEPEND="sys-devel/bison + sys-devel/flex + ${PYTHON_DEPS} +" +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( >=sys-devel/clang-10:= ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) + doxysearch? ( dev-libs/xapian:= ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" + "${FILESDIR}/${P}-gcc12-include.patch" +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # 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 + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + ewarn + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + ewarn + elog + elog "Continuing with -O2 instead ..." + elog + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + + local mycmakeargs=( + -Duse_libclang=$(usex clang) + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex qt5) + -Duse_sqlite3=$(usex sqlite) + -DGIT_EXECUTABLE="false" + ) + + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + + # -j1 for bug #770070 + cmake_src_compile docs -j1 + fi +} + +src_install() { + cmake_src_install +} diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild deleted file mode 100644 index 9084302b6093..000000000000 --- a/app-doc/doxygen/doxygen-1.9.4.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml(+)" - -inherit cmake flag-o-matic llvm python-any-r1 -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" -else - SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" - SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="http://www.doxygen.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="clang debug doc dot doxysearch qt5 sqlite" -# We need TeX for tests, bug #765472 -RESTRICT="!doc? ( test )" - -BDEPEND="sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} -" -RDEPEND="app-text/ghostscript-gpl - dev-lang/perl - media-libs/libpng:0= - virtual/libiconv - clang? ( >=sys-devel/clang-10:= ) - dot? ( - media-gfx/graphviz - media-libs/freetype - ) - doc? ( - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - dev-texlive/texlive-plaingeneric - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" - "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" - "${FILESDIR}/${P}-gcc12-include.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # 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 - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - if is-flagq "-O3" ; then - ewarn - ewarn "Compiling with -O3 is known to produce incorrectly" - ewarn "optimized code which breaks doxygen." - ewarn - elog - elog "Continuing with -O2 instead ..." - elog - replace-flags "-O3" "-O2" - fi -} - -src_configure() { - local mycmakeargs=( - -Duse_libclang=$(usex clang) - -Dbuild_doc=$(usex doc) - -Dbuild_search=$(usex doxysearch) - -Dbuild_wizard=$(usex qt5) - -Duse_sqlite3=$(usex sqlite) - -DGIT_EXECUTABLE="false" - ) - - use doc && mycmakeargs+=( - -DDOC_INSTALL_DIR="share/doc/${P}" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - export VARTEXFONTS="${T}/fonts" # bug #564944 - - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {Doxyfile,doc/Doxyfile} \ - || die "disabling dot failed" - fi - - # -j1 for bug #770070 - cmake_src_compile docs -j1 - fi -} - -src_install() { - cmake_src_install -} diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index cd997872fb53..98ae522f189f 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -57,10 +57,9 @@ RDEPEND="app-text/ghostscript-gpl DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" + "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" - "${FILESDIR}/${PN}-1.9.1-header-dep.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) @@ -93,6 +92,9 @@ src_prepare() { } src_configure() { + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + local mycmakeargs=( -Duse_libclang=$(usex clang) -Dbuild_doc=$(usex doc) -- cgit v1.2.3