diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-vcs/git/git-2.35.3.ebuild | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-vcs/git/git-2.35.3.ebuild')
-rw-r--r-- | dev-vcs/git/git-2.35.3.ebuild | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/dev-vcs/git/git-2.35.3.ebuild b/dev-vcs/git/git-2.35.3.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-2.35.3.ebuild +++ b/dev-vcs/git/git-2.35.3.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{8..10} ) -inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -113,7 +113,6 @@ BDEPEND=" app-text/xmlto sys-apps/texinfo ) - emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) @@ -304,10 +303,6 @@ src_configure() { src_compile() { git_emake || die "emake failed" - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - if use perl && use cgi ; then git_emake gitweb || die "emake gitweb (cgi) failed" fi @@ -389,16 +384,6 @@ src_install() { insinto /usr/share/${PN} doins contrib/completion/git-prompt.sh - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - #dobin contrib/fast-import/git-p4 # Moved upstream #dodoc contrib/fast-import/git-p4.txt # Moved upstream newbin contrib/fast-import/import-tars.perl import-tars @@ -446,7 +431,7 @@ src_install() { # The following are excluded: # completion - installed above # diff-highlight - done above - # emacs - installed above + # emacs - removed upstream # examples - these are stuff that is not used in Git anymore actually # git-jump - done above # gitview - installed above @@ -642,7 +627,6 @@ showpkgdeps() { } pkg_postinst() { - use emacs && elisp-site-regen elog "Please read /usr/share/bash-completion/completions/git for Git bash command" elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" @@ -655,7 +639,3 @@ pkg_postinst() { echo use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." } - -pkg_postrm() { - use emacs && elisp-site-regen -} |