From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0EBAD158086 for ; Wed, 1 Dec 2021 21:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E4282BC00D; Wed, 1 Dec 2021 21:14:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 277FE2BC00D for ; Wed, 1 Dec 2021 21:14:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE9FA343105 for ; Wed, 1 Dec 2021 21:14:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68A7B8E for ; Wed, 1 Dec 2021 21:14:37 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1638393208.39dd36d816f126a54e048d28e3ab07343225dabc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/Manifest app-doc/doxygen/doxygen-1.8.17-r1.ebuild app-doc/doxygen/doxygen-1.8.20.ebuild app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch X-VCS-Directories: app-doc/doxygen/files/ app-doc/doxygen/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 39dd36d816f126a54e048d28e3ab07343225dabc X-VCS-Branch: master Date: Wed, 1 Dec 2021 21:14:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f6973ea3-8174-4c0f-b283-b16f2fc6cf43 X-Archives-Hash: 3eb01141edf1f488a09fb56def92e75e commit: 39dd36d816f126a54e048d28e3ab07343225dabc Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 29 15:11:21 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 1 21:13:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dd36d8 app-doc/doxygen: Drop 1.8.17-r1 and 1.8.20 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-doc/doxygen/Manifest | 2 - app-doc/doxygen/doxygen-1.8.17-r1.ebuild | 137 ---------------------- app-doc/doxygen/doxygen-1.8.20.ebuild | 135 --------------------- app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch | 11 -- app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch | 42 ------- 5 files changed, 327 deletions(-) diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 0db5dc860c44..1ba9c1d618bc 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,4 +1,2 @@ -DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75 -DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed DIST doxygen-1.9.2.src.tar.gz 5076037 BLAKE2B 7b21b228a2049f3048fba744d94066524a0fca37335a7ffd2616fd62a8a7d8d9d28d0bd506245c63771264a279a21f327e5386a9b4c490eea7f79ddd9583b566 SHA512 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild deleted file mode 100644 index eb4af7f0b654..000000000000 --- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-utils 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 ~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 userland_GNU" - -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 - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) - " - -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.16-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 - "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" - "${FILESDIR}/${PN}-1.8.17-llvm10.patch" #730170 -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_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) - -DGIT_EXECUTABLE="false" - ) - 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/doxygen-1.8.20.ebuild b/app-doc/doxygen/doxygen-1.8.20.ebuild deleted file mode 100644 index 75f3e53ee1da..000000000000 --- a/app-doc/doxygen/doxygen-1.8.20.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-utils 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 ~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 userland_GNU" - -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 - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) - " - -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.16-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_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) - -DGIT_EXECUTABLE="false" - ) - 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-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch deleted file mode 100644 index 861c79a6b0d9..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch deleted file mode 100644 index 2b2ca0ef733f..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt -index ae52cab..04b9293 100644 ---- a/addon/doxyapp/CMakeLists.txt -+++ b/addon/doxyapp/CMakeLists.txt -@@ -14,7 +14,7 @@ doxyapp.cpp - ) - - if (use_libclang) -- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) -+ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) - endif() - - target_link_libraries(doxyapp -diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt -index 2387f1b..c880c3d 100644 ---- a/addon/doxyparse/CMakeLists.txt -+++ b/addon/doxyparse/CMakeLists.txt -@@ -14,7 +14,7 @@ doxyparse.cpp - ) - - if (use_libclang) -- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) -+ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) - endif() - - target_link_libraries(doxyparse -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3f4767c..d6891a6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -310,9 +310,9 @@ if (use_libclang) - endif() - include_directories(${LLVM_INCLUDE_DIRS}) - add_definitions(${LLVM_DEFINITIONS}) -- llvm_map_components_to_libnames(llvm_libs support core option) -+ llvm_map_components_to_libnames(llvm_libs support) - target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) -- set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) -+ set(CLANG_LIBS libclang clang-cpp ${llvm_libs}) - endif() - - target_link_libraries(doxygen