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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F7C0138334 for ; Thu, 12 Dec 2019 19:46:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B520BE0841; Thu, 12 Dec 2019 19:46:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D750E0841 for ; Thu, 12 Dec 2019 19:46:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8673634D969 for ; Thu, 12 Dec 2019 19:46:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 402F68A7 for ; Thu, 12 Dec 2019 19:46:41 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1576179984.3f549b1fb85e0973964b99245fbe4fc5d0d32cd1.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/Manifest app-doc/doxygen/doxygen-1.8.14-r1.ebuild app-doc/doxygen/doxygen-1.8.14-r2.ebuild app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch X-VCS-Directories: app-doc/doxygen/files/ app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 3f549b1fb85e0973964b99245fbe4fc5d0d32cd1 X-VCS-Branch: master Date: Thu, 12 Dec 2019 19:46:41 +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: 676bf1d7-1c89-4969-abb1-9b4d8df317d4 X-Archives-Hash: 30c57cc8793f3e1982a507be998b675d commit: 3f549b1fb85e0973964b99245fbe4fc5d0d32cd1 Author: Matthias Maier gentoo org> AuthorDate: Thu Dec 12 19:25:52 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Dec 12 19:46:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f549b1f app-doc/doxygen: drop old versions Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Matthias Maier gentoo.org> app-doc/doxygen/Manifest | 1 - app-doc/doxygen/doxygen-1.8.14-r1.ebuild | 135 ---------------------- app-doc/doxygen/doxygen-1.8.14-r2.ebuild | 136 ----------------------- app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 ----- 4 files changed, 297 deletions(-) diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 40932be8260..0467e383742 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,3 +1,2 @@ -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 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild deleted file mode 100644 index de853a4a2b3..00000000000 --- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# 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} ) - -CMAKE_MAKEFILE_GENERATOR="emake" - -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="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-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.12-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692 -) - -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/doxygen-1.8.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild deleted file mode 100644 index f374b46eae5..00000000000 --- a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# 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} ) - -CMAKE_MAKEFILE_GENERATOR="emake" - -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="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-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.12-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.14-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.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch deleted file mode 100644 index 86e6d799941..00000000000 --- a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5c55efae..1ad32b2e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -262,7 +262,7 @@ if (use_libclang) - 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/src/clangparser.cpp b/src/clangparser.cpp -index 77151d6e..2ea15ee2 100644 ---- a/src/clangparser.cpp -+++ b/src/clangparser.cpp -@@ -4,6 +4,7 @@ - - #if USE_LIBCLANG - #include -+#include "clang/Tooling/CompilationDatabase.h" - #include "clang/Tooling/Tooling.h" - #include - #include