[gentoo-commits] repo/proj/guru:master commit in: app-emacs/vterm/files/, app-emacs/vterm/

[Andrew Ammerlaan]

commit:     42d2a11c096bd01a693192aa0f17087800b8eb7f
Author:     Arjan Adriaanse <arjan <AT> adriaan <DOT> se>
AuthorDate: Sat May  9 18:48:15 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat May  9 18:52:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42d2a11c

app-emacs/vterm: clean up and make config files not executable

Signed-off-by: Arjan Adriaanse <arjan <AT> adriaan.se>

 app-emacs/vterm/files/bashrc              |  0
 app-emacs/vterm/vterm-20200504.544.ebuild | 19 +++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app-emacs/vterm/files/bashrc b/app-emacs/vterm/files/bashrc
old mode 100755
new mode 100644

diff --git a/app-emacs/vterm/vterm-20200504.544.ebuild 
b/app-emacs/vterm/vterm-20200504.544.ebuild
index 6de8fb8..2fe5652 100644
--- a/app-emacs/vterm/vterm-20200504.544.ebuild
+++ b/app-emacs/vterm/vterm-20200504.544.ebuild
@@ -14,15 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-       app-editors/emacs[dynamic-loading]
+       >=app-editors/emacs-26.1[dynamic-loading]
        dev-libs/libvterm
 "
 
 ELISP_REMOVE="${PN}-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
+DOC="README.md"
 
 src_configure() {
-       elisp-make-autoload-file
+       elisp_src_configure
 
        local mycmakeargs=( "USE_SYSTEM_LIBVTERM=yes" )
        cmake_src_configure
@@ -37,25 +38,23 @@ src_compile() {
 src_install() {
        elisp_src_install
 
-       dodoc README.md
-
        # install vterm module
        elisp-install ${PN} *.so
 
        # add shell config files
        if has_version app-shells/bash; then
                elog "Adding configuration for bash."
-               exeinto /etc/bash/bashrc.d/
-               newexe "${FILESDIR}/bashrc" bash-emacs-vterm.sh
+               insinto /etc/bash/bashrc.d/
+               newins "${FILESDIR}/bashrc" emacs-vterm-bash.sh
        fi
        if has_version app-shells/zsh; then
                elog "Adding configuration for zsh."
-               exeinto /etc/profile.d/
-               newexe "${FILESDIR}/zshrc" zsh-emacs-vterm.sh
+               insinto /etc/profile.d/
+               newins "${FILESDIR}/zshrc" emacs-vterm-bash.sh
        fi
        if has_version app-shells/fish; then
                elog "Adding configuration for fish."
-               exeinto /etc/fish/conf.d/
-               newexe "${FILESDIR}/config.fish" emacs-vterm.fish
+               insinto /etc/fish/conf.d/
+               newins "${FILESDIR}/config.fish" emacs-vterm.fish
        fi
 }