From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2019 23:40:16 +0100 Subject: gentoo resync : 11.07.2019 --- app-doc/doxygen/Manifest | 4 + app-doc/doxygen/doxygen-1.8.15.ebuild | 134 +++++++++++++++++++++ .../files/doxygen-1.8.15-link_with_pthread.patch | 32 +++++ app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch | 11 ++ 4 files changed, 181 insertions(+) create mode 100644 app-doc/doxygen/doxygen-1.8.15.ebuild create mode 100644 app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch create mode 100644 app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch (limited to 'app-doc/doxygen') diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index cf9adf1bfbc3..3d7ff13182dc 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,9 +1,13 @@ AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831 AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b5692f3b999bbe1ddf9eeae2e7a75751582e513e9ba2a2ca6f06f50bccc6c939ec211a879111961abb09882bb8e12d SHA512 c43e295cf7b31e7bd4374c105a9f41622dfeca6326de85a9ba62cbe0907cd7526a8393afbea380c5c662235b09aba1460f0b50a9d9cbc86fe0c9830c9dd1ca10 AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a +AUX doxygen-1.8.15-link_with_pthread.patch 1119 BLAKE2B 3c4dbb0440134d96e7879f4d18869eeffb06a43726dd6ce0441fc1f4bc4664088ebc185f38c1685adf3ddcff1de45a9a0b11e38206c9592c42cb7d45c2ba3f60 SHA512 fc7623892cdfc0fd93a9470ed7c29723b53f690618d86bdb9d4afd387af7dccd36c8b6a54b86d46c464a7960aa557570589e874cbd0ad825a379493143610e77 +AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c +DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079 EBUILD doxygen-1.8.14-r1.ebuild 3153 BLAKE2B 140bc6d056fbab86a10381c7998889f9f7d71bd086b469c5652f6193d97cd7c3c6ded17647fad380fe9cf4c011b9831f251ee1c45d57b4c0f9eedf5bb8755839 SHA512 43d215ca8e0a4b22abd797729a75fac864e34b6e76fcd17d0a806dc7c8f259d44210c2259d02c4498245905ca81c6a3e9b00b9d0ece2f5b2d593fbb51de4f606 EBUILD doxygen-1.8.14-r2.ebuild 3228 BLAKE2B 43ac8586d52bc32d96507b6d9863d5383505a324f685a85926a6abc52cd069f55603502ed4bc678427c1a33d4c77ca652602d45d77d0ea22ecd17f016676470f SHA512 9bd5f2fda9e5dd0ec924448eb36c2df39e3ab675e5911a49b39a524005295fa70cdbcf03206592c273332e1d0cc21e0b48f5bf31b99035ae051fe9ae606140fd +EBUILD doxygen-1.8.15.ebuild 3213 BLAKE2B a374bbdae3b8a76d18c4fe2bc48cf0e2cddf25c5cdc3f655735394068b6e0885cfa340707d440bed9b99cead3b1336d4a0f1a0f94104aa295c69be7e43885321 SHA512 22208596fc40be6af6bdeb225078bceaab3195684827094177caba56ba1b38f92bc4127d73bfff5366253cd478fa81fe879e9cbb2485f5012189b271d2fcbfdc EBUILD doxygen-9999.ebuild 3090 BLAKE2B 7c975b66d9f655d5df7e6fc9a8c7622b5550a497e8f7206d611de43350e8d8aefb7f8556879bff5fd137cf7107c7ddd8d61e3f71e14185e22cf3b27440e64942 SHA512 6e631c350a76cc7cbfe4dafd7d1d8ddfd74195e7b62eb1cf1bc6523c76294d8daaaa16fc3d7ea542fbe486f162e1c5689f0121aeb967859eed26b83598254e98 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61 diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild new file mode 100644 index 000000000000..d609aec89e6a --- /dev/null +++ b/app-doc/doxygen/doxygen-1.8.15.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +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="" +else + SRC_URI="http://doxygen.nl/files/${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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" + +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( >=sys-devel/clang-4.0.0:= ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doxysearch? ( dev-libs/xapian:= ) + latex? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + 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 ) + " + +REQUIRED_USE="doc? ( latex )" + +DEPEND="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="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 + "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 + "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892 +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # Ensure we link to -liconv + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + local pro + for pro in */*.pro.in */*/*.pro.in; do + echo "unix:LIBS += -liconv" >> "${pro}" || die + 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 + + # 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) + ) + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_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 + cmake-utils_src_make -C "${BUILD_DIR}" docs + fi +} + +src_install() { + cmake-utils_src_install +} diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch new file mode 100644 index 000000000000..54c0a96e5e1a --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch @@ -0,0 +1,32 @@ +--- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200 ++++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200 +@@ -18,6 +18,7 @@ + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} + qtools ++ pthread + ) + + add_executable(doxysearch.cgi +@@ -27,6 +28,7 @@ + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ++ pthread + ) + + install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) +--- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200 ++++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200 +@@ -102,9 +102,9 @@ + ) + + if(Qt5Core_FOUND) +- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) ++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread) + else() +- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) ++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread) + endif() + + install(TARGETS doxywizard DESTINATION bin) diff --git a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch new file mode 100644 index 000000000000..861c79a6b0d9 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt 2019-04-04 06:51:41.509647160 +0200 ++++ b/src/CMakeLists.txt 2019-04-04 06:52:08.413646804 +0200 +@@ -263,7 +263,7 @@ + add_definitions(${LLVM_DEFINITIONS}) + llvm_map_components_to_libnames(llvm_libs support core option) + target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) +- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) ++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) + endif() + + target_link_libraries(doxygen -- cgit v1.2.3