commit: b84958e4b536ffc773078d98a57bf28ec0024018 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 11 06:26:00 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sat Jun 11 06:30:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84958e4
dev-vcs/git: Drop emacs USE flag Closes: https://bugs.gentoo.org/850760 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> dev-vcs/git/files/50git-gentoo.el | 13 ------------- dev-vcs/git/git-2.32.0-r1.ebuild | 26 +++----------------------- dev-vcs/git/git-2.33.1.ebuild | 26 +++----------------------- dev-vcs/git/git-2.34.1-r1.ebuild | 26 +++----------------------- dev-vcs/git/git-2.34.1.ebuild | 26 +++----------------------- dev-vcs/git/git-2.35.1.ebuild | 26 +++----------------------- dev-vcs/git/git-2.35.2.ebuild | 26 +++----------------------- dev-vcs/git/git-2.35.3.ebuild | 26 +++----------------------- dev-vcs/git/git-2.36.0.ebuild | 26 +++----------------------- dev-vcs/git/git-2.36.1.ebuild | 26 +++----------------------- dev-vcs/git/git-9999-r1.ebuild | 26 +++----------------------- dev-vcs/git/git-9999-r2.ebuild | 26 +++----------------------- dev-vcs/git/git-9999-r3.ebuild | 26 +++----------------------- dev-vcs/git/git-9999.ebuild | 26 +++----------------------- 14 files changed, 39 insertions(+), 312 deletions(-) diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el deleted file mode 100644 index 1646a391c53c..000000000000 --- a/dev-vcs/git/files/50git-gentoo.el +++ /dev/null @@ -1,13 +0,0 @@ - -;;; dev-vcs/git site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'git-status "git" "Entry point into git-status mode." t) -;;(autoload 'git-blame-mode "git-blame" -;; "Minor mode for incremental blame for Git." t) - -;; GNU Emacs >=22.2 already includes vc-git.el. -;; Enable the following only if Emacs has no GIT support. -(unless (fboundp 'vc-git-registered) - (add-to-list 'load-path "@SITELISP@/compat") - (add-to-list 'vc-handled-backends 'GIT)) diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild index c2d24bdf91ed..af947a55cb83 100644 --- a/dev-vcs/git/git-2.32.0-r1.ebuild +++ b/dev-vcs/git/git-2.32.0-r1.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 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 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -112,7 +112,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 ) @@ -307,10 +306,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 @@ -392,16 +387,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 @@ -449,7 +434,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 @@ -645,7 +630,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" @@ -658,7 +642,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 -} diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild index ab8a8a02552e..edf538fcc61a 100644 --- a/dev-vcs/git/git-2.33.1.ebuild +++ b/dev-vcs/git/git-2.33.1.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 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 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -112,7 +112,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 ) @@ -303,10 +302,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 @@ -388,16 +383,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 @@ -445,7 +430,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 @@ -641,7 +626,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" @@ -654,7 +638,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 -} diff --git a/dev-vcs/git/git-2.34.1-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild index 075208f7ce0d..05833fea5ead 100644 --- a/dev-vcs/git/git-2.34.1-r1.ebuild +++ b/dev-vcs/git/git-2.34.1-r1.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 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 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -112,7 +112,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 ) @@ -303,10 +302,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 @@ -388,16 +383,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 @@ -445,7 +430,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 @@ -641,7 +626,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" @@ -654,7 +638,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 -} diff --git a/dev-vcs/git/git-2.34.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild index 99934132cd97..1a7f759e52da 100644 --- a/dev-vcs/git/git-2.34.1.ebuild +++ b/dev-vcs/git/git-2.34.1.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 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 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -112,7 +112,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 ) @@ -303,10 +302,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 @@ -388,16 +383,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 @@ -445,7 +430,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 @@ -641,7 +626,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" @@ -654,7 +638,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 -} diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild index cf75fd8cdeb0..f2fce14c4987 100644 --- a/dev-vcs/git/git-2.35.1.ebuild +++ b/dev-vcs/git/git-2.35.1.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 -} diff --git a/dev-vcs/git/git-2.35.2.ebuild b/dev-vcs/git/git-2.35.2.ebuild index 69ecee409630..3109246a25e0 100644 --- a/dev-vcs/git/git-2.35.2.ebuild +++ b/dev-vcs/git/git-2.35.2.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 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 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -112,7 +112,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 ) @@ -303,10 +302,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 @@ -388,16 +383,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 @@ -445,7 +430,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 @@ -641,7 +626,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" @@ -654,7 +638,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 -} 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 -} diff --git a/dev-vcs/git/git-2.36.0.ebuild b/dev-vcs/git/git-2.36.0.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-2.36.0.ebuild +++ b/dev-vcs/git/git-2.36.0.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 -} diff --git a/dev-vcs/git/git-2.36.1.ebuild b/dev-vcs/git/git-2.36.1.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-2.36.1.ebuild +++ b/dev-vcs/git/git-2.36.1.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 -} diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.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 -} diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.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 -} diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.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 -} diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 2193ea335c7a..cf66a5432c9c 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.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 -}
