diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-10-24 17:36:35 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-10-24 17:36:35 +0000 |
| commit | 94d2bc85fedbce9551db08b8a63d4d52e0204bdc (patch) | |
| tree | 1660352902349c1642a31ff4bd7e507ca3409929 /dev-vcs/git/git-9999.ebuild | |
| parent | keyworded ~arm (diff) | |
| download | gentoo-2-94d2bc85fedbce9551db08b8a63d4d52e0204bdc.tar.gz gentoo-2-94d2bc85fedbce9551db08b8a63d4d52e0204bdc.tar.bz2 gentoo-2-94d2bc85fedbce9551db08b8a63d4d52e0204bdc.zip | |
EAPI=4 and bash-completion-r1 support now that python.eclass has EAPI4, now uses REQUIRED_USE instead of warning blocks. Patch by Tomas Chvatal <scarabeus@gentoo.org>.
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs/git/git-9999.ebuild')
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 9730ca7292d0..d61f9be0bbc3 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.24 2011/10/03 10:07:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.25 2011/10/24 17:36:35 robbat2 Exp $ -EAPI=3 +EAPI=4 GENTOO_DEPEND_ON_PERL=no @@ -11,7 +11,7 @@ PYTHON_DEPEND="python? 2" [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -90,15 +90,14 @@ fi SITEFILE=50${PN}-gentoo.el S="${WORKDIR}/${MY_P}" +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + subversion? ( perl ) + webdav? ( curl ) +" + pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" ewarn "with USE=dso, there may be weird crashes in git-svn. You" @@ -337,7 +336,7 @@ src_install() { # Upstream does not ship this pre-built :-( use doc && doinfo Documentation/{git,gitman}.info - dobashcompletion contrib/completion/git-completion.bash ${PN} + newbashcomp contrib/completion/git-completion.bash ${PN} if use emacs ; then elisp-install ${PN} contrib/emacs/git.{el,elc} || die @@ -513,7 +512,6 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen use python && python_mod_optimize git_remote_helpers - use bash-completion && \ einfo "Please read /usr/share/bash-completion/git for Git bash completion" elog "These additional scripts need some dependencies:" echo |