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 B22CA138334 for ; Thu, 12 Dec 2019 19:23:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DC7BE0841; Thu, 12 Dec 2019 19:23:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6AF2BE0841 for ; Thu, 12 Dec 2019 19:23:31 +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 8226A34D97B for ; Thu, 12 Dec 2019 19:23:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 215F18D1 for ; Thu, 12 Dec 2019 19:23:27 +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: <1576178568.8f02a3af6e54794f67c8ca97e76484ab36e97a7d.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.8.16.ebuild app-doc/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 8f02a3af6e54794f67c8ca97e76484ab36e97a7d X-VCS-Branch: master Date: Thu, 12 Dec 2019 19:23:27 +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: 8ceea006-826f-4616-bfc6-f2d7298fc51a X-Archives-Hash: 9cb3c82953b06bd616f4edc4ec8c0c19 commit: 8f02a3af6e54794f67c8ca97e76484ab36e97a7d Author: Matthias Maier gentoo org> AuthorDate: Thu Dec 12 19:22:48 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Dec 12 19:22:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f02a3af app-doc/doxygen: fix git build dep; synchronize live ebuild Closes: https://bugs.gentoo.org/698870 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Matthias Maier gentoo.org> app-doc/doxygen/doxygen-1.8.16.ebuild | 2 ++ app-doc/doxygen/doxygen-9999.ebuild | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild index 7b7f2f933b7..98f6fa74904 100644 --- a/app-doc/doxygen/doxygen-1.8.16.ebuild +++ b/app-doc/doxygen/doxygen-1.8.16.ebuild @@ -11,6 +11,7 @@ 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -108,6 +109,7 @@ src_configure() { -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex qt5) -Duse_sqlite3=$(usex sqlite) + -DGIT_EXECUTABLE="false" ) use doc && mycmakeargs+=( -DDOC_INSTALL_DIR="share/doc/${P}" diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index ba29bb09a4a..776ebc3469f 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -13,9 +13,8 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" KEYWORDS="" else - SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.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 ~x86-solaris" - S="${WORKDIR}/${PN}-Release_${PV//\./_}" + 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-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" @@ -34,7 +33,7 @@ RDEPEND="app-text/ghostscript-gpl media-gfx/graphviz media-libs/freetype ) - doxysearch? ( dev-libs/xapian ) + doxysearch? ( dev-libs/xapian:= ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra @@ -104,6 +103,7 @@ src_configure() { -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex qt5) -Duse_sqlite3=$(usex sqlite) + -DGIT_EXECUTABLE="false" ) use doc && mycmakeargs+=( -DDOC_INSTALL_DIR="share/doc/${P}"