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 0F6401382C5 for ; Thu, 14 Jan 2021 18:58:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35F6BE08F4; Thu, 14 Jan 2021 18:58:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1D769E08F4 for ; Thu, 14 Jan 2021 18:58:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 3DC4D340DB1 for ; Thu, 14 Jan 2021 18:58:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8550C496 for ; Thu, 14 Jan 2021 18:58:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610650221.71c26e6b2e3fa40195e5d3f0355469ffa59ad50b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-doc/doxygen/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 71c26e6b2e3fa40195e5d3f0355469ffa59ad50b X-VCS-Branch: master Date: Thu, 14 Jan 2021 18:58:12 +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: f610ebbc-3e2f-46be-9c97-fbf5a8945f1e X-Archives-Hash: d4bf6d68f0110d0d14fd4954cea9912d commit: 71c26e6b2e3fa40195e5d3f0355469ffa59ad50b Author: Sam James gentoo org> AuthorDate: Thu Jan 14 18:47:10 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 14 18:50:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c26e6b app-doc/doxygen: sync live ebuild Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-doc/doxygen/doxygen-9999.ebuild | 49 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index 3217e3c0660..949ef011d17 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake-utils eutils flag-o-matic python-any-r1 +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" SRC_URI="" - KEYWORDS="" else SRC_URI="http://doxygen.nl/files/${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" @@ -23,6 +22,10 @@ LICENSE="GPL-2" SLOT="0" IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU" +BDEPEND="sys-devel/bison + sys-devel/flex + doc? ( ${PYTHON_DEPS} ) +" RDEPEND="app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= @@ -38,6 +41,7 @@ RDEPEND="app-text/ghostscript-gpl dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( @@ -46,28 +50,25 @@ RDEPEND="app-text/ghostscript-gpl 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" +" +DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" + "${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" + "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.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 + cmake_src_prepare # Ensure we link to -liconv if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then @@ -104,17 +105,16 @@ src_configure() { -Dbuild_wizard=$(usex qt5) -Duse_sqlite3=$(usex sqlite) -DGIT_EXECUTABLE="false" - ) + ) + use doc && mycmakeargs+=( -DDOC_INSTALL_DIR="share/doc/${P}" - ) + ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile - if use doc; then export VARTEXFONTS="${T}/fonts" # bug #564944 @@ -123,10 +123,13 @@ src_compile() { {Doxyfile,doc/Doxyfile} \ || die "disabling dot failed" fi - cmake-utils_src_make -C "${BUILD_DIR}" docs + + cmake_src_compile docs fi + + cmake_src_compile } src_install() { - cmake-utils_src_install + cmake_src_install }