commit: 8f02a3af6e54794f67c8ca97e76484ab36e97a7d Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu Dec 12 19:22:48 2019 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> 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 <tamiko <AT> 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}"
