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@gentoo.org>

diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild
index 7b7f2f933b7bc5d90e8a5feb146398b61ebc24a5..98f6fa7490490de51711b956e2dd9c99d6034143 100644 (file)
--- 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 ba29bb09a4ab53cb72c6d9ea9bac42ddbcee8a49..776ebc3469f02ae5b0a01d42d2621fcac14647f3 100644 (file)
--- 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}"