summaryrefslogtreecommitdiff
path: root/dev-vcs/git/git-9999-r1.ebuild
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-10 13:21:36 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-10 13:21:36 +0000
commit77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /dev-vcs/git/git-9999-r1.ebuild
parentbd4aeefe33e63f613512604e47bfca7b2187697d (diff)
gentoo resync : 10.11.2019
Diffstat (limited to 'dev-vcs/git/git-9999-r1.ebuild')
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild12
1 files changed, 6 insertions, 6 deletions
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index c305c57e6449..4bee6fa6ca97 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -54,7 +54,7 @@ SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
# Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
gnome-keyring? ( app-crypt/libsecret )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
@@ -73,7 +73,7 @@ CDEPEND="
iconv? ( virtual/libiconv )
"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
gpg? ( app-crypt/gnupg )
perl? (
dev-perl/Error
@@ -106,9 +106,6 @@ RDEPEND="${CDEPEND}
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- test? ( app-crypt/gnupg )"
-
BDEPEND="
doc? (
app-text/asciidoc
@@ -117,6 +114,7 @@ BDEPEND="
sys-apps/texinfo
)
nls? ( sys-devel/gettext )
+ test? ( app-crypt/gnupg )
"
# Live ebuild builds man pages and HTML docs, additionally
@@ -139,6 +137,8 @@ REQUIRED_USE="
perforce? ( ${PYTHON_REQUIRED_USE} )
"
+RESTRICT="!test? ( test )"
+
PATCHES=(
# bug #350330 - automagic CVS when we don't want it is bad.
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
@@ -548,7 +548,7 @@ src_install() {
# but upstream installs in /usr/share/gitweb
# so we will install a symlink and use their location for compat with other
# distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+ dosym ../gitweb /usr/share/${PN}/gitweb
# INSTALL discusses configuration issues, not just installation
docinto /